Merge branch 'master' into improve_app-management

Conflicts:
	settings/js/apps.js

70 files changed, 282 insertions, 34 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 10e239204f2..869729a9e41 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -18,7 +18,7 @@ $forms=OC_App::getForms('admin');
 $htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
-$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
 
 $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries', $entries);
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 205958f88d3..ccc2a5d402e 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -41,7 +41,7 @@ try {
 	OC_JSON::success(array("data" =>
 				array(
 					"username" => $username,
-					"groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
+					"groups" => OC_Group::getUserGroups( $username ))));
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
new file mode 100644
index 00000000000..e53067931e8
--- /dev/null
+++ b/settings/ajax/decryptall.php
@@ -0,0 +1,25 @@
+<?php
+
+//encryption app needs to be loaded
+OC_App::loadApp('files_encryption');
+
+// init encryption app
+$params = array('uid' => \OCP\User::getUser(),
+				'password' => $_POST['password']);
+
+$view = new OC_FilesystemView('/');
+$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+
+$result = $util->initEncryption($params);
+
+if ($result !== false) {
+	$successful = $util->decryptAll();
+	if ($successful === true) {
+		\OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
+	} else {
+		\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')));
+	}
+} else {
+	\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again')));
+}
+
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index e7151419286..34c8d3ce467 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -16,6 +16,6 @@ $data = array();
 OC_JSON::success(
 	array(
 		"data" => $entries,
-		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0) ? true : false
+		"remain" => count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0,
 	)
 );
diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
index 16a85aade81..675d7eced47 100644
--- a/settings/ajax/setsecurity.php
+++ b/settings/ajax/setsecurity.php
@@ -10,4 +10,4 @@ OCP\JSON::callCheck();
 
 OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
 
-echo 'true';
\ No newline at end of file
+echo 'true';
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 300e8642515..91c342d5d07 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -12,4 +12,4 @@ if($result !== false) {
 } else {
 	$l = OC_L10N::get('settings');	
 	OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") )));
-}
\ No newline at end of file
+}
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
index d827dfc7058..c25148cdde5 100644
--- a/settings/js/apps-custom.php
+++ b/settings/js/apps-custom.php
@@ -23,4 +23,4 @@ foreach($combinedApps as $app) {
 	echo("\n");
 }
 
-echo ("var appid =".json_encode($_GET['appid']).";");
\ No newline at end of file
+echo ("var appid =".json_encode($_GET['appid']).";");
diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php
index 8b31f8a7cf9..13a8ba1d312 100644
--- a/settings/js/isadmin.php
+++ b/settings/js/isadmin.php
@@ -17,4 +17,4 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	echo("var isadmin = true;");
 } else {
 	echo("var isadmin = false;");
-}
\ No newline at end of file
+}
diff --git a/settings/js/log.js b/settings/js/log.js
index 1ef9b419cdb..5832c698ad5 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -35,8 +35,9 @@ OC.Log={
 		$('#moreLog').show();
 		// remove all non-remaining items
 		$('#log tr').slice(OC.Log.loaded).remove();
-		if(OC.Log.loaded <= 3)
+		if(OC.Log.loaded <= 3) {
 			$('#lessLog').hide();
+		}
 	},
 	addEntries:function(entries){
 		for(var i=0;i<entries.length;i++){
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 099c1426dc0..8ad26c086b5 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -8,7 +8,7 @@
  * Post the email address change to the server.
  */
 function changeEmailAddress(){
-    emailInfo = $('#email');
+    var emailInfo = $('#email');
     if (emailInfo.val() === emailInfo.defaultValue){
         return;
     }
@@ -110,8 +110,62 @@ $(document).ready(function(){
 		});
 		return false;
 	});
+
+	$('button:button[name="submitDecryptAll"]').click(function() {
+		var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
+		OC.Encryption.decryptAll(privateKeyPassword);
+	});
+	
+	$('#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");
+			if(event.which === 13) {
+				OC.Encryption.decryptAll(privateKeyPassword);
+			}
+		} else {
+			$('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true");
+		}
+	});
+	
 } );
 
+OC.Encryption = {
+	decryptAll: function(password) {
+		OC.Encryption.msg.startDecrypting('#decryptAll .msg');
+		$.post('ajax/decryptall.php', {password:password}, function(data) {
+			if (data.status === "error") {
+				OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+			} else {
+				OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+			}
+		}
+		);
+	}
+}
+
+OC.Encryption.msg={
+	startDecrypting:function(selector){
+		$(selector)
+			.html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') )
+			.removeClass('success')
+			.removeClass('error')
+			.stop(true, true)
+			.show();
+	},
+	finishedDecrypting:function(selector, data){
+		if( data.status === "success" ){
+			 $(selector).html( data.data.message )
+				.addClass('success')
+				.stop(true, true)
+				.delay(3000)
+				.fadeOut(900);
+		}else{
+			$(selector).html( data.data.message ).addClass('error');
+		}
+	}
+};
+
 OC.msg={
 	startSaving:function(selector){
 		$(selector)
diff --git a/settings/js/users.js b/settings/js/users.js
index 6a8afc4ca36..ab08d7099c6 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -89,10 +89,15 @@ var UserList = {
 		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
 		tr.find('td.displayName > span').text(displayname);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
+			.attr('data-username', username)
+			.attr('data-user-groups', [groups]);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
+				.attr('data-username', username)
+				.attr('data-user-groups', [groups])
+				.attr('data-subadmin', [subadmin]);
 			tr.find('td.subadmins').empty();
 		}
 		$.each(this.availableGroups, function (i, group) {
@@ -166,7 +171,9 @@ var UserList = {
 			var c = Number(aa[x]), d = Number(bb[x]);
 			if (c === aa[x] && d === bb[x]) {
 				return c - d;
-			} else return (aa[x] > bb[x]) ? 1 : -1;
+			} else {
+				return (aa[x] > bb[x]) ? 1 : -1;
+			}
 			}
 		}
 		return aa.length - bb.length;
@@ -227,7 +234,7 @@ var UserList = {
 		var user = element.attr('data-username');
 		if ($(element).attr('class') === 'groupsselect') {
 			if (element.data('userGroups')) {
-				checked = String(element.data('userGroups')).split(', ');
+				checked = element.data('userGroups');
 			}
 			if (user) {
 				var checkHandeler = function (group) {
@@ -244,11 +251,12 @@ var UserList = {
 							group: group
 						},
 						function (response) {
-							if(response.status === 'success') {
-								if(UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') {
-									UserList.availableGroups.push(response.data.groupname);
-								}
-							} else {
+							if(response.status === 'success'
+									&& UserList.availableGroups.indexOf(response.data.groupname) === -1
+									&& response.data.action === 'add') {
+								UserList.availableGroups.push(response.data.groupname);
+							}
+							if(response.data.message) {
 								OC.Notification.show(response.data.message);
 							}
 						}
@@ -262,7 +270,7 @@ var UserList = {
 					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
 						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
-				})
+				});
 			};
 			var label;
 			if (isadmin) {
@@ -282,7 +290,7 @@ var UserList = {
 		}
 		if ($(element).attr('class') === 'subadminsselect') {
 			if (element.data('subadmin')) {
-				checked = String(element.data('subadmin')).split(', ');
+				checked = element.data('subadmin');
 			}
 			var checkHandeler = function (group) {
 				if (group === 'admin') {
@@ -304,7 +312,7 @@ var UserList = {
 					if ($(element).find('option[value="' + group + '"]').length === 0) {
 						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
-				})
+				});
 			};
 			element.multiSelect({
 				createCallback: addSubAdmin,
@@ -321,7 +329,7 @@ var UserList = {
 $(document).ready(function () {
 
 	UserList.doSort();
-	UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
+	UserList.availableGroups = $('#content table').data('groups');
 	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 		OC.Router.registerLoadedCallback(function () {
 			UserList.update();
@@ -450,7 +458,7 @@ $(document).ready(function () {
 						t('settings', 'Error creating user'));
 				} else {
 					if (result.data.groups) {
-						var addedGroups = result.data.groups.split(', ');
+						var addedGroups = result.data.groups;
 						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
 					}
 					if($('tr[data-uid="' + username + '"]').length === 0) {
@@ -469,7 +477,7 @@ $(document).ready(function () {
 		}
 		OC.Notification.hide();
 	});
-	UserList.useUndo = ('onbeforeunload' in window)
+	UserList.useUndo = ('onbeforeunload' in window);
 	$(window).bind('beforeunload', function () {
 		UserList.finishDelete(null);
 	});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 423c9cec666..97fcc6fd182 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
+"Encryption" => "التشفير",
 "Login Name" => "اسم الدخول",
 "Create" => "انشئ",
 "Default Storage" => "وحدة التخزين الافتراضية",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index d7b892bcca7..717cf6baae5 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -52,6 +52,7 @@ $TRANSLATIONS = array(
 "Language" => "Език",
 "Help translate" => "Помогнете с превода",
 "WebDAV" => "WebDAV",
+"Encryption" => "Криптиране",
 "Login Name" => "Потребител",
 "Create" => "Създаване",
 "Default Storage" => "Хранилище по подразбиране",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index c679fcef8a2..6145c187ce3 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
+"Encryption" => "সংকেতায়ন",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 52dec3a892e..59201224a4a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
+"Encryption" => "Xifrat",
 "Login Name" => "Nom d'accés",
 "Create" => "Crea",
 "Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 68c2f42c529..1d6c3080a67 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba při aktualizaci aplikace",
 "Updated" => "Aktualizováno",
+"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
 "Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
+"Encryption" => "Šifrování",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
+"Log-in password" => "Heslo pro přihlášení",
+"Decrypt all Files" => "Odšifrovat všechny soubory",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index b18ace86698..da8d02a9e40 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
+"Encryption" => "Amgryptiad",
 "Other" => "Arall",
 "Username" => "Enw defnyddiwr"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a36c6bb61fd..2d549ed86bf 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Opdaterer....",
 "Error while updating app" => "Der opstod en fejl under app opgraderingen",
 "Updated" => "Opdateret",
+"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
 "Saving..." => "Gemmer...",
 "deleted" => "Slettet",
 "undo" => "fortryd",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypterings app'en er ikke længere aktiv. Dekrypter alle dine filer. ",
+"Log-in password" => "Log-in kodeord",
+"Decrypt all Files" => "Dekrypter alle Filer ",
 "Login Name" => "Loginnavn",
 "Create" => "Ny",
 "Admin Recovery Password" => "Administrator gendannelse kodeord",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index a195858773d..110eaaf52dd 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Aktualisierung...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
 "Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Hilf bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
+"Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt.",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
 "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 d874eafd3bf..b4c6f98edc3 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 3faa8858e8e..cbf4e01c6a2 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. ",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 194e8a61d3d..2c4bdffb742 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>",
+"Encryption" => "Κρυπτογράφηση",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
 "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 7cda89f4965..693db4710de 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "WebDAV" => "WebDAV",
+"Encryption" => "Ĉifrado",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
 "Unlimited" => "Senlima",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index ad8b198e1ad..9f214c54808 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Ayúdnos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" 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>",
+"Encryption" => "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 fad7e52b91c..fdf0f75fe08 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -94,6 +94,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
+"Encryption" => "Encriptación",
 "Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 0f0947fa5b8..a78b9b50e89 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
+"Encryption" => "Krüpteerimine",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admin taasteparool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4b6c13127b7..73ca1338a57 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -99,6 +99,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
+"Encryption" => "Enkriptazioa",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
 "Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 5d478bc4939..2fd79235549 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "به ترجمه آن کمک کنید",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>",
+"Encryption" => "رمزگذاری",
 "Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
 "Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 61d0a51bf92..d388c13ee71 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>",
+"Encryption" => "Salaus",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1c64b01f566..3e1f5ddb5ef 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>",
+"Encryption" => "Chiffrement",
 "Login Name" => "Nom de la connexion",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 85e40f07638..10f90c89b1a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
 "Saving..." => "Gardando...",
 "deleted" => "eliminado",
 "undo" => "desfacer",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
+"Encryption" => "Cifrado",
+"The encryption app is no longer enabled, decrypt all your file" => "o aplicativo de cifrado non está activado, descifrar todos os ficheiros",
+"Log-in password" => "Contrasinal de acceso",
+"Decrypt all Files" => "Descifrar todos os ficheiros",
 "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 b82e5a9b3e4..c8ef28a261b 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -89,6 +89,7 @@ $TRANSLATIONS = array(
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "WebDAV" => "WebDAV",
+"Encryption" => "הצפנה",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index cfc6eff5638..997c699ddbb 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Segítsen a fordításban!",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>",
+"Encryption" => "Titkosítás",
 "Login Name" => "Bejelentkezési név",
 "Create" => "Létrehozás",
 "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 6c3ad8b3e77..abc19560d37 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
 "WebDAV" => "WebDAV",
+"Encryption" => "Enkripsi",
 "Login Name" => "Nama Masuk",
 "Create" => "Buat",
 "Default Storage" => "Penyimpanan Baku",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 2e97650bdb8..f803da8756d 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -58,6 +58,7 @@ $TRANSLATIONS = array(
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
+"Encryption" => "Dulkóðun",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index b6a508ba46b..003fc5c7bb1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>",
+"Encryption" => "Cifratura",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 2fbe05befa9..6a090c4e01c 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Updated" => "更新済み",
+"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
 "Saving..." => "保存中...",
 "deleted" => "削除",
 "undo" => "元に戻す",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "翻訳に協力する",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください",
+"Encryption" => "暗号化",
+"The encryption app is no longer enabled, decrypt all your file" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+"Log-in password" => "ログインパスワード",
+"Decrypt all Files" => "すべてのファイルを複合する",
 "Login Name" => "ログイン名",
 "Create" => "作成",
 "Admin Recovery Password" => "管理者復旧パスワード",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 09a948a0574..6519f239b82 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
 "WebDAV" => "WebDAV",
+"Encryption" => "ენკრიპცია",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
 "Default Storage" => "საწყისი საცავი",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 4473a2c5126..0f8f80537f1 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
+"Encryption" => "암호화",
 "Login Name" => "로그인 이름",
 "Create" => "만들기",
 "Admin Recovery Password" => "관리자 복구 암호",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4be8f212d39..956df725a77 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
+"Encryption" => "نهێنیکردن",
 "Username" => "ناوی به‌کارهێنه‌ر"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 4e419112a02..016a4fe6472 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "WebDAV" => "WebDAV",
+"Encryption" => "Šifravimas",
 "Login Name" => "Vartotojo vardas",
 "Create" => "Sukurti",
 "Unlimited" => "Neribota",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index eba0f3c89ab..e9e4b335d9d 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Authentication error" => "Autentifikācijas kļūda",
+"Your display name has been changed." => "Jūsu redzamais vārds ir mainīts.",
 "Unable to change display name" => "Nevarēja mainīt redzamo vārdu",
 "Group already exists" => "Grupa jau eksistē",
 "Unable to add group" => "Nevar pievienot grupu",
@@ -37,25 +38,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
 "Security Warning" => "Brīdinājums par drošību",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
 "Setup Warning" => "Iestatīšanas brīdinājums",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>.",
 "Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
 "Locale not working" => "Lokāle nestrādā",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Sistēmas lokalizāciju nevar nomainīt uz %s. Tas nozīmē ka var rasties sarežģījumi ar dažu burtu attēlošanu failu nosaukumos. Ir rekomendēts uzstādīt nepieciešamās pakotnes lai atbalstītu %s lokalizāciju.",
 "Internet connection not working" => "Interneta savienojums nedarbojas",
+"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." => "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ir reģistrēts webcron servisā lai izsauktu cron.php vienreiz minūtē caur http.",
+"Use systems cron service to call the cron.php file once a minute." => "Izmantojiet sistēmas cron servisu lai izsauktu cron.php reizi minūtē.",
 "Sharing" => "Dalīšanās",
 "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 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",
 "Allow users to only share with users in their groups" => "Ļaut lietotājiem dalīties ar lietotājiem to grupās",
 "Security" => "Drošība",
 "Enforce HTTPS" => "Uzspiest HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
 "Log" => "Žurnāls",
 "Log level" => "Žurnāla līmenis",
 "More" => "Vairāk",
@@ -90,8 +101,12 @@ $TRANSLATIONS = array(
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>",
+"Encryption" => "Šifrēšana",
 "Login Name" => "Ierakstīšanās vārds",
 "Create" => "Izveidot",
+"Admin Recovery Password" => "Administratora atgūšanas parole",
+"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 61f1b8b3bcd..9d74b69ccd1 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
+"Encryption" => "Енкрипција",
 "Create" => "Создај",
 "Other" => "Останато",
 "Username" => "Корисничко име"
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 9048d89bad1..a31c6e0cd7f 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
+"Encryption" => "Kryptering",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
 "Default Storage" => "Standard lager",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 67ddafdc3c5..2b0d4011f48 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -38,13 +38,16 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "__language_name__" => "Nederlands",
 "Security Warning" => "Beveiligingswaarschuwing",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
 "Setup Warning" => "Instellingswaarschuwing",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
 "Locale not working" => "Taalbestand werkt niet",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "De systeemtaal kan niet worden ingesteld op %s. Hierdoor kunnen er problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren, zodat %s ondersteund wordt.",
 "Internet connection not working" => "Internet verbinding werkt niet",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
 "cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http.",
@@ -99,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>",
+"Encryption" => "Versleuteling",
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 2c4990b285d..eb8422631f9 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -94,6 +94,7 @@ $TRANSLATIONS = array(
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
+"Encryption" => "Szyfrowanie",
 "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 a46d6e22bde..dfd4649772c 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Atualizando...",
 "Error while updating app" => "Erro ao atualizar aplicativo",
 "Updated" => "Atualizado",
+"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
 "Saving..." => "Salvando...",
 "deleted" => "excluído",
 "undo" => "desfazer",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>",
+"Encryption" => "Criptografia",
+"The encryption app is no longer enabled, decrypt all your file" => "O aplicativo de encriptação não está mais ativo, decripti todos os seus arquivos",
+"Log-in password" => "Senha de login",
+"Decrypt all Files" => "Decripti todos os Arquivos",
 "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 84d70b6ae7e..2962fb7f5ab 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
+"Encryption" => "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 0b30001e8c1..839ddf645f8 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -88,6 +88,7 @@ $TRANSLATIONS = array(
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
+"Encryption" => "Încriptare",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index c58fafbf27a..16f8f67481e 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">",
+"Encryption" => "Шифрование",
 "Login Name" => "Имя пользователя",
 "Create" => "Создать",
 "Admin Recovery Password" => "Восстановление Пароля Администратора",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 374990a2c0c..c45d67daa74 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -46,6 +46,7 @@ $TRANSLATIONS = array(
 "Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
+"Encryption" => "ගුප්ත කේතනය",
 "Create" => "තනන්න",
 "Other" => "වෙනත්",
 "Username" => "පරිශීලක නම"
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index ad602ee860f..bd7cdd46951 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
 "Updated" => "Aktualizované",
+"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
 "Saving..." => "Ukladám...",
 "deleted" => "zmazané",
 "undo" => "vrátiť",
@@ -38,25 +39,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Musíte zadať platné heslo",
 "__language_name__" => "Slovensky",
 "Security Warning" => "Bezpečnostné varovanie",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
 "Setup Warning" => "Nastavenia oznámení",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Skontrolujte prosím znovu <a href=\"%s\">inštalačnú príručku</a>.",
 "Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
 "Locale not working" => "Lokalizácia nefunguje",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Systémové nastavenie lokalizácie nemohlo byť nastavené na %s. To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov. Odporúčame nainštalovať do vášho systému balíčky potrebné pre podporu %s.",
 "Internet connection not working" => "Pripojenie na internet nefunguje",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php je registrovaný v službe webcron na zavolanie stránky cron.php raz za minútu cez HTTP.",
+"Use systems cron service to call the cron.php file once a minute." => "Použiť systémovú službu cron na spustenie súboru cron.php raz za minútu.",
 "Sharing" => "Zdieľanie",
 "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",
 "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",
 "Security" => "Zabezpečenie",
 "Enforce HTTPS" => "Vynútiť HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
 "Log" => "Záznam",
 "Log level" => "Úroveň záznamu",
 "More" => "Viac",
@@ -92,6 +103,9 @@ $TRANSLATIONS = array(
 "Help translate" => "Pomôcť s prekladom",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
+"Encryption" => "Šifrovanie",
+"Log-in password" => "Prihlasovacie heslo",
+"Decrypt all Files" => "Dešifrovať všetky súbory",
 "Login Name" => "Prihlasovacie meno",
 "Create" => "Vytvoriť",
 "Admin Recovery Password" => "Obnovenie hesla administrátora",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 5ad921201b6..eaf975048ce 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
+"Encryption" => "Šifriranje",
 "Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
 "Admin Recovery Password" => "Obnovitev administratorjevega gesla",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index b2b6538c4c3..86872df36c5 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -89,6 +89,7 @@ $TRANSLATIONS = array(
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "WebDAV" => "WebDAV",
+"Encryption" => "Шифровање",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index ad1660e25c9..9600b68ff24 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Uppdaterar...",
 "Error while updating app" => "Fel uppstod vid uppdatering av appen",
 "Updated" => "Uppdaterad",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
 "Saving..." => "Sparar...",
 "deleted" => "raderad",
 "undo" => "ångra",
@@ -102,6 +103,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Appen för kryptering är inte längre aktiverad, dekryptera alla dina filer",
+"Log-in password" => "Inloggningslösenord",
+"Decrypt all Files" => "Dekryptera alla filer",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 0dc206c7993..e65feedbc95 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -44,6 +44,7 @@ $TRANSLATIONS = array(
 "Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
+"Encryption" => "மறைக்குறியீடு",
 "Create" => "உருவாக்குக",
 "Other" => "மற்றவை",
 "Username" => "பயனாளர் பெயர்"
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 505e9ff29cb..861528742f8 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -75,6 +75,7 @@ $TRANSLATIONS = array(
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
 "WebDAV" => "WebDAV",
+"Encryption" => "การเข้ารหัส",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 0e7fa8bc3c1..e391d39fa5d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -101,6 +101,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için  bu adresi kullanın",
+"Encryption" => "Şifreleme",
 "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 d182d9198de..2c5e1a6786c 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -60,6 +60,7 @@ $TRANSLATIONS = array(
 "Language" => "تىل",
 "Help translate" => "تەرجىمىگە ياردەم",
 "WebDAV" => "WebDAV",
+"Encryption" => "شىفىرلاش",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index c6a9ab28624..e58a8b7139c 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
+"Encryption" => "Шифрування",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 4607229b4d9..832001a02a7 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "WebDAV" => "WebDAV",
+"Encryption" => "Mã hóa",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 46c02476235..dc760e965f5 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>",
+"Encryption" => "加密",
 "Login Name" => "登录名",
 "Create" => "新建",
 "Admin Recovery Password" => "管理员恢复密码",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 5a42bf06754..385c77645cd 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -38,25 +38,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "必须提供合法的密码",
 "__language_name__" => "简体中文",
 "Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Setup Warning" => "设置警告",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "Module 'fileinfo' missing" => "模块'文件信息'丢失",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
 "Locale not working" => "本地化无法工作",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符会引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s",
 "Internet connection not working" => "因特网连接无法工作",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
 "Cron" => "计划任务",
 "Execute one task with each page loaded" => "每个页面加载后执行一个任务",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
+"Use systems cron service to call the cron.php file once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件",
 "Sharing" => "共享",
 "Enable Share API" => "启用共享API",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
 "Allow links" => "允许链接",
 "Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
+"Allow public uploads" => "允许公开上传",
+"Allow users to enable others to upload into their publicly shared folders" => "用户可让其他人上传到他的公开共享文件夹",
 "Allow resharing" => "允许再次共享",
 "Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
 "Allow users to share with anyone" => "允许用户向任何人共享",
 "Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
@@ -91,6 +101,8 @@ $TRANSLATIONS = array(
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
+"Encryption" => "加密",
 "Login Name" => "登录名称",
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index f9bdb44956d..10fce11fb58 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Password" => "密碼",
 "New password" => "新密碼",
 "Email" => "電郵",
+"Encryption" => "加密",
 "Username" => "用戶名稱"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0a0fcf84e2d..7c1a8963cca 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
+"Encryption" => "加密",
 "Login Name" => "登入名稱",
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",
diff --git a/settings/personal.php b/settings/personal.php
index 1e2e1cf6723..e69898f6f8f 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -24,6 +24,9 @@ $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 
+//check if encryption was enabled in the past
+$enableDecryptAll = OC_Util::encryptedFiles();
+
 // array of common languages
 $commonlangcodes = array(
 	'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
@@ -80,6 +83,7 @@ $tmpl->assign('activelanguage', $userLang);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
+$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
 
 $forms=OC_App::getForms('personal');
 $tmpl->assign('forms', array());
diff --git a/settings/routes.php b/settings/routes.php
index b20119b5803..73ee70d1d5c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -46,6 +46,8 @@ $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
 $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');
 // apps
 $this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
 	->actionInclude('settings/ajax/apps/ocs.php');
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 7d677bdd455..bad88142da9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -110,6 +110,32 @@ if($_['passwordChangeSupported']) {
 	print_unescaped($form);
 };?>
 
+<?php if($_['enableDecryptAll']): ?>
+<form id="decryptAll">
+	<fieldset class="personalblock">
+		<legend>
+			<?php p( $l->t( 'Encryption' ) ); ?>
+		</legend>
+		<?php p($l->t( "The encryption app is no longer enabled, decrypt all your file" )); ?>
+		<p>
+			<input
+				type="password"
+				name="privateKeyPassword"
+				id="privateKeyPassword" />
+			<label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
+			<br />
+			<button
+				type="button"
+				disabled
+				name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
+			</button>
+			<span class="msg"></span>
+		</p>
+		<br />
+	</fieldset>
+</form>
+<?php endif; ?>
+
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
 	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 4ddef3ff1b5..22450fdf25f 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -78,7 +78,7 @@ $_['subadmingroups'] = array_flip($items);
 	</div>
 </div>
 
-<table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
+<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php p($l->t('Username'))?></th>
@@ -108,7 +108,7 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="groups"><select
 				class="groupsselect"
 				data-username="<?php p($user['name']) ;?>"
-				data-user-groups="<?php p($user['groups']) ;?>"
+				data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
 				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
 				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
@@ -120,7 +120,7 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="subadmins"><select
 				class="subadminsselect"
 				data-username="<?php p($user['name']) ;?>"
-				data-subadmin="<?php p($user['subadmin']);?>"
+				data-subadmin="<?php p(json_encode($user['subadmin']));?>"
 				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
diff --git a/settings/users.php b/settings/users.php
index ba79ae93b28..213d1eecfda 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -54,15 +54,16 @@ foreach($accessibleusers as $uid => $displayName) {
 	$name = $displayName;
 	if ( $displayName !== $uid ) {
 		$name = $name . ' ('.$uid.')';
-	} 
-	
+	}
+
 	$users[] = array(
 		"name" => $uid,
-		"displayName" => $displayName, 
-		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
-		'quota'=>$quota,
-		'isQuotaUserDefined'=>$isQuotaUserDefined,
-		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid)));
+		"displayName" => $displayName,
+		"groups" => OC_Group::getUserGroups($uid),
+		'quota' => $quota,
+		'isQuotaUserDefined' => $isQuotaUserDefined,
+		'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
+	);
 }
 
 foreach( $accessiblegroups as $i ) {