Merge branch 'master' into test_annotations_working

Conflicts:
	lib/private/util.php

67 files changed, 490 insertions, 307 deletions

diff --git a/settings/admin.php b/settings/admin.php
index bd135435f16..ec93a4c05a1 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -61,6 +61,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 d12df230d41..55685f778d1 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 00000000000..1f84452e117
--- /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 00000000000..68e19c90457
--- /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 9f1e7329964..052715555e5 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 5d8f9a7541c..2056e567b38 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 c04c0505deb..cd11e68442a 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 c1f1ef7466b..9967ddc7bb5 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.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.finishedDecrypting('#decryptAll .msg', data);
+				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/ar.php b/settings/l10n/ar.php
index d62c69adfac..719129d6be2 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 99dc480038f..5df22a024aa 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -106,20 +106,18 @@ $TRANSLATIONS = array(
 "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 users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
 "Allow public uploads" => "Permitir xubes públiques",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros pa xubir ficheros nes sos carpetes compartíes públicamente",
+"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",
-"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á",
-"Expire shares by default after N days" => "Ficheros compartíos caduquen dempués de N díes",
 "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.",
@@ -176,8 +174,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Esbillar como imaxe de perfil",
 "Language" => "Llingua",
 "Help translate" => "Ayúdanos nes traducciones",
-"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>",
 "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",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 4715447b7f9..9573343a1d6 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 574426ea634..a782a53bca1 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 0a4324e5a58..2a75717618a 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 e4fbf0c65b3..00ac8bcff1c 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -106,20 +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",
-"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
-"Expire after " => "Vyprší po",
-"days" => "dnech",
-"Enforce expiration date" => "Vynutit datum vypršení",
-"Expire shares by default after N days" => "Výchozí lhůta vypršení sdílení po N 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.",
@@ -176,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 0a755da9fd3..e37b776dc2c 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 2b3060dd6d5..31d353687c6 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,20 +112,19 @@ $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",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
 "Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze  Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -176,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 9bfe06d0236..77d22684429 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 b5c0985cecb..d36bb0f7a13 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,20 +112,19 @@ $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",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
 "Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze  Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -176,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 1ca97b63da8..a76f1eb54e4 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 37dc464d671..800e9a58cec 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,20 +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",
-"Set default expiration date" => "Set default expiry date",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Enforce expiration date" => "Enforce expiry date",
-"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.",
@@ -176,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 f63c5140a45..c2cd53ab7c8 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 953718bac4f..1fa9da40087 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,20 +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",
-"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
-"Expire after " => "Caduca luego de",
-"days" => "días",
-"Enforce expiration date" => "Imponer fecha de caducidad",
-"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.",
@@ -176,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 7d834e9170a..f212b842ed5 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 2eb3946cbba..84d0ffd9bd5 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 a76b73c9aef..7e85505bbc8 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 bccbb42f5a0..29e9e42abb1 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -37,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",
@@ -74,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",
@@ -126,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 f42a263c3ff..366f7ac6996 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 ea4d83b1c87..966313a5a89 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,19 +100,18 @@ $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",
-"Set default expiration date" => "Aseta oletusvanhenemispäivä",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Enforce expiration date" => "Pakota vanhenemispäivä",
-"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.",
@@ -165,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 6338e477dea..ee66a8159c9 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -106,20 +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",
-"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",
-"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.",
@@ -176,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 207007d56d8..61ce4cc1fdc 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,20 +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",
-"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",
-"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.",
@@ -176,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 0b42c2167ad..b5e80155b82 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 928b42a2014..9cca3377042 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -89,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",
@@ -142,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 878d2d07198..ac6cd5cae5a 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -85,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",
@@ -137,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 3f8b5accda2..fc296053138 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 e0fcb6cde6c..69bfaffa1a7 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,20 +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",
-"Set default expiration date" => "Imposta data di scadenza predefinita",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Enforce expiration date" => "Forza la data di scadenza",
-"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.",
@@ -176,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 186be0c377c..bf40463550f 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "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" => "管理者は自身を管理者グループから削除できません。",
@@ -106,20 +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" => "共有ファイルに関するメール通知の送信をユーザに許可する",
-"Set default expiration date" => "有効期限の既定値を設定",
-"Expire after " => "無効になるまで",
-"days" => "日",
-"Enforce expiration date" => "有効期限を反映させる",
-"Expire shares by default after N days" => "既定値では N 日後に共有を無効にします",
 "Security" => "セキュリティ",
 "Enforce HTTPS" => "常にHTTPSを使用する",
 "Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
@@ -176,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 88f6ef514d5..b11d6227122 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 679c7cd3901..0bf073001e4 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 82c10bd4301..f8319249d4d 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -91,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" => "누구나와 공유할 수 있도록 허용",
@@ -152,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 2e7036aaaed..45728392c41 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 7d5f964a96e..261f5a6d37e 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 975079eb39e..27bdcc73048 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 a43bde76bcc..cfc56d69fbc 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 97554ed050f..5c46be19f9f 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,20 +110,18 @@ $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",
 "Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
 "Allow mail notification" => "Toestaan e-mailnotificaties",
 "Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
-"Set default expiration date" => "Stel standaard vervaldatum in",
-"Expire after " => "Vervalt na",
-"days" => "dagen",
-"Enforce expiration date" => "Verplicht de vervaldatum",
-"Expire shares by default after N days" => "Laat shares standaard vervallen na N dagen",
 "Security" => "Beveiliging",
 "Enforce HTTPS" => "Afdwingen HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
@@ -176,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 7eacdbedfb0..c064d66c708 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 dbdc2ef9999..daec563be95 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,20 +112,18 @@ $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",
 "Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
 "Allow mail notification" => "Pozwól na mailowe powiadomienia",
 "Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plikó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",
-"Expire shares by default after N days" => "Wygaś udziały domyślnie po N dniach",
 "Security" => "Bezpieczeństwo",
 "Enforce HTTPS" => "Wymuś HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
@@ -176,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 e7534a21a7d..d345a8d14a3 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,20 +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",
-"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",
-"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.",
@@ -176,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 6bd466bfd67..43d24cfe8e8 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,9 +1,12 @@
 <?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",
@@ -14,10 +17,16 @@ $TRANSLATIONS = array(
 "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.",
@@ -71,6 +80,7 @@ $TRANSLATIONS = array(
 "None" => "Nenhum",
 "Login" => "Login",
 "Plain" => "Plano",
+"NT LAN Manager" => "Gestor de NT LAN",
 "SSL" => "SSL",
 "TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
@@ -90,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.",
@@ -97,16 +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",
-"Expire after " => "Expira após",
-"days" => "dias",
+"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",
@@ -152,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",
@@ -162,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 7ada22648de..b16f65324a7 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 1e780926f77..fca7168f28f 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -98,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" => "Разрешить пользователя делать общий доступ любому",
@@ -161,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 3468a87ae18..c977985b669 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 c633d472684..8a2b7218442 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 29925683c0b..ca74ba573c4 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 3723ef3fe5f..408e704d40b 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 f76eed303b9..895360395b3 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 14000c59ca1..f2fa7dd6ead 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 4a49dc0bc5f..5fbdd9437a4 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,20 +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",
-"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",
-"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.",
@@ -153,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",
@@ -176,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 c55834f7337..2136f9af1e5 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 0c8adce29c0..a1520a0defc 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 0144e2b534c..76b66e82ee1 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 da9dbdf0a1f..ef8c20ef94e 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 e291659d17e..8f35fd938a4 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -106,20 +106,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" => "允许用户发送共享文件的邮件通知",
-"Set default expiration date" => "设置默认过期日期",
-"Expire after " => "过期于",
-"days" => "天",
-"Enforce expiration date" => "强制过期日期",
-"Expire shares by default after N days" => "默认 N 天后共享过期",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
@@ -176,8 +174,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" => "加密 app 不再被启用，请解密您所有的文件",
 "Log-in password" => "登录密码",
 "Decrypt all Files" => "解密所有文件",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 567d6fb5940..c60ca4223e8 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 0da14a8c8c4..47b2dc1a46a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -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 a8bb0d981e8..21d406beeca 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 992d9c16a89..3b06d92895d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -232,15 +232,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>
@@ -270,22 +287,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 cc1fce88c9f..1d1500743ad 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>