Merge branch 'master' into sync-master

86 files changed, 403 insertions, 630 deletions

diff --git a/settings/ChangePassword/Controller.php b/settings/ChangePassword/Controller.php
index 1f3ea1b446a..94fb1e4e7a2 100644
--- a/settings/ChangePassword/Controller.php
+++ b/settings/ChangePassword/Controller.php
@@ -30,6 +30,8 @@
  */
 namespace OC\Settings\ChangePassword;
 
+use OC\HintException;
+
 class Controller {
 	public static function changePersonalPassword($args) {
 		// Check if we are an user
@@ -39,17 +41,22 @@ class Controller {
 		$username = \OC_User::getUser();
 		$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
 		$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
+		$l = new \OC_L10n('settings');
 
 		if (!\OC_User::checkPassword($username, $oldPassword)) {
-			$l = new \OC_L10n('settings');
 			\OC_JSON::error(array("data" => array("message" => $l->t("Wrong password")) ));
 			exit();
 		}
-		if (!is_null($password) && \OC_User::setPassword($username, $password)) {
-			\OC::$server->getUserSession()->updateSessionTokenPassword($password);
-			\OC_JSON::success();
-		} else {
-			\OC_JSON::error();
+
+		try {
+			if (!is_null($password) && \OC_User::setPassword($username, $password)) {
+				\OC::$server->getUserSession()->updateSessionTokenPassword($password);
+				\OC_JSON::success(['data' => ['message' => $l->t('Saved')]]);
+			} else {
+				\OC_JSON::error();
+			}
+		} catch (HintException $e) {
+			\OC_JSON::error(['data' => ['message' => $e->getHint()]]);
 		}
 	}
 
@@ -150,10 +157,14 @@ class Controller {
 
 			}
 		} else { // if encryption is disabled, proceed
-			if (!is_null($password) && \OC_User::setPassword($username, $password)) {
-				\OC_JSON::success(array('data' => array('username' => $username)));
-			} else {
-				\OC_JSON::error(array('data' => array('message' => $l->t('Unable to change password'))));
+			try {
+				if (!is_null($password) && \OC_User::setPassword($username, $password)) {
+					\OC_JSON::success(array('data' => array('username' => $username)));
+				} else {
+					\OC_JSON::error(array('data' => array('message' => $l->t('Unable to change password'))));
+				}
+			} catch (HintException $e) {
+				\OC_JSON::error(array('data' => array('message' => $e->getHint())));
 			}
 		}
 	}
diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php
index f9a69fa38c8..6c9fe76c247 100644
--- a/settings/Controller/LogSettingsController.php
+++ b/settings/Controller/LogSettingsController.php
@@ -106,7 +106,7 @@ class LogSettingsController extends Controller {
 	public function download() {
 		$resp = new StreamResponse(\OC\Log\Owncloud::getLogFilePath());
 		$resp->addHeader('Content-Type', 'application/octet-stream');
-		$resp->addHeader('Content-Disposition', 'attachment; filename="owncloud.log"');
+		$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
 		return $resp;
 	}
 }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3951aa898cf..0af53cebf31 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -331,7 +331,7 @@ span.version {
 	padding-left: 25px;
 }
 .app-level .approved {
-	border-color: #e8c805;
+	border-color: #0082c9;
 }
 .app-level .experimental {
 	background-color: #ce3702;
@@ -533,9 +533,9 @@ span.indeterminate {
 }
 
 /* PASSWORD */
-.strengthify-wrapper {
+#passwordform .strengthify-wrapper {
 	position: absolute;
-	left: 189px;
+	left: 186px;
 	width: 131px;
 	margin-top: -7px;
 }
@@ -596,3 +596,12 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 #warning {
 	color: red;
 }
+
+/* SELECT */
+
+.select2-container-multi .select2-choices .select2-search-choice {
+	background-color: rgba(240,240,240,.9)!important;
+	border-color: rgba(240,240,240,.9)!important;
+	box-shadow: none!important;
+	background-image: none!important;
+}
diff --git a/settings/img/admin.png b/settings/img/admin.png
index 9cd69def9cd..2a1f1eb257b 100644
--- a/settings/img/admin.png
+++ b/settings/img/admin.png
diff --git a/settings/img/admin.svg b/settings/img/admin.svg
index 46ee7f1b46f..89517d6ff95 100644
--- a/settings/img/admin.svg
+++ b/settings/img/admin.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0">
  <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m2 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z" fill="#FFF"/>
+ <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m2 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z"/>
 </svg>
diff --git a/settings/img/help.png b/settings/img/help.png
index 3c9cfed40fc..69cb269d91b 100644
--- a/settings/img/help.png
+++ b/settings/img/help.png
diff --git a/settings/img/help.svg b/settings/img/help.svg
index b49998bb9ee..9f4a636bd17 100644
--- a/settings/img/help.svg
+++ b/settings/img/help.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0">
  <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path d="m5 8.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0167-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.5419-0.597-0.96979-1.1466-0.9291h-0.000001z" fill="#FFF"/>
+ <path d="m5 7.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0169-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.54186-0.597-0.96979-1.1466-0.92912h-0.000001z"/>
 </svg>
diff --git a/settings/img/personal.png b/settings/img/personal.png
index a3fce59edb1..10e502faa9f 100644
--- a/settings/img/personal.png
+++ b/settings/img/personal.png
diff --git a/settings/img/personal.svg b/settings/img/personal.svg
index 413716e28ba..ee3d971dac9 100644
--- a/settings/img/personal.svg
+++ b/settings/img/personal.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0">
  <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m8.0038 0.99998c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3601-1.1563 0.5621-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1208 0.0624-0.2505 0.0942-0.3748 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03213c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#FFF"/>
+ <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m8.0038-0.000016024c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1213 0.0624-0.251 0.0942-0.3753 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.3772-2.7188-3.0002-2.7188z"/>
 </svg>
diff --git a/settings/img/users.png b/settings/img/users.png
index fac2e6f3ea5..14a0d5d03c2 100644
--- a/settings/img/users.png
+++ b/settings/img/users.png
diff --git a/settings/img/users.svg b/settings/img/users.svg
index e2834402b1d..a04ee457bc8 100644
--- a/settings/img/users.svg
+++ b/settings/img/users.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0">
  <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4.1179 2.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.025879-0.19971-0.05767-0.65006-0.085735-1.0932-0.0282-0.443-0.0526-0.879-0.0859-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.0214-0.0215c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02145c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.0312 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.69745 0.24488-1.5651 0.53652-2.3437 0.87499-0.43711 0.19003-0.83265 0.35972-1.1562 0.56249-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.031-0.0313c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03181c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#FFF"/>
+ <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4.1179 1.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.0259-0.2-0.0577-0.65-0.0858-1.093-0.028-0.4431-0.0524-0.879-0.0857-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.021432-0.02144c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02143c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6233 0-3.0002 1.1869-3.0002 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.032-0.0315c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.377-2.7188-3-2.7188z"/>
 </svg>
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 015236f957d..525a34d9067 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -121,7 +121,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 				$('.enable.needs-download').tipsy({fallback: t('settings', 'The app will be downloaded from the app store')});
 
-				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.')});
+				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the community. They offer central functionality and are ready for production use.')});
 				$('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')});
 				$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
 			},
diff --git a/settings/js/log.js b/settings/js/log.js
index 43ef561f7ee..a1ad29d72e7 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -64,6 +64,11 @@ OC.Log = {
 				timeTd.text(formatDate(entry.time * 1000));
 			}
 			row.append(timeTd);
+
+			var userTd = $('<td/>');
+			userTd.text(entry.user);
+			row.append(userTd);
+
 			$('#log').append(row);
 		}
 		OC.Log.loaded += entries.length;
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 73d65034d9a..16a8d184da6 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -192,6 +192,7 @@ $(document).ready(function () {
 		$('#pass2').showPassword().keyup();
 	}
 	$("#passwordbutton").click(function () {
+		OC.msg.startSaving('#password-error-msg');
 		var isIE8or9 = $('html').hasClass('lte9');
 		// FIXME - TODO - once support for IE8 and IE9 is dropped
 		// for IE8 and IE9 this will check additionally if the typed in password
@@ -208,25 +209,32 @@ $(document).ready(function () {
 				if (data.status === "success") {
 					$('#pass1').val('');
 					$('#pass2').val('').change();
-					// Hide a possible errormsg and show successmsg
-					$('#password-changed').removeClass('hidden').addClass('inlineblock');
-					$('#password-error').removeClass('inlineblock').addClass('hidden');
+					OC.msg.finishedSaving('#password-error-msg', data);
 				} else {
 					if (typeof(data.data) !== "undefined") {
-						$('#password-error').text(data.data.message);
+						OC.msg.finishedSaving('#password-error-msg', data);
 					} else {
-						$('#password-error').text(t('Unable to change password'));
+						OC.msg.finishedSaving('#password-error-msg',
+							{
+								'status' : 'error',
+								'data' : {
+									'message' : t('core', 'Unable to change password')
+								}
+							}
+						);
 					}
-					// Hide a possible successmsg and show errormsg
-					$('#password-changed').removeClass('inlineblock').addClass('hidden');
-					$('#password-error').removeClass('hidden').addClass('inlineblock');
 				}
 			});
 			return false;
 		} else {
-			// Hide a possible successmsg and show errormsg
-			$('#password-changed').removeClass('inlineblock').addClass('hidden');
-			$('#password-error').removeClass('hidden').addClass('inlineblock');
+			OC.msg.finishedSaving('#password-error-msg',
+				{
+					'status' : 'error',
+					'data' : {
+						'message' : t('core', 'Unable to change password')
+					}
+				}
+			);
 			return false;
 		}
 
@@ -343,7 +351,8 @@ $(document).ready(function () {
 			t('core', 'So-so password'),
 			t('core', 'Good password'),
 			t('core', 'Strong password')
-		]
+		],
+		drawTitles: true,
 	});
 
 	// does the user have a custom avatar? if he does show #removeavatar
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 407100a2017..12f0857050f 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Contrasenya incorrecta",
+    "Saved" : "Desat",
     "No user supplied" : "No heu proporcionat cap usuari",
     "Authentication error" : "Error d'autenticació",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
@@ -17,7 +18,6 @@ OC.L10N.register(
     "Unable to add group." : "No es pot agregar el grup.",
     "Unable to delete group." : "No es pot esborrar el grup.",
     "log-level out of allowed range" : "Nivell d'autenticació fora del rang permès",
-    "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hi ha hagut un problema en enviar el correu. Revisi la seva configuració. (Error: %s)",
     "Email sent" : "El correu electrónic s'ha enviat",
@@ -204,7 +204,6 @@ OC.L10N.register(
     "No email address set" : "No s'ha establert cap adreça de correu",
     "You are member of the following groups:" : "Vostè és membre dels següents grups:",
     "Password" : "Contrasenya",
-    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
     "Current password" : "Contrasenya actual",
     "New password" : "Contrasenya nova",
     "Change password" : "Canvia la contrasenya",
@@ -216,9 +215,7 @@ OC.L10N.register(
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
     "iOS app" : "aplicació para iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!",
     "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra la ubicació del magatzem",
     "Show last log in" : "Mostrar l'últim accés",
     "Show user backend" : "Mostrar backend d'usuari",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index f0e4db16aba..7790e31aef5 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Contrasenya incorrecta",
+    "Saved" : "Desat",
     "No user supplied" : "No heu proporcionat cap usuari",
     "Authentication error" : "Error d'autenticació",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
@@ -15,7 +16,6 @@
     "Unable to add group." : "No es pot agregar el grup.",
     "Unable to delete group." : "No es pot esborrar el grup.",
     "log-level out of allowed range" : "Nivell d'autenticació fora del rang permès",
-    "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hi ha hagut un problema en enviar el correu. Revisi la seva configuració. (Error: %s)",
     "Email sent" : "El correu electrónic s'ha enviat",
@@ -202,7 +202,6 @@
     "No email address set" : "No s'ha establert cap adreça de correu",
     "You are member of the following groups:" : "Vostè és membre dels següents grups:",
     "Password" : "Contrasenya",
-    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
     "Current password" : "Contrasenya actual",
     "New password" : "Contrasenya nova",
     "Change password" : "Canvia la contrasenya",
@@ -214,9 +213,7 @@
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
     "iOS app" : "aplicació para iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!",
     "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra la ubicació del magatzem",
     "Show last log in" : "Mostrar l'últim accés",
     "Show user backend" : "Mostrar backend d'usuari",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index a7a2ef556fc..bb2949583f3 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Nesprávné heslo",
+    "Saved" : "Uloženo",
     "No user supplied" : "Nebyl uveden uživatel",
     "Authentication error" : "Chyba přihlášení",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Nelze přidat skupinu.",
     "Unable to delete group." : "Nelze smazat skupinu.",
     "log-level out of allowed range" : "úroveň logování z povoleného rozpětí",
-    "Saved" : "Uloženo",
     "test email settings" : "Test nastavení emailu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Při odesílání emailu nastala chyba. Překontrolujte prosím svá nastavení. (Error: %s)",
     "Email sent" : "Email odeslán",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Vše",
     "No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
     "The app will be downloaded from the app store" : "Aplikace bude stažena z obchodu aplikací",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou. Poskytují klíčovou funkcionalitu a jsou připravené na produkční nasazení.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.",
     "Update to %s" : "Aktualizovat na %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
     "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Samotné šifrování nezajistí bezpečnost systému. Projděte si dokumentaci aplikace ownCloud pro více informací o tom jak šifrovací aplikace funguje a jejím správném použití.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
     "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
     "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Zobrazit popis ...",
     "Hide description …" : "Skrýt popis ...",
     "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejnižší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejvyšší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Tato aplikace nemá nastavenou žádnou minimální verzi Nextcloudu. To se v budoucnu projeví jako chyba.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Tato aplikace nemá nastavenou žádnou maximální verzi Nextcloudu. To se v budoucnu projeví jako chyba.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:",
     "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
     "Uninstall App" : "Odinstalovat aplikaci",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "Emailová adresa není nastavena",
     "You are member of the following groups:" : "Patříte do následujících skupin:",
     "Password" : "Heslo",
-    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
     "Current password" : "Současné heslo",
     "New password" : "Nové heslo",
     "Change password" : "Změnit heslo",
     "Language" : "Jazyk",
     "Help translate" : "Pomoci s překladem",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Toto jsou klienti aktuálně přihlášení do této instance ownCloud přes web, počítač, či telefon.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Toto jsou weboví, desktopoví a mobilní klienti aktuálně připojení k vašemu účtu.",
     "Browser" : "Prohlížeč",
     "Most recent activity" : "Nejnovější aktivity",
     "You've linked these apps." : "Připojili jste tyto aplikace.",
@@ -279,16 +278,16 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Heslo aplikace je přihlašovací údaj umožňující aplikaci nebo přístroji přístup k %s účtu.",
     "App name" : "Jméno aplikace",
     "Create new app password" : "Vytvořit nové heslo aplikace",
-    "Use the credentials below to configure your app or device." : "Použijte níže vypsané přihlašovací údaje k nastavení aplikace nebo přístroje.",
+    "Use the credentials below to configure your app or device." : "Použijte údaje níže pro nastavení aplikace nebo zařízení.",
     "Username" : "Uživatelské jméno",
     "Done" : "Dokončeno",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
     "Android app" : "Aplikace pro Android",
     "iOS app" : "iOS aplikace",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li projekt podpořit\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">připojte se k vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte informace dál</a>!",
     "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou Nextcloudu{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Cesta k datům",
     "Show last log in" : "Poslední přihlášení",
     "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index c192da9d747..322d62ce48c 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Nesprávné heslo",
+    "Saved" : "Uloženo",
     "No user supplied" : "Nebyl uveden uživatel",
     "Authentication error" : "Chyba přihlášení",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Nelze přidat skupinu.",
     "Unable to delete group." : "Nelze smazat skupinu.",
     "log-level out of allowed range" : "úroveň logování z povoleného rozpětí",
-    "Saved" : "Uloženo",
     "test email settings" : "Test nastavení emailu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Při odesílání emailu nastala chyba. Překontrolujte prosím svá nastavení. (Error: %s)",
     "Email sent" : "Email odeslán",
@@ -62,7 +62,7 @@
     "All" : "Vše",
     "No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
     "The app will be downloaded from the app store" : "Aplikace bude stažena z obchodu aplikací",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou. Poskytují klíčovou funkcionalitu a jsou připravené na produkční nasazení.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.",
     "Update to %s" : "Aktualizovat na %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
     "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Poté co je zapnuto šifrování, jsou od toho bodu všechny nahrávané soubory šifrovány serverem. Vypnout šifrování bude možné pouze později, až bude šifrovací modul tuto možnost podporovat a po splnění všech nutných podmínek (tzn. nastavení klíčů pro obnovení).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Samotné šifrování nezajistí bezpečnost systému. Projděte si dokumentaci aplikace ownCloud pro více informací o tom jak šifrovací aplikace funguje a jejím správném použití.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrování samotné ještě negarantuje bezpečnost systému. Přečtěte si prosím dokumentaci, chcete-li se dozvědět více informací o tom, jak aplikace pro šifrování funguje a jaké jsou podporované případy použití.",
     "Be aware that encryption always increases the file size." : "Mějte na paměti, že šifrování vždy navýší velikost souboru.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Je vždy dobré vytvářet pravidelné zálohy svých dat, v případě zapnutého šifrování také zajistěte zálohu šifrovacích klíčů společně se zálohou dat.",
     "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
@@ -226,8 +226,8 @@
     "Show description …" : "Zobrazit popis ...",
     "Hide description …" : "Skrýt popis ...",
     "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejnižší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejvyšší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Tato aplikace nemá nastavenou žádnou minimální verzi Nextcloudu. To se v budoucnu projeví jako chyba.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Tato aplikace nemá nastavenou žádnou maximální verzi Nextcloudu. To se v budoucnu projeví jako chyba.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:",
     "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
     "Uninstall App" : "Odinstalovat aplikaci",
@@ -263,13 +263,12 @@
     "No email address set" : "Emailová adresa není nastavena",
     "You are member of the following groups:" : "Patříte do následujících skupin:",
     "Password" : "Heslo",
-    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
     "Current password" : "Současné heslo",
     "New password" : "Nové heslo",
     "Change password" : "Změnit heslo",
     "Language" : "Jazyk",
     "Help translate" : "Pomoci s překladem",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Toto jsou klienti aktuálně přihlášení do této instance ownCloud přes web, počítač, či telefon.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Toto jsou weboví, desktopoví a mobilní klienti aktuálně připojení k vašemu účtu.",
     "Browser" : "Prohlížeč",
     "Most recent activity" : "Nejnovější aktivity",
     "You've linked these apps." : "Připojili jste tyto aplikace.",
@@ -277,16 +276,16 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Heslo aplikace je přihlašovací údaj umožňující aplikaci nebo přístroji přístup k %s účtu.",
     "App name" : "Jméno aplikace",
     "Create new app password" : "Vytvořit nové heslo aplikace",
-    "Use the credentials below to configure your app or device." : "Použijte níže vypsané přihlašovací údaje k nastavení aplikace nebo přístroje.",
+    "Use the credentials below to configure your app or device." : "Použijte údaje níže pro nastavení aplikace nebo zařízení.",
     "Username" : "Uživatelské jméno",
     "Done" : "Dokončeno",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
     "Android app" : "Aplikace pro Android",
     "iOS app" : "iOS aplikace",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li projekt podpořit\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">připojte se k vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte informace dál</a>!",
     "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou Nextcloudu{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Cesta k datům",
     "Show last log in" : "Poslední přihlášení",
     "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 00774a09682..c65742d6ca1 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Forkert kodeord",
+    "Saved" : "Gemt",
     "No user supplied" : "Intet brugernavn givet",
     "Authentication error" : "Adgangsfejl",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Kan ikke tilføje gruppen.",
     "Unable to delete group." : "Kan ikke slette gruppen.",
     "log-level out of allowed range" : "niveau for logregistrering går ud over tilladte interval",
-    "Saved" : "Gemt",
     "test email settings" : "test e-mailindstillinger",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Der opstod et problem under afsendelse af e-mailen. Gennemse venligst dine indstillinger. (Fejl: %s)",
     "Email sent" : "E-mail afsendt",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Eksperimentel",
     "All" : "Alle",
     "No apps found for your version" : "Ingen apps fundet til din verion",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
     "Update to %s" : "Opdatér til %s",
@@ -227,7 +226,6 @@ OC.L10N.register(
     "No email address set" : "Der er ikke angivet e-mailadresse",
     "You are member of the following groups:" : "Der er medlem af følgende grupper:",
     "Password" : "Kodeord",
-    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
     "Current password" : "Nuværende adgangskode",
     "New password" : "Nyt kodeord",
     "Change password" : "Skift kodeord",
@@ -240,9 +238,7 @@ OC.L10N.register(
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!",
     "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
     "Show user backend" : "Vis bruger-backend",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 29bb3f75d08..821aed4b036 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Forkert kodeord",
+    "Saved" : "Gemt",
     "No user supplied" : "Intet brugernavn givet",
     "Authentication error" : "Adgangsfejl",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Kan ikke tilføje gruppen.",
     "Unable to delete group." : "Kan ikke slette gruppen.",
     "log-level out of allowed range" : "niveau for logregistrering går ud over tilladte interval",
-    "Saved" : "Gemt",
     "test email settings" : "test e-mailindstillinger",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Der opstod et problem under afsendelse af e-mailen. Gennemse venligst dine indstillinger. (Fejl: %s)",
     "Email sent" : "E-mail afsendt",
@@ -61,7 +61,6 @@
     "Experimental" : "Eksperimentel",
     "All" : "Alle",
     "No apps found for your version" : "Ingen apps fundet til din verion",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
     "Update to %s" : "Opdatér til %s",
@@ -225,7 +224,6 @@
     "No email address set" : "Der er ikke angivet e-mailadresse",
     "You are member of the following groups:" : "Der er medlem af følgende grupper:",
     "Password" : "Kodeord",
-    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
     "Current password" : "Nuværende adgangskode",
     "New password" : "Nyt kodeord",
     "Change password" : "Skift kodeord",
@@ -238,9 +236,7 @@
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!",
     "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
     "Show user backend" : "Vis bruger-backend",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index f3c93cacd84..d1900d5a06a 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Falsches Passwort",
+    "Saved" : "Gespeichert",
     "No user supplied" : "Keinen Benutzer übermittelt",
     "Authentication error" : "Authentifizierungsfehler",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Administratorkonto an, da sonst alle Benutzerdaten verlorengehen können",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs",
-    "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfe Deine Einstellungen. (Fehler: %s)",
     "Email sent" : "E-Mail wurde verschickt",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Alle",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Update to %s" : "Aktualisierung auf %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schau in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
     "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung verfügbar.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine minimale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Die App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "Keine E-Mail-Adresse angegeben",
     "You are member of the following groups:" : "Du bist Mitglied folgender Gruppen:",
     "Password" : "Passwort",
-    "Unable to change your password" : "Passwort konnte nicht geändert werden",
     "Current password" : "Aktuelles Passwort",
     "New password" : "Neues Passwort",
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Hilf bei der Übersetzung",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dies sind die Web-, Desktop und mobilen Clients, mit denen du aktuell in deiner ownCloud angemeldet bist.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Dies sind die Web-, Desktop- und Mobilclients, welche derzeit in deinem Benutzerkontext angemeldet sind.",
     "Browser" : "Browser",
     "Most recent activity" : "Neueste Aktivität",
     "You've linked these apps." : "Du hast diese Apps verbunden.",
@@ -279,16 +278,16 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
-    "Use the credentials below to configure your app or device." : "Verwende die folgenden Zugangsdaten um deine App oder dein Gerät zu konfigurieren.",
+    "Use the credentials below to configure your app or device." : "Nutze die unten angebenen Anmeldeinformationen, um deine App oder dein Gerät zu konfigurieren.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
     "Show user backend" : "Benutzer-Backend anzeigen",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 172c92ac7b3..f2f452eb35b 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Falsches Passwort",
+    "Saved" : "Gespeichert",
     "No user supplied" : "Keinen Benutzer übermittelt",
     "Authentication error" : "Authentifizierungsfehler",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Administratorkonto an, da sonst alle Benutzerdaten verlorengehen können",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs",
-    "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfe Deine Einstellungen. (Fehler: %s)",
     "Email sent" : "E-Mail wurde verschickt",
@@ -62,7 +62,7 @@
     "All" : "Alle",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Update to %s" : "Aktualisierung auf %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schau in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
     "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
@@ -226,8 +226,8 @@
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung verfügbar.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine minimale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Die App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
@@ -263,13 +263,12 @@
     "No email address set" : "Keine E-Mail-Adresse angegeben",
     "You are member of the following groups:" : "Du bist Mitglied folgender Gruppen:",
     "Password" : "Passwort",
-    "Unable to change your password" : "Passwort konnte nicht geändert werden",
     "Current password" : "Aktuelles Passwort",
     "New password" : "Neues Passwort",
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Hilf bei der Übersetzung",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dies sind die Web-, Desktop und mobilen Clients, mit denen du aktuell in deiner ownCloud angemeldet bist.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Dies sind die Web-, Desktop- und Mobilclients, welche derzeit in deinem Benutzerkontext angemeldet sind.",
     "Browser" : "Browser",
     "Most recent activity" : "Neueste Aktivität",
     "You've linked these apps." : "Du hast diese Apps verbunden.",
@@ -277,16 +276,16 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
-    "Use the credentials below to configure your app or device." : "Verwende die folgenden Zugangsdaten um deine App oder dein Gerät zu konfigurieren.",
+    "Use the credentials below to configure your app or device." : "Nutze die unten angebenen Anmeldeinformationen, um deine App oder dein Gerät zu konfigurieren.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
     "Show user backend" : "Benutzer-Backend anzeigen",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index a40dd56f24b..fbc467343a8 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Falsches Passwort",
+    "Saved" : "Gespeichert",
     "No user supplied" : "Keinen Benutzer angegeben",
     "Authentication error" : "Authentifizierungsfehler",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Administratorkonto an, da sonst alle Benutzerdaten verlorengehen können",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs",
-    "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Einstellungen. (Fehler: %s)",
     "Email sent" : "E-Mail gesendet",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Alle",
     "No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
     "The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Update to %s" : "Aktualisierung auf %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schauen Sie in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
     "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "Keine E-Mail-Adresse angegeben",
     "You are member of the following groups:" : "Sie sind Mitglied folgender Gruppen:",
     "Password" : "Passwort",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
     "Current password" : "Aktuelles Passwort",
     "New password" : "Neues Passwort",
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Helfen Sie bei der Übersetzung",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dies sind die Web-, Desktop und mobilen Clients, mit denen Sie aktuell in Ihrer ownCloud angemeldet sind.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Dies sind die Web-, Desktop- und Mobilclients, welche derzeit in ihrem Benutzerkontext angemeldet sind.",
     "Browser" : "Browser",
     "Most recent activity" : "Neueste Aktivität",
     "You've linked these apps." : "Sie haben diese Apps verbunden.",
@@ -279,15 +278,16 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Use the credentials below to configure your app or device." : "Nutzen Sie die unten angebenen Anmeldeinformationen, um ihre App oder ihr Gerät zu konfigurieren.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehlen Sie es weiter</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
     "Show user backend" : "Benutzer-Backend anzeigen",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 4cedb8464ec..3ee110e923d 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Falsches Passwort",
+    "Saved" : "Gespeichert",
     "No user supplied" : "Keinen Benutzer angegeben",
     "Authentication error" : "Authentifizierungsfehler",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Administratorkonto an, da sonst alle Benutzerdaten verlorengehen können",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs",
-    "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Einstellungen. (Fehler: %s)",
     "Email sent" : "E-Mail gesendet",
@@ -62,7 +62,7 @@
     "All" : "Alle",
     "No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
     "The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Update to %s" : "Aktualisierung auf %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schauen Sie in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lese in der Dokumentation nach, wie die Verschlüsselungs-app funktioniert und welche Anwendungsfälle unterstützt werden.",
     "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
@@ -226,8 +226,8 @@
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
@@ -263,13 +263,12 @@
     "No email address set" : "Keine E-Mail-Adresse angegeben",
     "You are member of the following groups:" : "Sie sind Mitglied folgender Gruppen:",
     "Password" : "Passwort",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
     "Current password" : "Aktuelles Passwort",
     "New password" : "Neues Passwort",
     "Change password" : "Passwort ändern",
     "Language" : "Sprache",
     "Help translate" : "Helfen Sie bei der Übersetzung",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dies sind die Web-, Desktop und mobilen Clients, mit denen Sie aktuell in Ihrer ownCloud angemeldet sind.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Dies sind die Web-, Desktop- und Mobilclients, welche derzeit in ihrem Benutzerkontext angemeldet sind.",
     "Browser" : "Browser",
     "Most recent activity" : "Neueste Aktivität",
     "You've linked these apps." : "Sie haben diese Apps verbunden.",
@@ -277,15 +276,16 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Ein App-Passwort ist ein Passwort, dass einer App oder einem Gerät erlaubt auf Ihren %s-Konto zuzugreifen.",
     "App name" : "App-Name",
     "Create new app password" : "Neues App-Passwort erstellen",
+    "Use the credentials below to configure your app or device." : "Nutzen Sie die unten angebenen Anmeldeinformationen, um ihre App oder ihr Gerät zu konfigurieren.",
     "Username" : "Benutzername",
     "Done" : "Erledigt",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehlen Sie es weiter</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
     "Show user backend" : "Benutzer-Backend anzeigen",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index f9f6575438c..e8f5a4c15a4 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Εσφαλμένο συνθηματικό",
+    "Saved" : "Αποθηκεύτηκαν",
     "No user supplied" : "Δεν εισήχθη χρήστης",
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Παρακαλώ παρέχετε έναν κωδικό ανάκτησης διαχειριστή, διαφορετικά όλα τα δεδομένα χρήστη θα χαθούν",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
     "log-level out of allowed range" : "Το επίπεδο καταγραφής είναι εκτός του επιτρεπόμενου πεδίου",
-    "Saved" : "Αποθηκεύτηκαν",
     "test email settings" : "δοκιμή ρυθμίσεων email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.(Error: %s)",
     "Email sent" : "Το Email απεστάλη ",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Πειραματικό",
     "All" : "Όλες",
     "No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
     "Update to %s" : "Ενημέρωση σε %s",
@@ -155,7 +154,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Μόλις ενεργοποιηθεί η κρυπτογράφηση, όλα τα αρχεία που θα μεταφορτωθούν από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή. Η κρυπτογράφηση είναι δυνατόν να απενεργοποιηθεί αργότερα μόνο αν το ενεργό άρθρωμα κρυπτογράφησης υποστηρίζει αυτή τη λειτουργία και εκπληρούνται όλες οι προϋποθέσεις (πχ ορισμός κλειδιού ανάκτησης).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Η κρυπτογράφηση από΄μ9ονη της δεν εγγυάται την την ασφάλεια του συστήματος. Παρακαλούμε δείτε την τεκμηρίωση του ownCloud για περισσότερες πληροφορίες σχετικά με το πως δουλεύει η εφαρμογή κρυπτογράφησης και τις υποστηριζόμενες περιπτώσεις χρήσης.",
     "Be aware that encryption always increases the file size." : "Έχετε στο νου σας πως η κρυπτογράφηση πάντα αυξάνει το μέγεθος του αρχείου",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Είναι πάντοτε καλό να δημιουργείτε τακτικά αντίγραφα ασφαλείας των δεδομένων σας, στην περίπτωση της κρυπτογράφησης βεβαιωθείτε ότι έχετε λάβει αντίγραφο ασφαλείας των κλειδιών κρυπτογράφησης παράλληλα με τα δεδομένα σας.",
     "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
@@ -229,7 +227,6 @@ OC.L10N.register(
     "No email address set" : "Δεν ορίστηκε διεύθυνση email",
     "You are member of the following groups:" : "Είστε μέλος των ακόλουθων ομάδων:",
     "Password" : "Συνθηματικό",
-    "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
     "Current password" : "Τρέχων συνθηματικό",
     "New password" : "Νέο συνθηματικό",
     "Change password" : "Αλλαγή συνθηματικού",
@@ -242,9 +239,7 @@ OC.L10N.register(
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
     "Android app" : "Εφαρμογή Android",
     "iOS app" : "Εφαρμογή iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!",
     "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen}  κοινότητα του  ownCloud {linkclose}, ο {githubopen}  πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
     "Show user backend" : "Εμφάνιση χρήστη συστήματος υποστήριξης",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index f224a5f9a02..155c2b3b764 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Εσφαλμένο συνθηματικό",
+    "Saved" : "Αποθηκεύτηκαν",
     "No user supplied" : "Δεν εισήχθη χρήστης",
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Παρακαλώ παρέχετε έναν κωδικό ανάκτησης διαχειριστή, διαφορετικά όλα τα δεδομένα χρήστη θα χαθούν",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
     "log-level out of allowed range" : "Το επίπεδο καταγραφής είναι εκτός του επιτρεπόμενου πεδίου",
-    "Saved" : "Αποθηκεύτηκαν",
     "test email settings" : "δοκιμή ρυθμίσεων email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.(Error: %s)",
     "Email sent" : "Το Email απεστάλη ",
@@ -61,7 +61,6 @@
     "Experimental" : "Πειραματικό",
     "All" : "Όλες",
     "No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
     "Update to %s" : "Ενημέρωση σε %s",
@@ -153,7 +152,6 @@
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Μόλις ενεργοποιηθεί η κρυπτογράφηση, όλα τα αρχεία που θα μεταφορτωθούν από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή. Η κρυπτογράφηση είναι δυνατόν να απενεργοποιηθεί αργότερα μόνο αν το ενεργό άρθρωμα κρυπτογράφησης υποστηρίζει αυτή τη λειτουργία και εκπληρούνται όλες οι προϋποθέσεις (πχ ορισμός κλειδιού ανάκτησης).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Η κρυπτογράφηση από΄μ9ονη της δεν εγγυάται την την ασφάλεια του συστήματος. Παρακαλούμε δείτε την τεκμηρίωση του ownCloud για περισσότερες πληροφορίες σχετικά με το πως δουλεύει η εφαρμογή κρυπτογράφησης και τις υποστηριζόμενες περιπτώσεις χρήσης.",
     "Be aware that encryption always increases the file size." : "Έχετε στο νου σας πως η κρυπτογράφηση πάντα αυξάνει το μέγεθος του αρχείου",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Είναι πάντοτε καλό να δημιουργείτε τακτικά αντίγραφα ασφαλείας των δεδομένων σας, στην περίπτωση της κρυπτογράφησης βεβαιωθείτε ότι έχετε λάβει αντίγραφο ασφαλείας των κλειδιών κρυπτογράφησης παράλληλα με τα δεδομένα σας.",
     "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
@@ -227,7 +225,6 @@
     "No email address set" : "Δεν ορίστηκε διεύθυνση email",
     "You are member of the following groups:" : "Είστε μέλος των ακόλουθων ομάδων:",
     "Password" : "Συνθηματικό",
-    "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
     "Current password" : "Τρέχων συνθηματικό",
     "New password" : "Νέο συνθηματικό",
     "Change password" : "Αλλαγή συνθηματικού",
@@ -240,9 +237,7 @@
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
     "Android app" : "Εφαρμογή Android",
     "iOS app" : "Εφαρμογή iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!",
     "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen}  κοινότητα του  ownCloud {linkclose}, ο {githubopen}  πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
     "Show user backend" : "Εμφάνιση χρήστη συστήματος υποστήριξης",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 2cd979acba7..b04c8728b6a 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Incorrect password",
+    "Saved" : "Saved",
     "No user supplied" : "No user supplied",
     "Authentication error" : "Authentication error",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
     "log-level out of allowed range" : "log-level out of allowed range",
-    "Saved" : "Saved",
     "test email settings" : "test email settings",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "A problem occurred while sending the email. Please revise your settings. (Error: %s)",
     "Email sent" : "Email sent",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "All",
     "No apps found for your version" : "No apps found for your version",
     "The app will be downloaded from the app store" : "The app will be downloaded from the app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Official apps are developed by the community. They offer additional functionality and are ready for production use.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
     "Update to %s" : "Update to %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Enable server-side encryption",
     "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
     "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
     "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Show description …",
     "Hide description …" : "Hide description …",
     "This app has an update available." : "This app has an update available.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "This app has no minimum Nextcloud version assigned. This will cause an error in the future.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "This app has no maximum Nextcloud version assigned. This will cause an error in the future.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:",
     "Enable only for specific groups" : "Enable only for specific groups",
     "Uninstall App" : "Uninstall App",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "No email address set",
     "You are member of the following groups:" : "You are member of the following groups:",
     "Password" : "Password",
-    "Unable to change your password" : "Unable to change your password",
     "Current password" : "Current password",
     "New password" : "New password",
     "Change password" : "Change password",
     "Language" : "Language",
     "Help translate" : "Help translate",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "These are the web, desktop and mobile clients currently logged in to your ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "These are the web, desktop and mobile clients currently logged in to your account.",
     "Browser" : "Browser",
     "Most recent activity" : "Most recent activity",
     "You've linked these apps." : "You've linked these apps.",
@@ -279,15 +278,16 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "An app password is a passcode that gives an app or device permissions to access your %s account.",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
+    "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
     "Username" : "Username",
     "Done" : "Done",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "To support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
     "Show First Run Wizard again" : "Show First Run Wizard again",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 7370315c5f1..eec9de5861a 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Incorrect password",
+    "Saved" : "Saved",
     "No user supplied" : "No user supplied",
     "Authentication error" : "Authentication error",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
     "log-level out of allowed range" : "log-level out of allowed range",
-    "Saved" : "Saved",
     "test email settings" : "test email settings",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "A problem occurred while sending the email. Please revise your settings. (Error: %s)",
     "Email sent" : "Email sent",
@@ -62,7 +62,7 @@
     "All" : "All",
     "No apps found for your version" : "No apps found for your version",
     "The app will be downloaded from the app store" : "The app will be downloaded from the app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Official apps are developed by the community. They offer additional functionality and are ready for production use.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
     "Update to %s" : "Update to %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Enable server-side encryption",
     "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encryption alone does not guarantee complete security. Please read the documentation for information on how the encryption app works, and supported use cases.",
     "Be aware that encryption always increases the file size." : "Be aware that encryption always increases the file size.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.",
     "This is the final warning: Do you really want to enable encryption?" : "This is the final warning: Do you really want to enable encryption?",
@@ -226,8 +226,8 @@
     "Show description …" : "Show description …",
     "Hide description …" : "Hide description …",
     "This app has an update available." : "This app has an update available.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "This app has no minimum Nextcloud version assigned. This will cause an error in the future.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "This app has no maximum Nextcloud version assigned. This will cause an error in the future.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:",
     "Enable only for specific groups" : "Enable only for specific groups",
     "Uninstall App" : "Uninstall App",
@@ -263,13 +263,12 @@
     "No email address set" : "No email address set",
     "You are member of the following groups:" : "You are member of the following groups:",
     "Password" : "Password",
-    "Unable to change your password" : "Unable to change your password",
     "Current password" : "Current password",
     "New password" : "New password",
     "Change password" : "Change password",
     "Language" : "Language",
     "Help translate" : "Help translate",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "These are the web, desktop and mobile clients currently logged in to your ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "These are the web, desktop and mobile clients currently logged in to your account.",
     "Browser" : "Browser",
     "Most recent activity" : "Most recent activity",
     "You've linked these apps." : "You've linked these apps.",
@@ -277,15 +276,16 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "An app password is a passcode that gives an app or device permissions to access your %s account.",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
+    "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
     "Username" : "Username",
     "Done" : "Done",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "To support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!",
     "Show First Run Wizard again" : "Show First Run Wizard again",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
     "Show user backend" : "Show user backend",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 83c49ce8b4a..d8241124ce8 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Contraseña incorrecta",
+    "Saved" : "Guardado",
     "No user supplied" : "No se especificó un usuario",
     "Authentication error" : "Error de autenticación",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "No se pudo agregar el grupo.",
     "Unable to delete group." : "No se pudo eliminar el grupo.",
     "log-level out of allowed range" : "Nivel de autenticación fuera del rango permitido",
-    "Saved" : "Guardado",
     "test email settings" : "probar configuración de correo electrónico",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocurrió un problema al enviar el mensaje de correo electrónico. Revise su configuración. (Error: %s)",
     "Email sent" : "Correo electrónico enviado",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Todos",
     "No apps found for your version" : "No se han encontrado aplicaciones para su versión",
     "The app will be downloaded from the app store" : "La app debe ser descargada desde una app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Las apps oficiales están desarrolladas por y dentro de la comunidad. Ofrecen una funcionalidad central y están preparadas para uso en producción.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.",
     "Update to %s" : "Actualizar a %s",
@@ -119,6 +119,7 @@ OC.L10N.register(
     "Unlimited" : "Ilimitado",
     "Personal info" : "Información personal",
     "Sessions" : "Sesiones",
+    "App passwords" : "Contraseñas de la app",
     "Sync clients" : "Sincronizar clientes",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
@@ -174,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado en sí solo no garantiza la seguridad del sistema. Por favor, consulte la documentación de ownCloud para obtener más información acerca de cómo funciona la aplicación de cifrado, y los casos de uso compatibles.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
     "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
@@ -227,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Mostrar descripción…",
     "Hide description …" : "Ocultar descripción…",
     "This app has an update available." : "Está app tiene una actualización pendiente.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión mínima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión máxima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión mínima de Nextcloud asignada. Esto será un error en el futuro.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión máxima de Nextcloud asignada. Esto será un error en el futuro.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:",
     "Enable only for specific groups" : "Activar solamente para grupos específicos",
     "Uninstall App" : "Desinstalar aplicación",
@@ -264,25 +265,29 @@ OC.L10N.register(
     "No email address set" : "Ninguna dirección de correo establecida",
     "You are member of the following groups:" : "Es miembro de los siguientes grupos:",
     "Password" : "Contraseña",
-    "Unable to change your password" : "No se ha podido cambiar su contraseña",
     "Current password" : "Contraseña actual",
     "New password" : "Nueva contraseña",
     "Change password" : "Cambiar contraseña",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estos son los clientes en web, en escritorio y en móvil actualmente conectados en su OwnCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Estos son los clientes web, de escritorio y móviles conectados actualmente a tu cuenta.",
     "Browser" : "Navegador",
     "Most recent activity" : "Actividad más reciente",
+    "You've linked these apps." : "Has enlazado estas apps.",
     "Name" : "Nombre",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una contraseña de app es un código de paso que da permisos a una app o dispositivo para acceder a tu cuenta %s.",
+    "App name" : "Nombre de la app",
+    "Create new app password" : "Crear nueva contraseña de app",
+    "Use the credentials below to configure your app or device." : "Use las siguientes credenciales para configurar su app o dispositivo.",
     "Username" : "Nombre de usuario",
     "Done" : "Hecho",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación de Android",
     "iOS app" : "La aplicación de iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere apoyar el proyecto\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">únase a su desarrollo</a>\n⇥⇥o\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">'difunda la palabra!</a>!",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad ownCloud{linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Nextcloud[linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
     "Show user backend" : "Mostrar motor de usuario",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index cfe244068ef..a9b6f130109 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Contraseña incorrecta",
+    "Saved" : "Guardado",
     "No user supplied" : "No se especificó un usuario",
     "Authentication error" : "Error de autenticación",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
@@ -17,7 +18,6 @@
     "Unable to add group." : "No se pudo agregar el grupo.",
     "Unable to delete group." : "No se pudo eliminar el grupo.",
     "log-level out of allowed range" : "Nivel de autenticación fuera del rango permitido",
-    "Saved" : "Guardado",
     "test email settings" : "probar configuración de correo electrónico",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocurrió un problema al enviar el mensaje de correo electrónico. Revise su configuración. (Error: %s)",
     "Email sent" : "Correo electrónico enviado",
@@ -62,7 +62,7 @@
     "All" : "Todos",
     "No apps found for your version" : "No se han encontrado aplicaciones para su versión",
     "The app will be downloaded from the app store" : "La app debe ser descargada desde una app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Las apps oficiales están desarrolladas por y dentro de la comunidad. Ofrecen una funcionalidad central y están preparadas para uso en producción.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.",
     "Update to %s" : "Actualizar a %s",
@@ -117,6 +117,7 @@
     "Unlimited" : "Ilimitado",
     "Personal info" : "Información personal",
     "Sessions" : "Sesiones",
+    "App passwords" : "Contraseñas de la app",
     "Sync clients" : "Sincronizar clientes",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
@@ -172,7 +173,7 @@
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Una vez que el cifrado está habilitado, todos los archivos subidos al servidor desde ese punto en adelante se cifrarán en reposo en el servidor. Sólo será posible desactivar el cifrado en una fecha posterior si el módulo de cifrado activado soporta esa función, y todas las condiciones previas (por ejemplo, el establecimiento de una clave de recuperación) se cumplan.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado en sí solo no garantiza la seguridad del sistema. Por favor, consulte la documentación de ownCloud para obtener más información acerca de cómo funciona la aplicación de cifrado, y los casos de uso compatibles.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "El cifrado no garantiza por sí solo la seguridad del sistema. Por favor, vea la documentación para más información sobre cómo funciona la app de cifrado y los casos de uso soportados.",
     "Be aware that encryption always increases the file size." : "Tenga presente que la encripción siempre incrementa el tamaño del archivo.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es siempre bueno crear copias de seguridad de sus datos, en el caso del cifrado, asegúrese de tener una copia de seguridad de las claves de cifrado junto con sus datos.",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
@@ -225,8 +226,8 @@
     "Show description …" : "Mostrar descripción…",
     "Hide description …" : "Ocultar descripción…",
     "This app has an update available." : "Está app tiene una actualización pendiente.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión mínima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión máxima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión mínima de Nextcloud asignada. Esto será un error en el futuro.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión máxima de Nextcloud asignada. Esto será un error en el futuro.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:",
     "Enable only for specific groups" : "Activar solamente para grupos específicos",
     "Uninstall App" : "Desinstalar aplicación",
@@ -262,25 +263,29 @@
     "No email address set" : "Ninguna dirección de correo establecida",
     "You are member of the following groups:" : "Es miembro de los siguientes grupos:",
     "Password" : "Contraseña",
-    "Unable to change your password" : "No se ha podido cambiar su contraseña",
     "Current password" : "Contraseña actual",
     "New password" : "Nueva contraseña",
     "Change password" : "Cambiar contraseña",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estos son los clientes en web, en escritorio y en móvil actualmente conectados en su OwnCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Estos son los clientes web, de escritorio y móviles conectados actualmente a tu cuenta.",
     "Browser" : "Navegador",
     "Most recent activity" : "Actividad más reciente",
+    "You've linked these apps." : "Has enlazado estas apps.",
     "Name" : "Nombre",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una contraseña de app es un código de paso que da permisos a una app o dispositivo para acceder a tu cuenta %s.",
+    "App name" : "Nombre de la app",
+    "Create new app password" : "Crear nueva contraseña de app",
+    "Use the credentials below to configure your app or device." : "Use las siguientes credenciales para configurar su app o dispositivo.",
     "Username" : "Nombre de usuario",
     "Done" : "Hecho",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación de Android",
     "iOS app" : "La aplicación de iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere apoyar el proyecto\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">únase a su desarrollo</a>\n⇥⇥o\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">'difunda la palabra!</a>!",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad ownCloud{linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Nextcloud[linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
     "Show user backend" : "Mostrar motor de usuario",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index a868e8792ba..6c8fe9af6d9 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Väärä salasana",
+    "Saved" : "Tallennettu",
     "No user supplied" : "Käyttäjää ei määritetty",
     "Authentication error" : "Tunnistautumisvirhe",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
     "log-level out of allowed range" : "lokitaso ei sallittujen rajojen sisäpuolella",
-    "Saved" : "Tallennettu",
     "test email settings" : "testaa sähköpostiasetukset",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset. (Virhe: %s)",
     "Email sent" : "Sähköposti lähetetty",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "All" : "Kaikki",
     "No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
     "The app will be downloaded from the app store" : "Sovellus ladataan sovelluskaupasta",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.",
     "Update to %s" : "Päivitä versioon %s",
@@ -162,7 +161,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Salaaminen pelkästään ei takaa järjestelmän tietoturvaa. Tutustu ownCloudin dokumentaation saadaksesi lisätietoja salaussovelluksen toiminnasta ja tuetuista käyttötapauksista.",
     "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
@@ -213,8 +211,6 @@ OC.L10N.register(
     "Show description …" : "Näytä kuvaus…",
     "Hide description …" : "Piilota kuvaus…",
     "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin vähimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin enimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Tätä sovellusta ei voi asentaa, koska seuraavat riippuvuudet eivät täyty:",
     "Enable only for specific groups" : "Salli vain tietyille ryhmille",
     "Uninstall App" : "Poista sovelluksen asennus",
@@ -250,13 +246,11 @@ OC.L10N.register(
     "No email address set" : "Sähköpostiosoitetta ei ole asetettu",
     "You are member of the following groups:" : "Olet jäsenenä seuraavissa ryhmissä:",
     "Password" : "Salasana",
-    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
     "Current password" : "Nykyinen salasana",
     "New password" : "Uusi salasana",
     "Change password" : "Vaihda salasana",
     "Language" : "Kieli",
     "Help translate" : "Auta kääntämisessä",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Nämä ovat parhaillaan ownCloudiisi kirjautuneet verkko-, työpöytä- ja mobiilisovellukset.",
     "Browser" : "Selain",
     "Most recent activity" : "Viimeisimmät toimet",
     "You've linked these apps." : "Olet linkittänyt nämä sovellukset.",
@@ -264,16 +258,13 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Sovellussalasana on suojakoodi, joka antaa sovellukselle tai laitteelle käyttöoikeuden %s-tiliisi.",
     "App name" : "Sovelluksen nimi",
     "Create new app password" : "Luo uusi sovellussalasana",
-    "Use the credentials below to configure your app or device." : "Käytä alla olevia kirjautumistietoja määrittääksesi sovelluksesi tai laitteen.",
     "Username" : "Käyttäjätunnus",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
     "iOS app" : "iOS-sovellus",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!",
     "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
     "Show user backend" : "Näytä käyttäjätaustaosa",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index d62b7f01192..aa2fdc660f8 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Väärä salasana",
+    "Saved" : "Tallennettu",
     "No user supplied" : "Käyttäjää ei määritetty",
     "Authentication error" : "Tunnistautumisvirhe",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
@@ -16,7 +17,6 @@
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
     "log-level out of allowed range" : "lokitaso ei sallittujen rajojen sisäpuolella",
-    "Saved" : "Tallennettu",
     "test email settings" : "testaa sähköpostiasetukset",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset. (Virhe: %s)",
     "Email sent" : "Sähköposti lähetetty",
@@ -61,7 +61,6 @@
     "All" : "Kaikki",
     "No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
     "The app will be downloaded from the app store" : "Sovellus ladataan sovelluskaupasta",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.",
     "Update to %s" : "Päivitä versioon %s",
@@ -160,7 +159,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Salaaminen pelkästään ei takaa järjestelmän tietoturvaa. Tutustu ownCloudin dokumentaation saadaksesi lisätietoja salaussovelluksen toiminnasta ja tuetuista käyttötapauksista.",
     "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Säännöllisten varmuuskopioiden ottaminen on erittäin tärkeää. Jos olet ottanut salauksen käyttöön, huolehdi salausavainten varmuuskopioinnista.",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
@@ -211,8 +209,6 @@
     "Show description …" : "Näytä kuvaus…",
     "Hide description …" : "Piilota kuvaus…",
     "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin vähimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin enimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Tätä sovellusta ei voi asentaa, koska seuraavat riippuvuudet eivät täyty:",
     "Enable only for specific groups" : "Salli vain tietyille ryhmille",
     "Uninstall App" : "Poista sovelluksen asennus",
@@ -248,13 +244,11 @@
     "No email address set" : "Sähköpostiosoitetta ei ole asetettu",
     "You are member of the following groups:" : "Olet jäsenenä seuraavissa ryhmissä:",
     "Password" : "Salasana",
-    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
     "Current password" : "Nykyinen salasana",
     "New password" : "Uusi salasana",
     "Change password" : "Vaihda salasana",
     "Language" : "Kieli",
     "Help translate" : "Auta kääntämisessä",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Nämä ovat parhaillaan ownCloudiisi kirjautuneet verkko-, työpöytä- ja mobiilisovellukset.",
     "Browser" : "Selain",
     "Most recent activity" : "Viimeisimmät toimet",
     "You've linked these apps." : "Olet linkittänyt nämä sovellukset.",
@@ -262,16 +256,13 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Sovellussalasana on suojakoodi, joka antaa sovellukselle tai laitteelle käyttöoikeuden %s-tiliisi.",
     "App name" : "Sovelluksen nimi",
     "Create new app password" : "Luo uusi sovellussalasana",
-    "Use the credentials below to configure your app or device." : "Käytä alla olevia kirjautumistietoja määrittääksesi sovelluksesi tai laitteen.",
     "Username" : "Käyttäjätunnus",
     "Done" : "Valmis",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
     "iOS app" : "iOS-sovellus",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!",
     "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
     "Show user backend" : "Näytä käyttäjätaustaosa",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index de42c29cd6e..a541eeda863 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Mot de passe incorrect",
+    "Saved" : "Sauvegardé",
     "No user supplied" : "Aucun utilisateur fourni",
     "Authentication error" : "Erreur d'authentification",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
     "log-level out of allowed range" : "niveau de journalisation hors borne",
-    "Saved" : "Sauvegardé",
     "test email settings" : "Test des paramètres e-mail",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres. (Erreur: %s)",
     "Email sent" : "E-mail envoyé",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Tous",
     "No apps found for your version" : "Pas d'application trouvée pour votre version",
     "The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles permettent à ownCloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Les applications officielles sont développées par et dans la communauté. Elles offrent les fonctionnalités indispensables et sont prêtes pour être utilisées en production.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
     "Update to %s" : "Mettre à niveau vers la version %s",
@@ -119,7 +119,7 @@ OC.L10N.register(
     "Unlimited" : "Illimité",
     "Personal info" : "Informations personnelles",
     "Sessions" : "Sessions",
-    "App passwords" : "Mots de passe d'applications",
+    "App passwords" : "Mots de passe de l'application",
     "Sync clients" : "Clients de synchronisation",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
@@ -137,7 +137,7 @@ OC.L10N.register(
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
-    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données n'est pas lancée avec le niveau d'isolation de transaction \"READ COMMITED\". Cela peut causer des problèmes lorsque plusieurs actions sont lancées parallèlement.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données ne fonctionne pas avec le niveau d'isolation de transaction \"READ COMMITED\". Ceci peut causer des problèmes quand plusieurs actions sont exécutées en parallèle.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
     "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne peut garantir la sécurité du système. Veuillez consulter la documentation ownCloud pour comprendre comment fonctionne l'application de chiffrement, et les cas d'utilisation pris en charge.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
     "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
     "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app has an update available." : "Cette application a une mise à jour disponible.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud minimale requise. Cela provoquera une erreur dans ownCloud 11+",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud maximale requise. Cela provoquera une erreur dans ownCloud 11+",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version minimum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version maximum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
     "Enable only for specific groups" : "Activer uniquement pour certains groupes",
     "Uninstall App" : "Désinstaller l'application",
@@ -265,30 +265,29 @@ OC.L10N.register(
     "No email address set" : "Aucune adresse e-mail configurée",
     "You are member of the following groups:" : "Vous êtes membre des groupes suivants :",
     "Password" : "Mot de passe",
-    "Unable to change your password" : "Impossible de changer votre mot de passe",
     "Current password" : "Mot de passe actuel",
     "New password" : "Nouveau mot de passe",
     "Change password" : "Changer de mot de passe",
     "Language" : "Langue",
     "Help translate" : "Aidez à traduire",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Voici les clients web, de bureau et mobiles actuellement connectés à votre ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Ce sont les clients web, de bureau et mobiles actuellement connectés à votre compte.",
     "Browser" : "Navigateur",
     "Most recent activity" : "Activité la plus récente",
     "You've linked these apps." : "Vous avez lié ces applications.",
     "Name" : "Nom",
-    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'une application est un code d'accès qui donne à une application ou à un appareil les droits d'accès à votre compte %s.",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'application est un mot de passe qui autorise à une application ou à un appareil l'accès à votre %s compte.",
     "App name" : "Nom de l'application",
     "Create new app password" : "Créer un nouveau mot de passe d'application",
-    "Use the credentials below to configure your app or device." : "Utilisez les identifiants ci-dessous pour configurer votre application ou votre périphérique.",
+    "Use the credentials below to configure your app or device." : "Utilisez les informations d'identification ci-dessous pour configurer votre application ou appareil.",
     "Username" : "Nom d'utilisateur",
     "Done" : "Terminé",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
     "Android app" : "Application Android",
     "iOS app" : "Application iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n        <a href=\"https://owncloud.org/contribute\"\n            target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n        ou\n        <a href=\"https://owncloud.org/promote\"\n            target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous voulez supporter le projet\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">rejoindre le développement</a>\n⇥⇥ou\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">faites découvrir</a>!",
     "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la  {communityopen}communauté Nextcloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
     "Show user backend" : "Montrer la source de l'identifiant",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 21cbbd2c940..89e66e1c0c2 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Mot de passe incorrect",
+    "Saved" : "Sauvegardé",
     "No user supplied" : "Aucun utilisateur fourni",
     "Authentication error" : "Erreur d'authentification",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
     "log-level out of allowed range" : "niveau de journalisation hors borne",
-    "Saved" : "Sauvegardé",
     "test email settings" : "Test des paramètres e-mail",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres. (Erreur: %s)",
     "Email sent" : "E-mail envoyé",
@@ -62,7 +62,7 @@
     "All" : "Tous",
     "No apps found for your version" : "Pas d'application trouvée pour votre version",
     "The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles permettent à ownCloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Les applications officielles sont développées par et dans la communauté. Elles offrent les fonctionnalités indispensables et sont prêtes pour être utilisées en production.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
     "Update to %s" : "Mettre à niveau vers la version %s",
@@ -117,7 +117,7 @@
     "Unlimited" : "Illimité",
     "Personal info" : "Informations personnelles",
     "Sessions" : "Sessions",
-    "App passwords" : "Mots de passe d'applications",
+    "App passwords" : "Mots de passe de l'application",
     "Sync clients" : "Clients de synchronisation",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
@@ -135,7 +135,7 @@
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
-    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données n'est pas lancée avec le niveau d'isolation de transaction \"READ COMMITED\". Cela peut causer des problèmes lorsque plusieurs actions sont lancées parallèlement.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Votre base de données ne fonctionne pas avec le niveau d'isolation de transaction \"READ COMMITED\". Ceci peut causer des problèmes quand plusieurs actions sont exécutées en parallèle.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
     "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne peut garantir la sécurité du système. Veuillez consulter la documentation ownCloud pour comprendre comment fonctionne l'application de chiffrement, et les cas d'utilisation pris en charge.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.",
     "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Il est opportun de sauvegarder régulièrement vos données. Si ces données sont chiffrées, n'oubliez pas de sauvegarder aussi les clés de chiffrement.",
     "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
@@ -226,8 +226,8 @@
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app has an update available." : "Cette application a une mise à jour disponible.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud minimale requise. Cela provoquera une erreur dans ownCloud 11+",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud maximale requise. Cela provoquera une erreur dans ownCloud 11+",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version minimum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version maximum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
     "Enable only for specific groups" : "Activer uniquement pour certains groupes",
     "Uninstall App" : "Désinstaller l'application",
@@ -263,30 +263,29 @@
     "No email address set" : "Aucune adresse e-mail configurée",
     "You are member of the following groups:" : "Vous êtes membre des groupes suivants :",
     "Password" : "Mot de passe",
-    "Unable to change your password" : "Impossible de changer votre mot de passe",
     "Current password" : "Mot de passe actuel",
     "New password" : "Nouveau mot de passe",
     "Change password" : "Changer de mot de passe",
     "Language" : "Langue",
     "Help translate" : "Aidez à traduire",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Voici les clients web, de bureau et mobiles actuellement connectés à votre ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Ce sont les clients web, de bureau et mobiles actuellement connectés à votre compte.",
     "Browser" : "Navigateur",
     "Most recent activity" : "Activité la plus récente",
     "You've linked these apps." : "Vous avez lié ces applications.",
     "Name" : "Nom",
-    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'une application est un code d'accès qui donne à une application ou à un appareil les droits d'accès à votre compte %s.",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Un mot de passe d'application est un mot de passe qui autorise à une application ou à un appareil l'accès à votre %s compte.",
     "App name" : "Nom de l'application",
     "Create new app password" : "Créer un nouveau mot de passe d'application",
-    "Use the credentials below to configure your app or device." : "Utilisez les identifiants ci-dessous pour configurer votre application ou votre périphérique.",
+    "Use the credentials below to configure your app or device." : "Utilisez les informations d'identification ci-dessous pour configurer votre application ou appareil.",
     "Username" : "Nom d'utilisateur",
     "Done" : "Terminé",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
     "Android app" : "Application Android",
     "iOS app" : "Application iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n        <a href=\"https://owncloud.org/contribute\"\n            target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n        ou\n        <a href=\"https://owncloud.org/promote\"\n            target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous voulez supporter le projet\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">rejoindre le développement</a>\n⇥⇥ou\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">faites découvrir</a>!",
     "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la  {communityopen}communauté Nextcloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
     "Show user backend" : "Montrer la source de l'identifiant",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index aa5f1af0997..6f71e1c0316 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Contrasinal incorrecto",
+    "Saved" : "Gardado",
     "No user supplied" : "Non subministrado polo usuario",
     "Authentication error" : "Produciuse un erro de autenticación",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
     "log-level out of allowed range" : "o nivel do rexistro está fora do intervalo admitido",
-    "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocorreu un problema ao enviar o correo. Revise a súa configuración. (Erro: %s)",
     "Email sent" : "Correo enviado",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Experimental",
     "All" : "Todo",
     "No apps found for your version" : "Non se atoparon aplicativos para esta versión",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
     "Update to %s" : "Actualizar a %s",
@@ -219,7 +218,6 @@ OC.L10N.register(
     "No email address set" : "Non hai un enderezo de correo definido",
     "You are member of the following groups:" : "Vostede é membro dos seguintes grupos:",
     "Password" : "Contrasinal",
-    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
     "Current password" : "Contrasinal actual",
     "New password" : "Novo contrasinal",
     "Change password" : "Cambiar o contrasinal",
@@ -232,9 +230,7 @@ OC.L10N.register(
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación Android",
     "iOS app" : "Aplicación iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!",
     "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Amosar a localización do almacenamento",
     "Show last log in" : "Amosar a última conexión",
     "Show user backend" : "Amosar a infraestrutura do usuario",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 16f44ea74cf..f8a9befa885 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Contrasinal incorrecto",
+    "Saved" : "Gardado",
     "No user supplied" : "Non subministrado polo usuario",
     "Authentication error" : "Produciuse un erro de autenticación",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
     "log-level out of allowed range" : "o nivel do rexistro está fora do intervalo admitido",
-    "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocorreu un problema ao enviar o correo. Revise a súa configuración. (Erro: %s)",
     "Email sent" : "Correo enviado",
@@ -61,7 +61,6 @@
     "Experimental" : "Experimental",
     "All" : "Todo",
     "No apps found for your version" : "Non se atoparon aplicativos para esta versión",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
     "Update to %s" : "Actualizar a %s",
@@ -217,7 +216,6 @@
     "No email address set" : "Non hai un enderezo de correo definido",
     "You are member of the following groups:" : "Vostede é membro dos seguintes grupos:",
     "Password" : "Contrasinal",
-    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
     "Current password" : "Contrasinal actual",
     "New password" : "Novo contrasinal",
     "Change password" : "Cambiar o contrasinal",
@@ -230,9 +228,7 @@
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación Android",
     "iOS app" : "Aplicación iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!",
     "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Amosar a localización do almacenamento",
     "Show last log in" : "Amosar a última conexión",
     "Show user backend" : "Amosar a infraestrutura do usuario",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index fe936e89562..d5eb4292b0d 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "סיסמא שגוייה",
+    "Saved" : "נשמר",
     "No user supplied" : "לא סופק שם משתמש",
     "Authentication error" : "שגיאת הזדהות",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "יש לספק את סיסמת המנהל לשחזור, אחרת כל מידע המשתמש יאבד",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "לא ניתן להוסיף קבוצה.",
     "Unable to delete group." : "לא ניתן למחוק קבוצה.",
     "log-level out of allowed range" : "גודל הלוג מעבר לרמה המותרת",
-    "Saved" : "נשמר",
     "test email settings" : "בדיקת הגדרות דואר אלקטרוני",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "בעיה אירעה בשליחת הדואר האלקטרוני. יש לשנות את ההגדרות שלך. (שגיאה: %s)",
     "Email sent" : "הודעת הדואר האלקטרוני נשלחה",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "הכל",
     "No apps found for your version" : "לא נמצאו יישומים לגרסה שלך",
     "The app will be downloaded from the app store" : "היישום ירד מחנות היישומים",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת ownCloud. הם מציעים פונקיונאליות, התאמה ל- ownCloud ומוכנים לשימוש כבד.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.",
     "Update to %s" : "עדכון ל- %s",
@@ -175,7 +174,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
     "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "הצפנה בלבד אינה מבטיחה את אבטחת המערכת. יש לקרוא את מסמכי ה- ownCloud למידע נוסף איך יישום ההצפנה עובד, ואפשרויות השימוש הנתמכות.",
     "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
     "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
@@ -228,8 +226,6 @@ OC.L10N.register(
     "Show description …" : "הצגת תיאור ...",
     "Hide description …" : "הסתרת תיאור ...",
     "This app has an update available." : "ליישום זה קיים עדכון זמין.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מינמלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מקסימלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "לא ניתן להתקין את יישום זה כיוון שייחסי התלות הבאים לא התקיימו:",
     "Enable only for specific groups" : "אפשר רק לקבוצות מסויימות",
     "Uninstall App" : "הסרת יישום",
@@ -265,13 +261,11 @@ OC.L10N.register(
     "No email address set" : "לא נקבעה כתובת דואר אלקטרוני",
     "You are member of the following groups:" : "הקבוצות הבאות כוללות אותך:",
     "Password" : "סיסמא",
-    "Unable to change your password" : "לא ניתן לשנות את הסיסמא שלך",
     "Current password" : "סיסמא נוכחית",
     "New password" : "סיסמא חדשה",
     "Change password" : "שינוי סיסמא",
     "Language" : "שפה",
     "Help translate" : "עזרה בתרגום",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "אלו הם לקוחות האינטרנט, המחשב השולחני והטלפון שכרגע מחוברים ל- ownCloud שלך.",
     "Browser" : "דפדפן",
     "Most recent activity" : "פעילות אחרונה",
     "You've linked these apps." : "יישומים אלו כבר קושרו על ידך.",
@@ -279,16 +273,13 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "סיסמת יישום הנה קוד סיסמא שמאפשרת ליישום או התקן הרשאות גישה לחשבון %s שלך.",
     "App name" : "שם יישום",
     "Create new app password" : "יצירת סיסמת יישום חדשה",
-    "Use the credentials below to configure your app or device." : "יש להשתמש באישורים מטה להגדרת היישום או ההתקן שלך.",
     "Username" : "שם משתמש",
     "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
     "Android app" : "יישום אנדרואיד",
     "iOS app" : "יישום אייפון",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "אם ברצונך לתמוך בפרויקט\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ניתן להצטרך לפיתוח</a>\n\t\tאו\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">להפיץ את הבשורה</a>!",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "פיתוח על ידי {open}קהילת ownCloud community{linkclose}, {githubopen}קוד המקור{linkclose} ברישיון תחת ה- {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "הצגת מיקום אחסון",
     "Show last log in" : "הצגת כניסה אחרונה",
     "Show user backend" : "הצגת צד אחורי למשתמש",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index 7f1a1c69500..37b750112b9 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "סיסמא שגוייה",
+    "Saved" : "נשמר",
     "No user supplied" : "לא סופק שם משתמש",
     "Authentication error" : "שגיאת הזדהות",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "יש לספק את סיסמת המנהל לשחזור, אחרת כל מידע המשתמש יאבד",
@@ -17,7 +18,6 @@
     "Unable to add group." : "לא ניתן להוסיף קבוצה.",
     "Unable to delete group." : "לא ניתן למחוק קבוצה.",
     "log-level out of allowed range" : "גודל הלוג מעבר לרמה המותרת",
-    "Saved" : "נשמר",
     "test email settings" : "בדיקת הגדרות דואר אלקטרוני",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "בעיה אירעה בשליחת הדואר האלקטרוני. יש לשנות את ההגדרות שלך. (שגיאה: %s)",
     "Email sent" : "הודעת הדואר האלקטרוני נשלחה",
@@ -62,7 +62,6 @@
     "All" : "הכל",
     "No apps found for your version" : "לא נמצאו יישומים לגרסה שלך",
     "The app will be downloaded from the app store" : "היישום ירד מחנות היישומים",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת ownCloud. הם מציעים פונקיונאליות, התאמה ל- ownCloud ומוכנים לשימוש כבד.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.",
     "Update to %s" : "עדכון ל- %s",
@@ -173,7 +172,6 @@
     "Enable server-side encryption" : "הפעלת הצפנה בצד שרת",
     "Please read carefully before activating server-side encryption: " : "יש לקרוא בתשומת לב רבה לפני שמפעילים הצפנת צד שרת:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "ברגע שהצפנה מופעלת, כל הקבצים שיועלו לשרת מרגע זה יהיו מוצפנים בשרת. ניתן יהיה לנטרל את ההצפנה בעתיד רק אם מודול ההצפנה תומך בפונקציה זו, וכל התנאים המוקדמים (דהיינו הגדרת מפתח השחזור) מתקיימים.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "הצפנה בלבד אינה מבטיחה את אבטחת המערכת. יש לקרוא את מסמכי ה- ownCloud למידע נוסף איך יישום ההצפנה עובד, ואפשרויות השימוש הנתמכות.",
     "Be aware that encryption always increases the file size." : "תשומת לב לכך שהצפנה בהכרח מגדילה את גודל הקובץ.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "תמיד טוב ליצור גיבוי קבוע למידע , במקרה של הצפנה יש לוודא שגם מפתחות ההצפנה מגובים עם המידע שלך.",
     "This is the final warning: Do you really want to enable encryption?" : "זו הזהרה אחרונה: האם באמת ברצונך להפעיל הצפנה?",
@@ -226,8 +224,6 @@
     "Show description …" : "הצגת תיאור ...",
     "Hide description …" : "הסתרת תיאור ...",
     "This app has an update available." : "ליישום זה קיים עדכון זמין.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מינמלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מקסימלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "לא ניתן להתקין את יישום זה כיוון שייחסי התלות הבאים לא התקיימו:",
     "Enable only for specific groups" : "אפשר רק לקבוצות מסויימות",
     "Uninstall App" : "הסרת יישום",
@@ -263,13 +259,11 @@
     "No email address set" : "לא נקבעה כתובת דואר אלקטרוני",
     "You are member of the following groups:" : "הקבוצות הבאות כוללות אותך:",
     "Password" : "סיסמא",
-    "Unable to change your password" : "לא ניתן לשנות את הסיסמא שלך",
     "Current password" : "סיסמא נוכחית",
     "New password" : "סיסמא חדשה",
     "Change password" : "שינוי סיסמא",
     "Language" : "שפה",
     "Help translate" : "עזרה בתרגום",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "אלו הם לקוחות האינטרנט, המחשב השולחני והטלפון שכרגע מחוברים ל- ownCloud שלך.",
     "Browser" : "דפדפן",
     "Most recent activity" : "פעילות אחרונה",
     "You've linked these apps." : "יישומים אלו כבר קושרו על ידך.",
@@ -277,16 +271,13 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "סיסמת יישום הנה קוד סיסמא שמאפשרת ליישום או התקן הרשאות גישה לחשבון %s שלך.",
     "App name" : "שם יישום",
     "Create new app password" : "יצירת סיסמת יישום חדשה",
-    "Use the credentials below to configure your app or device." : "יש להשתמש באישורים מטה להגדרת היישום או ההתקן שלך.",
     "Username" : "שם משתמש",
     "Done" : "הסתיים",
     "Get the apps to sync your files" : "קבלת היישומים לסנכרון הקבצים שלך",
     "Desktop client" : "מחשב אישי",
     "Android app" : "יישום אנדרואיד",
     "iOS app" : "יישום אייפון",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "אם ברצונך לתמוך בפרויקט\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ניתן להצטרך לפיתוח</a>\n\t\tאו\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">להפיץ את הבשורה</a>!",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "פיתוח על ידי {open}קהילת ownCloud community{linkclose}, {githubopen}קוד המקור{linkclose} ברישיון תחת ה- {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "הצגת מיקום אחסון",
     "Show last log in" : "הצגת כניסה אחרונה",
     "Show user backend" : "הצגת צד אחורי למשתמש",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 9547e549c6c..7331731aeee 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Hibás jelszó",
+    "Saved" : "Elmentve",
     "No user supplied" : "Nincs megadva felhasználó",
     "Authentication error" : "Azonosítási hiba",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Nem lehet létrehozni a csoportot.",
     "Unable to delete group." : "Nem lehet törölni a csoportot.",
     "log-level out of allowed range" : "A naplózási szint a megengedett terjedelmen kívül van.",
-    "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hiba történt az e-mail küldésekor. Kérjük ellenőrizd a beállításokat! (Hiba: %s)",
     "Email sent" : "Az e-mail elküldve!",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Mind",
     "No apps found for your version" : "Nem található alkalmazás a verziód számára",
     "The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "A hivatalos alkalmazásokat az ownCloud közösségen belül fejlesztik. \nAz általuk nyújtott központi ownCloud funkciók készen állnak a produktív használatra.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "A jóváhagyott alkalmazásokat megbízható fejlesztők készítik, amik megfelelnek a felületes biztonsági ellenőrzésnek. Nyílt forráskódú tárolóban aktívan karbantartják és biztosítják a stabil használatot.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
     "Update to %s" : "Frissítés erre: %s",
@@ -167,7 +166,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
     "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás nem garantálja a rendszer biztonságát. Kérjük, bővebb információért keresse fel az ownCloud dokumentációját, ahol megtudhatja, hogy hogyan működik a titkosító alkalmazás és mikor érdemes használni.",
     "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
@@ -218,8 +216,6 @@ OC.L10N.register(
     "Show description …" : "Leírás megjelenítése ...",
     "Hide description …" : "Leírás elrejtése ...",
     "This app has an update available." : "Frissítés érhető el az alkalmazáshoz.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ennek az alkalmazásnak nincs minimális ownCloud verzió megadva. Ez hibát okoz majd az ownCloud 11-es és későbbi verziókban.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ennek az alkalmazásnak nincs maximális ownCloud verzió megadva. Ez hibát okoz majd az ownCloud 11-es és későbbi verziókban.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az applikációt nem lehet telepíteni, mert a következő függőségek hiányoznak:",
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
     "Uninstall App" : "Alkalmazás eltávolítása",
@@ -254,7 +250,6 @@ OC.L10N.register(
     "No email address set" : "Nincs e-mail cím beállítva",
     "You are member of the following groups:" : "Tagja vagy a következő csoport(ok)nak:",
     "Password" : "Jelszó",
-    "Unable to change your password" : "A jelszó nem változtatható meg",
     "Current password" : "A jelenlegi jelszó",
     "New password" : "Az új jelszó",
     "Change password" : "A jelszó megváltoztatása",
@@ -267,9 +262,7 @@ OC.L10N.register(
     "Desktop client" : "Asztali kliens",
     "Android app" : "Android applikáció",
     "iOS app" : "IOS applikáció",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.",
     "Show storage location" : "Háttértároló helyének mutatása",
     "Show last log in" : "Utolsó bejelentkezés megjelenítése",
     "Show user backend" : "Felhasználói háttér mutatása",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 2fdfc8eb871..5bbf71ec15e 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Hibás jelszó",
+    "Saved" : "Elmentve",
     "No user supplied" : "Nincs megadva felhasználó",
     "Authentication error" : "Azonosítási hiba",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Nem lehet létrehozni a csoportot.",
     "Unable to delete group." : "Nem lehet törölni a csoportot.",
     "log-level out of allowed range" : "A naplózási szint a megengedett terjedelmen kívül van.",
-    "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hiba történt az e-mail küldésekor. Kérjük ellenőrizd a beállításokat! (Hiba: %s)",
     "Email sent" : "Az e-mail elküldve!",
@@ -62,7 +62,6 @@
     "All" : "Mind",
     "No apps found for your version" : "Nem található alkalmazás a verziód számára",
     "The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "A hivatalos alkalmazásokat az ownCloud közösségen belül fejlesztik. \nAz általuk nyújtott központi ownCloud funkciók készen állnak a produktív használatra.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "A jóváhagyott alkalmazásokat megbízható fejlesztők készítik, amik megfelelnek a felületes biztonsági ellenőrzésnek. Nyílt forráskódú tárolóban aktívan karbantartják és biztosítják a stabil használatot.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
     "Update to %s" : "Frissítés erre: %s",
@@ -165,7 +164,6 @@
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
     "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később csak akkor lehet visszafordítani, ha azt az aktív titkosítási modul támogatja és minden elő-követelmény (például helyreállító kulcs) teljesül.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "A titkosítás nem garantálja a rendszer biztonságát. Kérjük, bővebb információért keresse fel az ownCloud dokumentációját, ahol megtudhatja, hogy hogyan működik a titkosító alkalmazás és mikor érdemes használni.",
     "Be aware that encryption always increases the file size." : "Ügyeljen arra, hogy a titkosítás mindig megnöveli a fájl méretét!",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Mindig jó ötlet rendszeres biztonsági mentést készíteni az adatokról. Titkosítás esetén a titkosító kulcsok biztonsági mentését elkülönítve tárolja az adatoktól!",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
@@ -216,8 +214,6 @@
     "Show description …" : "Leírás megjelenítése ...",
     "Hide description …" : "Leírás elrejtése ...",
     "This app has an update available." : "Frissítés érhető el az alkalmazáshoz.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ennek az alkalmazásnak nincs minimális ownCloud verzió megadva. Ez hibát okoz majd az ownCloud 11-es és későbbi verziókban.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ennek az alkalmazásnak nincs maximális ownCloud verzió megadva. Ez hibát okoz majd az ownCloud 11-es és későbbi verziókban.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az applikációt nem lehet telepíteni, mert a következő függőségek hiányoznak:",
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
     "Uninstall App" : "Alkalmazás eltávolítása",
@@ -252,7 +248,6 @@
     "No email address set" : "Nincs e-mail cím beállítva",
     "You are member of the following groups:" : "Tagja vagy a következő csoport(ok)nak:",
     "Password" : "Jelszó",
-    "Unable to change your password" : "A jelszó nem változtatható meg",
     "Current password" : "A jelenlegi jelszó",
     "New password" : "Az új jelszó",
     "Change password" : "A jelszó megváltoztatása",
@@ -265,9 +260,7 @@
     "Desktop client" : "Asztali kliens",
     "Android app" : "Android applikáció",
     "iOS app" : "IOS applikáció",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.",
     "Show storage location" : "Háttértároló helyének mutatása",
     "Show last log in" : "Utolsó bejelentkezés megjelenítése",
     "Show user backend" : "Felhasználói háttér mutatása",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 25cd0f3bbdf..27cc54bc9b0 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Sandi salah",
+    "Saved" : "Disimpan",
     "No user supplied" : "Tidak ada pengguna yang diberikan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Tidak dapat menambah grup.",
     "Unable to delete group." : "Tidak dapat menghapus grup.",
     "log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
-    "Saved" : "Disimpan",
     "test email settings" : "pengaturan email percobaan",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Terjadi masalah saat mengirim email. Mohon periksa kembali pengaturan Anda. (Kesalahan: %s)",
     "Email sent" : "Email terkirim",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Uji Coba",
     "All" : "Semua",
     "No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Apl ini belum diperiksa masalah keamanannya dan masih baru atau biasanya tidak stabil. Instal dengan resiko Anda sendiri.",
     "Update to %s" : "Perbarui ke %s",
@@ -155,7 +154,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak menjamin keamanan sistem. Silakan lihat dokumentasi ownCloud untuk informasi lebih lanjut tentang bagaimana aplikasi enkripsi bekerja, dan kasus penggunaan yang didukung.",
     "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
@@ -229,7 +227,6 @@ OC.L10N.register(
     "No email address set" : "Alamat email tidak diatur",
     "You are member of the following groups:" : "Anda adalah anggota dari grup berikut:",
     "Password" : "Sandi",
-    "Unable to change your password" : "Gagal mengubah sandi Anda",
     "Current password" : "Sandi saat ini",
     "New password" : "Sandi baru",
     "Change password" : "Ubah sandi",
@@ -242,9 +239,7 @@ OC.L10N.register(
     "Desktop client" : "Klien desktop",
     "Android app" : "Aplikasi Android",
     "iOS app" : "Aplikasi iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!",
     "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index dcb4303bc9a..16dd9f5f3ce 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Sandi salah",
+    "Saved" : "Disimpan",
     "No user supplied" : "Tidak ada pengguna yang diberikan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Tidak dapat menambah grup.",
     "Unable to delete group." : "Tidak dapat menghapus grup.",
     "log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
-    "Saved" : "Disimpan",
     "test email settings" : "pengaturan email percobaan",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Terjadi masalah saat mengirim email. Mohon periksa kembali pengaturan Anda. (Kesalahan: %s)",
     "Email sent" : "Email terkirim",
@@ -61,7 +61,6 @@
     "Experimental" : "Uji Coba",
     "All" : "Semua",
     "No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Apl ini belum diperiksa masalah keamanannya dan masih baru atau biasanya tidak stabil. Instal dengan resiko Anda sendiri.",
     "Update to %s" : "Perbarui ke %s",
@@ -153,7 +152,6 @@
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak menjamin keamanan sistem. Silakan lihat dokumentasi ownCloud untuk informasi lebih lanjut tentang bagaimana aplikasi enkripsi bekerja, dan kasus penggunaan yang didukung.",
     "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
@@ -227,7 +225,6 @@
     "No email address set" : "Alamat email tidak diatur",
     "You are member of the following groups:" : "Anda adalah anggota dari grup berikut:",
     "Password" : "Sandi",
-    "Unable to change your password" : "Gagal mengubah sandi Anda",
     "Current password" : "Sandi saat ini",
     "New password" : "Sandi baru",
     "Change password" : "Ubah sandi",
@@ -240,9 +237,7 @@
     "Desktop client" : "Klien desktop",
     "Android app" : "Aplikasi Android",
     "iOS app" : "Aplikasi iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!",
     "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index 3dd8eaee7ca..7141a614329 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Rangt lykilorð",
+    "Saved" : "Vistað",
     "No user supplied" : "Enginn notandi gefinn",
     "Authentication error" : "Villa við auðkenningu",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Settu inn endurheimtulykilorð kerfisstjóra, annars munu öll notandagögn tapast",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Ekki tókst að bæta hóp við.",
     "Unable to delete group." : "Get ekki eytt hópi.",
     "log-level out of allowed range" : "annálsstig utan leyfðra marka",
-    "Saved" : "Vistað",
     "test email settings" : "prófa tölvupóststillingar",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)",
     "Email sent" : "Tölvupóstur sendur",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Á tilraunastigi",
     "All" : "Allt",
     "No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Opinber forrit eru þróuð af og innan ownCloud samfélagsins. Þau virka með kjarnaeiginleikum ownCloud og eru tilbúin til notkunar í raunvinnslu.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Samþykkt forrit eru þróuð af treystum forriturum og hafa gengist undir lauslegar öryggisprófanir. Þau eru í virku viðhaldi í opnum hugbúnaðarsöfnum og umsjónarmenn þeirra dæma þau nógu stöðug til notkunar í allri venjulegri vinnslu.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Þetta forrit hefur ekki verið öryggisprófað, er nýtt erða þekkt fyrir ótöðugleika við vissar aðstæður. Uppsetning er á þína ábyrgð.",
     "Update to %s" : "Uppfæra í %s",
@@ -152,7 +151,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
     "Enable server-side encryption" : "Virkja dulritun á þjóni",
     "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölownCloud um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
     "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
     "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
@@ -202,8 +200,6 @@ OC.L10N.register(
     "Show description …" : "Birta lýsingu …",
     "Hide description …" : "Fela lýsingu …",
     "This app has an update available." : "Uppfærsla er tiltæk fyrir þetta forrit.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu ownCloud. Þetta mun gefa villu í ownCloud 11 og nýrri.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu ownCloud. Þetta mun gefa villu í ownCloud 11 og nýrri.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:",
     "Enable only for specific groups" : "Einungis fyrir sérstaka hópa",
     "Uninstall App" : "Fjarlægja/Henda út forriti",
@@ -239,7 +235,6 @@ OC.L10N.register(
     "No email address set" : "Ekkert tölvupóstfang sett",
     "You are member of the following groups:" : "Þú ert meðlimur eftirfarandi hópa:",
     "Password" : "Lykilorð",
-    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
     "Current password" : "Núverandi lykilorð",
     "New password" : "Nýtt lykilorð",
     "Change password" : "Breyta lykilorði",
@@ -251,9 +246,7 @@ OC.L10N.register(
     "Desktop client" : "Skjáborðsforrit",
     "Android app" : "Android-forrit",
     "iOS app" : "iOS-forrit",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
     "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}ownCloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
     "Show user backend" : "Birta bakenda notanda",
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index a37cf57d8b4..297a22e0f43 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Rangt lykilorð",
+    "Saved" : "Vistað",
     "No user supplied" : "Enginn notandi gefinn",
     "Authentication error" : "Villa við auðkenningu",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Settu inn endurheimtulykilorð kerfisstjóra, annars munu öll notandagögn tapast",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Ekki tókst að bæta hóp við.",
     "Unable to delete group." : "Get ekki eytt hópi.",
     "log-level out of allowed range" : "annálsstig utan leyfðra marka",
-    "Saved" : "Vistað",
     "test email settings" : "prófa tölvupóststillingar",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)",
     "Email sent" : "Tölvupóstur sendur",
@@ -61,7 +61,6 @@
     "Experimental" : "Á tilraunastigi",
     "All" : "Allt",
     "No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Opinber forrit eru þróuð af og innan ownCloud samfélagsins. Þau virka með kjarnaeiginleikum ownCloud og eru tilbúin til notkunar í raunvinnslu.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Samþykkt forrit eru þróuð af treystum forriturum og hafa gengist undir lauslegar öryggisprófanir. Þau eru í virku viðhaldi í opnum hugbúnaðarsöfnum og umsjónarmenn þeirra dæma þau nógu stöðug til notkunar í allri venjulegri vinnslu.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Þetta forrit hefur ekki verið öryggisprófað, er nýtt erða þekkt fyrir ótöðugleika við vissar aðstæður. Uppsetning er á þína ábyrgð.",
     "Update to %s" : "Uppfæra í %s",
@@ -150,7 +149,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.",
     "Enable server-side encryption" : "Virkja dulritun á þjóni",
     "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölownCloud um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
     "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.",
     "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?",
@@ -200,8 +198,6 @@
     "Show description …" : "Birta lýsingu …",
     "Hide description …" : "Fela lýsingu …",
     "This app has an update available." : "Uppfærsla er tiltæk fyrir þetta forrit.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu ownCloud. Þetta mun gefa villu í ownCloud 11 og nýrri.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu ownCloud. Þetta mun gefa villu í ownCloud 11 og nýrri.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:",
     "Enable only for specific groups" : "Einungis fyrir sérstaka hópa",
     "Uninstall App" : "Fjarlægja/Henda út forriti",
@@ -237,7 +233,6 @@
     "No email address set" : "Ekkert tölvupóstfang sett",
     "You are member of the following groups:" : "Þú ert meðlimur eftirfarandi hópa:",
     "Password" : "Lykilorð",
-    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
     "Current password" : "Núverandi lykilorð",
     "New password" : "Nýtt lykilorð",
     "Change password" : "Breyta lykilorði",
@@ -249,9 +244,7 @@
     "Desktop client" : "Skjáborðsforrit",
     "Android app" : "Android-forrit",
     "iOS app" : "iOS-forrit",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
     "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}ownCloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
     "Show user backend" : "Birta bakenda notanda",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 8e14b48f259..41a573fb3b5 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Password errata",
+    "Saved" : "Salvato",
     "No user supplied" : "Non è stato fornito alcun utente",
     "Authentication error" : "Errore di autenticazione",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
     "log-level out of allowed range" : "livello di log fuori dall'intervallo consentito",
-    "Saved" : "Salvato",
     "test email settings" : "prova impostazioni email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni. (Errore: %s)",
     "Email sent" : "Email inviata",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Tutti",
     "No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
     "The app will be downloaded from the app store" : "L'applicazione sarà scaricata dallo store delle applicazioni",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Le applicazioni ufficiali sono sviluppate dalla comunità. Esse offrono nuove  funzionalità e sono pronte per l'uso in produzione.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
     "Update to %s" : "Aggiornato a %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Vedi la documentazione di ownCloud per ulteriori informazioni su come funziona l'applicazione di cifratura, e per i casi d'uso supportati.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
     "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Mostra descrizione...",
     "Hide description …" : "Nascondi descrizione...",
     "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione minima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione massima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Questa applicazione non contiene l'informazione della versione minima di Nextcloud richiesta. In futuro ciò sarà considerato un errore.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Questa applicazione non contiene l'informazione della versione massima di Nextcloud richiesta. In futuro cio sarà considerato un errore.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Questa applicazione non può essere installata perché le seguenti dipendenze non sono soddisfatte:",
     "Enable only for specific groups" : "Abilita solo per gruppi specifici",
     "Uninstall App" : "Disinstalla applicazione",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "Nessun indirizzo email impostato",
     "You are member of the following groups:" : "Sei membro dei seguenti gruppi:",
     "Password" : "Password",
-    "Unable to change your password" : "Modifica password non riuscita",
     "Current password" : "Password attuale",
     "New password" : "Nuova password",
     "Change password" : "Modifica password",
     "Language" : "Lingua",
     "Help translate" : "Migliora la traduzione",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Questi sono i client web, desktop e mobile che hanno effettuato attualmente l'accesso al tuo ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Questi sono i client web, desktop e mobile attualmente che hanno eseguito l'accesso con il tuo account.",
     "Browser" : "Browser",
     "Most recent activity" : "Attività più recenti",
     "You've linked these apps." : "Hai collegato queste applicazioni.",
@@ -279,16 +278,16 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una password di applicazione è un codice di sicurezza che fornisce a un'applicazione o a un dispositivo i permessi per accedere al tuo account %s.",
     "App name" : "Nome applicazione",
     "Create new app password" : "Crea nuova password di applicazione",
-    "Use the credentials below to configure your app or device." : "Usa le credenziali seguenti per configurare l'applicazione o il dispositivo.",
+    "Use the credentials below to configure your app or device." : "Utilizza le credenziali in basso per configurare la tua applicazione o dispositivo.",
     "Username" : "Nome utente",
     "Done" : "Completato",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
     "Android app" : "Applicazione Android",
     "iOS app" : "Applicazione iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se desideri supportare il progetto\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contribuisci allo sviluppo</a>\n\t\to\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
     "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 1fe431765c3..6cb53bd599c 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Password errata",
+    "Saved" : "Salvato",
     "No user supplied" : "Non è stato fornito alcun utente",
     "Authentication error" : "Errore di autenticazione",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
     "log-level out of allowed range" : "livello di log fuori dall'intervallo consentito",
-    "Saved" : "Salvato",
     "test email settings" : "prova impostazioni email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni. (Errore: %s)",
     "Email sent" : "Email inviata",
@@ -62,7 +62,7 @@
     "All" : "Tutti",
     "No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
     "The app will be downloaded from the app store" : "L'applicazione sarà scaricata dallo store delle applicazioni",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Le applicazioni ufficiali sono sviluppate dalla comunità. Esse offrono nuove  funzionalità e sono pronte per l'uso in produzione.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
     "Update to %s" : "Aggiornato a %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Vedi la documentazione di ownCloud per ulteriori informazioni su come funziona l'applicazione di cifratura, e per i casi d'uso supportati.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Leggi la documentazione per ottenere ulteriori informazioni sul funzionamento dell'applicazione di cifratura.",
     "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
@@ -226,8 +226,8 @@
     "Show description …" : "Mostra descrizione...",
     "Hide description …" : "Nascondi descrizione...",
     "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione minima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione massima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Questa applicazione non contiene l'informazione della versione minima di Nextcloud richiesta. In futuro ciò sarà considerato un errore.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Questa applicazione non contiene l'informazione della versione massima di Nextcloud richiesta. In futuro cio sarà considerato un errore.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Questa applicazione non può essere installata perché le seguenti dipendenze non sono soddisfatte:",
     "Enable only for specific groups" : "Abilita solo per gruppi specifici",
     "Uninstall App" : "Disinstalla applicazione",
@@ -263,13 +263,12 @@
     "No email address set" : "Nessun indirizzo email impostato",
     "You are member of the following groups:" : "Sei membro dei seguenti gruppi:",
     "Password" : "Password",
-    "Unable to change your password" : "Modifica password non riuscita",
     "Current password" : "Password attuale",
     "New password" : "Nuova password",
     "Change password" : "Modifica password",
     "Language" : "Lingua",
     "Help translate" : "Migliora la traduzione",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Questi sono i client web, desktop e mobile che hanno effettuato attualmente l'accesso al tuo ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Questi sono i client web, desktop e mobile attualmente che hanno eseguito l'accesso con il tuo account.",
     "Browser" : "Browser",
     "Most recent activity" : "Attività più recenti",
     "You've linked these apps." : "Hai collegato queste applicazioni.",
@@ -277,16 +276,16 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Una password di applicazione è un codice di sicurezza che fornisce a un'applicazione o a un dispositivo i permessi per accedere al tuo account %s.",
     "App name" : "Nome applicazione",
     "Create new app password" : "Crea nuova password di applicazione",
-    "Use the credentials below to configure your app or device." : "Usa le credenziali seguenti per configurare l'applicazione o il dispositivo.",
+    "Use the credentials below to configure your app or device." : "Utilizza le credenziali in basso per configurare la tua applicazione o dispositivo.",
     "Username" : "Nome utente",
     "Done" : "Completato",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
     "Android app" : "Applicazione Android",
     "iOS app" : "Applicazione iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se desideri supportare il progetto\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contribuisci allo sviluppo</a>\n\t\to\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!",
     "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 11674827510..5f4eac249a6 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "パスワードが間違っています",
+    "Saved" : "保存されました",
     "No user supplied" : "ユーザーが指定されていません",
     "Authentication error" : "認証エラー",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
     "log-level out of allowed range" : "ログレベルが許可された範囲を超えています",
-    "Saved" : "保存されました",
     "test email settings" : "メール設定のテスト",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "メールの送信中に問題が発生しました。設定を確認してください。 (Error: %s)",
     "Email sent" : "メールを送信しました",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "すべて",
     "No apps found for your version" : "現在のバージョンに対応するアプリはありません",
     "The app will be downloaded from the app store" : "このアプリは、アプリストアからダウンロードできます。",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。コミュニティは ownCloud の中心機能を提供し、製品としての使用の準備ができています。",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。公式アプリは ownCloud の中心的な機能を提供し、製品として可能です。",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。",
     "Update to %s" : "%sにアップデート",
@@ -119,6 +119,7 @@ OC.L10N.register(
     "Unlimited" : "無制限",
     "Personal info" : "個人情報",
     "Sessions" : "セッション",
+    "App passwords" : "アプリパスワード",
     "Sync clients" : "同期用クライアント",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
     "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
@@ -136,6 +137,7 @@ OC.L10N.register(
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "\"config\"は読み取り専用になってます。そのためにWEBインターフェースで設定できません可能性があります。さらに、更新時に\"config\"ファイルを書き込み権限を与えることが必要",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "データベースのトランザクション分離レベルが \"READ COMMITED\" になっていません。この場合、複数の操作が同時に実行されたときに問題が発生する可能性があります。",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%2$s よりも古いバージョンの %1$s がインストールされています。安定した稼働とパフォーマンスの観点から、新しいバージョンの %1$s にアップデートすることをお勧めします。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
@@ -173,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
     "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけでは、システムのセキュリティを保証するものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
     "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
     "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
@@ -221,12 +223,13 @@ OC.L10N.register(
     "Documentation:" : "ドキュメント:",
     "User documentation" : "ユーザードキュメント",
     "Admin documentation" : "管理者ドキュメント",
+    "Visit website" : "ウェブサイトを表示",
     "Report a bug" : "バグを報告",
     "Show description …" : "説明を表示 ...",
     "Hide description …" : "説明を隠す ...",
     "This app has an update available." : "このアプリでアップデートが利用できます.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "このアプリは Nextcloud の最小バージョンが指定されていません．将来、エラーが発生する可能性があります.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "このアプリは Nextcloud バージョンの上限が指定されていません．将来、エラーが発生する可能性があります.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
@@ -262,24 +265,29 @@ OC.L10N.register(
     "No email address set" : "メールアドレスが設定されていません",
     "You are member of the following groups:" : "以下のグループのメンバーです:",
     "Password" : "パスワード",
-    "Unable to change your password" : "パスワードを変更することができません",
     "Current password" : "現在のパスワード",
     "New password" : "新しいパスワード",
     "Change password" : "パスワードを変更",
     "Language" : "言語",
     "Help translate" : "翻訳に協力する",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "現在、Web、デスクトップ、モバイルアプリで ownCloud にログインしている端末一覧です。",
     "Browser" : "ブラウザ",
     "Most recent activity" : "最新のアクティビティ",
+    "You've linked these apps." : "あなたは、これらのアプリに紐付けられています。",
     "Name" : "名前",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "アプリパスワードは、あなたの %s アカウントにアクセスする許可をアプリやデバイスに与えるパスコードです。",
+    "App name" : "アプリ名",
+    "Create new app password" : "新規アプリパスワードを作成",
+    "Use the credentials below to configure your app or device." : "アプリや端末を設定するのに以下の認証情報を使用する。",
     "Username" : "ユーザーID",
     "Done" : "完了",
     "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
     "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "このプロジェクトを応援するには、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">開発に参加</a>\n\t\tもしくは、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">世界に拡散</a>!\nしてください。",
     "Show First Run Wizard again" : "初回ウィザードを再表示する",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}Nextcloud community{linkclose} による開発されています。{githubopen}source code{linkclose} は、 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} ライセンスで提供されています。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 9d432d85db6..facbd59cfc5 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "パスワードが間違っています",
+    "Saved" : "保存されました",
     "No user supplied" : "ユーザーが指定されていません",
     "Authentication error" : "認証エラー",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
@@ -17,7 +18,6 @@
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
     "log-level out of allowed range" : "ログレベルが許可された範囲を超えています",
-    "Saved" : "保存されました",
     "test email settings" : "メール設定のテスト",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "メールの送信中に問題が発生しました。設定を確認してください。 (Error: %s)",
     "Email sent" : "メールを送信しました",
@@ -62,7 +62,7 @@
     "All" : "すべて",
     "No apps found for your version" : "現在のバージョンに対応するアプリはありません",
     "The app will be downloaded from the app store" : "このアプリは、アプリストアからダウンロードできます。",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。コミュニティは ownCloud の中心機能を提供し、製品としての使用の準備ができています。",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。公式アプリは ownCloud の中心的な機能を提供し、製品として可能です。",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。",
     "Update to %s" : "%sにアップデート",
@@ -117,6 +117,7 @@
     "Unlimited" : "無制限",
     "Personal info" : "個人情報",
     "Sessions" : "セッション",
+    "App passwords" : "アプリパスワード",
     "Sync clients" : "同期用クライアント",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
     "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
@@ -134,6 +135,7 @@
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "\"config\"は読み取り専用になってます。そのためにWEBインターフェースで設定できません可能性があります。さらに、更新時に\"config\"ファイルを書き込み権限を与えることが必要",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "データベースのトランザクション分離レベルが \"READ COMMITED\" になっていません。この場合、複数の操作が同時に実行されたときに問題が発生する可能性があります。",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%2$s よりも古いバージョンの %1$s がインストールされています。安定した稼働とパフォーマンスの観点から、新しいバージョンの %1$s にアップデートすることをお勧めします。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
@@ -171,7 +173,7 @@
     "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
     "Please read carefully before activating server-side encryption: " : "サーバーサイド暗号化を有効にする前によくお読みください:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "暗号化を一度有効化すると、この時点からサーバーにアップロードされるファイルの全てが暗号化されサーバー上に入ります。有効化された暗号モジュールは復号化機能をサポートしますが、すべての前提条件が満たされている(例えば、回復キーが設定されている)場合にのみ、後日暗号化を無効にすることが可能です。",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけでは、システムのセキュリティを保証するものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "暗号化だけで、システムのセキュリティが保証されるものではありません。暗号化アプリがどのように動作するかの詳細について、およびサポートされているユースケースについてはownCloudのドキュメントを参照してください。",
     "Be aware that encryption always increases the file size." : "暗号化は、常にファイルサイズが増加することに注意してください。",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "暗号化した場合には必ず、あなたのデータと共に暗号化キーをバックアップすることを確認し、定期的にデータをバックアップを作成することをお勧めします。",
     "This is the final warning: Do you really want to enable encryption?" : "これが最後の警告です：本当に暗号化を有効にしますか？",
@@ -219,12 +221,13 @@
     "Documentation:" : "ドキュメント:",
     "User documentation" : "ユーザードキュメント",
     "Admin documentation" : "管理者ドキュメント",
+    "Visit website" : "ウェブサイトを表示",
     "Report a bug" : "バグを報告",
     "Show description …" : "説明を表示 ...",
     "Hide description …" : "説明を隠す ...",
     "This app has an update available." : "このアプリでアップデートが利用できます.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "このアプリは Nextcloud の最小バージョンが指定されていません．将来、エラーが発生する可能性があります.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "このアプリは Nextcloud バージョンの上限が指定されていません．将来、エラーが発生する可能性があります.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
@@ -260,24 +263,29 @@
     "No email address set" : "メールアドレスが設定されていません",
     "You are member of the following groups:" : "以下のグループのメンバーです:",
     "Password" : "パスワード",
-    "Unable to change your password" : "パスワードを変更することができません",
     "Current password" : "現在のパスワード",
     "New password" : "新しいパスワード",
     "Change password" : "パスワードを変更",
     "Language" : "言語",
     "Help translate" : "翻訳に協力する",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "現在、Web、デスクトップ、モバイルアプリで ownCloud にログインしている端末一覧です。",
     "Browser" : "ブラウザ",
     "Most recent activity" : "最新のアクティビティ",
+    "You've linked these apps." : "あなたは、これらのアプリに紐付けられています。",
     "Name" : "名前",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "アプリパスワードは、あなたの %s アカウントにアクセスする許可をアプリやデバイスに与えるパスコードです。",
+    "App name" : "アプリ名",
+    "Create new app password" : "新規アプリパスワードを作成",
+    "Use the credentials below to configure your app or device." : "アプリや端末を設定するのに以下の認証情報を使用する。",
     "Username" : "ユーザーID",
     "Done" : "完了",
     "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
     "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "このプロジェクトを応援するには、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">開発に参加</a>\n\t\tもしくは、\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">世界に拡散</a>!\nしてください。",
     "Show First Run Wizard again" : "初回ウィザードを再表示する",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}Nextcloud community{linkclose} による開発されています。{githubopen}source code{linkclose} は、 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} ライセンスで提供されています。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 4be2d81ee02..91410abac71 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "잘못된 암호",
+    "Saved" : "저장됨",
     "No user supplied" : "사용자가 지정되지 않음",
     "Authentication error" : "인증 오류",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "관리자 복구 암호를 입력하지 않으면 모든 사용자 데이터가 삭제됩니다",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "그룹을 추가할 수 없습니다.",
     "Unable to delete group." : "그룹을 삭제할 수 없습니다.",
     "log-level out of allowed range" : "로그 단계가 허용 범위를 벗어남",
-    "Saved" : "저장됨",
     "test email settings" : "이메일 설정 시험",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "이메일을 보내는 중 오류가 발생했습니다. 설정을 확인하십시오.(오류: %s)",
     "Email sent" : "이메일 발송됨",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "실험적",
     "All" : "모두",
     "No apps found for your version" : "설치된 버전에 대한 앱 없음",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.",
     "Update to %s" : "%s(으)로 업데이트",
@@ -161,7 +160,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "서버 측 암호화 사용",
     "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "암호화만 사용하여 시스템의 보안을 유지할 수는 없습니다. 암호화 앱 동작 방식과 지원하는 사용 예제를 보려면 ownCloud 문서를 참조하십시오.",
     "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
     "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
@@ -209,8 +207,6 @@ OC.L10N.register(
     "Show description …" : "설명 보기...",
     "Hide description …" : "설명 숨기기...",
     "This app has an update available." : "이 앱을 업데이트할 수 있습니다.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최대 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최소 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:",
     "Enable only for specific groups" : "특정 그룹에만 허용",
     "Uninstall App" : "앱 제거",
@@ -246,7 +242,6 @@ OC.L10N.register(
     "No email address set" : "이메일 주소가 설정되지 않음",
     "You are member of the following groups:" : "다음 그룹의 구성원입니다:",
     "Password" : "암호",
-    "Unable to change your password" : "암호를 변경할 수 없음",
     "Current password" : "현재 암호",
     "New password" : "새 암호",
     "Change password" : "암호 변경",
@@ -259,9 +254,7 @@ OC.L10N.register(
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
     "iOS app" : "iOS 앱",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!",
     "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud 커뮤니티{linkclose}에서 개발함. {githubopen}원본 코드{linkclose}는 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 라이선스로 배포됩니다.",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index abf2fa3af39..5fbe5d0501b 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "잘못된 암호",
+    "Saved" : "저장됨",
     "No user supplied" : "사용자가 지정되지 않음",
     "Authentication error" : "인증 오류",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "관리자 복구 암호를 입력하지 않으면 모든 사용자 데이터가 삭제됩니다",
@@ -17,7 +18,6 @@
     "Unable to add group." : "그룹을 추가할 수 없습니다.",
     "Unable to delete group." : "그룹을 삭제할 수 없습니다.",
     "log-level out of allowed range" : "로그 단계가 허용 범위를 벗어남",
-    "Saved" : "저장됨",
     "test email settings" : "이메일 설정 시험",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "이메일을 보내는 중 오류가 발생했습니다. 설정을 확인하십시오.(오류: %s)",
     "Email sent" : "이메일 발송됨",
@@ -61,7 +61,6 @@
     "Experimental" : "실험적",
     "All" : "모두",
     "No apps found for your version" : "설치된 버전에 대한 앱 없음",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.",
     "Update to %s" : "%s(으)로 업데이트",
@@ -159,7 +158,6 @@
     "Enable server-side encryption" : "서버 측 암호화 사용",
     "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "암호화를 사용하면, 사용하기 시작한 시간 이후에 서버에 업로드된 모든 파일이 암호화됩니다. 나중에 암호화를 사용하지 않으려면 사용하고 있는 암호화 모듈에서 비활성화를 지원해야 하고 모든 사전 조건(예: 복구 키 설정)을 만족해야 합니다.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "암호화만 사용하여 시스템의 보안을 유지할 수는 없습니다. 암호화 앱 동작 방식과 지원하는 사용 예제를 보려면 ownCloud 문서를 참조하십시오.",
     "Be aware that encryption always increases the file size." : "암호화된 파일의 크기는 항상 커집니다.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "데이터를 주기적으로 백업하는 것을 추천하며, 암호화를 사용하고 있다면 데이터와 더불어 암호화 키도 백업하십시오.",
     "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
@@ -207,8 +205,6 @@
     "Show description …" : "설명 보기...",
     "Hide description …" : "설명 숨기기...",
     "This app has an update available." : "이 앱을 업데이트할 수 있습니다.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최대 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최소 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:",
     "Enable only for specific groups" : "특정 그룹에만 허용",
     "Uninstall App" : "앱 제거",
@@ -244,7 +240,6 @@
     "No email address set" : "이메일 주소가 설정되지 않음",
     "You are member of the following groups:" : "다음 그룹의 구성원입니다:",
     "Password" : "암호",
-    "Unable to change your password" : "암호를 변경할 수 없음",
     "Current password" : "현재 암호",
     "New password" : "새 암호",
     "Change password" : "암호 변경",
@@ -257,9 +252,7 @@
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
     "iOS app" : "iOS 앱",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!",
     "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud 커뮤니티{linkclose}에서 개발함. {githubopen}원본 코드{linkclose}는 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 라이선스로 배포됩니다.",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 25a6538d9b9..43e7471528a 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Feil passord",
+    "Saved" : "Lagret",
     "No user supplied" : "Ingen bruker angitt",
     "Authentication error" : "Autentiseringsfeil",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Kan ikke legge til gruppe.",
     "Unable to delete group." : "Kan ikke slette gruppe.",
     "log-level out of allowed range" : "Loggnivå utenfor tillatt område",
-    "Saved" : "Lagret",
     "test email settings" : "Test av innstillinger for e-post",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Et problem oppstod med sending av e-post. Sjekk innstillingene. (Feil: %s)",
     "Email sent" : "E-post sendt",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "Eksperimentell",
     "All" : "Alle",
     "No apps found for your version" : "Ingen apper funnet for din versjon",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av tiltrodde utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.",
     "Update to %s" : "Oppdater til %s",
@@ -167,7 +166,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Aktiver serverkryptering",
     "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering alene garanterer ikke sikkerheten i systemet. Se ownCloud-dokumentasjonen for mer informasjon om hvordan krypterings-appen virker og hvilke brukstilfeller som støttes.",
     "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
@@ -218,8 +216,6 @@ OC.L10N.register(
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app has an update available." : "En oppdatering er tilgjengelig for denne appen.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen minimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen maksimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
     "Enable only for specific groups" : "Aktiver kun for visse grupper",
     "Uninstall App" : "Avinstaller app",
@@ -255,7 +251,6 @@ OC.L10N.register(
     "No email address set" : "E-postadresse ikke satt",
     "You are member of the following groups:" : "Du er medlem av følgende grupper:",
     "Password" : "Passord",
-    "Unable to change your password" : "Kunne ikke endre passordet ditt",
     "Current password" : "Nåværende passord",
     "New password" : "Nytt passord",
     "Change password" : "Endre passord",
@@ -268,9 +263,7 @@ OC.L10N.register(
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!",
     "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
     "Show user backend" : "Vis bruker-server",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index cf6766d862c..0d982902961 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Feil passord",
+    "Saved" : "Lagret",
     "No user supplied" : "Ingen bruker angitt",
     "Authentication error" : "Autentiseringsfeil",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Kan ikke legge til gruppe.",
     "Unable to delete group." : "Kan ikke slette gruppe.",
     "log-level out of allowed range" : "Loggnivå utenfor tillatt område",
-    "Saved" : "Lagret",
     "test email settings" : "Test av innstillinger for e-post",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Et problem oppstod med sending av e-post. Sjekk innstillingene. (Feil: %s)",
     "Email sent" : "E-post sendt",
@@ -61,7 +61,6 @@
     "Experimental" : "Eksperimentell",
     "All" : "Alle",
     "No apps found for your version" : "Ingen apper funnet for din versjon",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av tiltrodde utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.",
     "Update to %s" : "Oppdater til %s",
@@ -165,7 +164,6 @@
     "Enable server-side encryption" : "Aktiver serverkryptering",
     "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Når kryptering er blitt aktivert, vil alle filer som lastes opp til serveren fra det tidspunktet av bli lagret kryptert på serveren. Det vil kun være mulig å deaktivere kryptering senere dersom den aktive krypteringsmodulen støtter det og alle forutsetninger (f.eks. å sette en gjenopprettingsnøkkel) er til stede.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering alene garanterer ikke sikkerheten i systemet. Se ownCloud-dokumentasjonen for mer informasjon om hvordan krypterings-appen virker og hvilke brukstilfeller som støttes.",
     "Be aware that encryption always increases the file size." : "Vær oppmerksom på at kryptering alltid øker filstørrelsen.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det er alltid bra å ta regelmessig sikkerhetskopi av dataene dine. Pass på å ta kopi av krypteringsnøklene sammen med dataene når kryptering er i bruk.",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
@@ -216,8 +214,6 @@
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app has an update available." : "En oppdatering er tilgjengelig for denne appen.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen minimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen maksimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
     "Enable only for specific groups" : "Aktiver kun for visse grupper",
     "Uninstall App" : "Avinstaller app",
@@ -253,7 +249,6 @@
     "No email address set" : "E-postadresse ikke satt",
     "You are member of the following groups:" : "Du er medlem av følgende grupper:",
     "Password" : "Passord",
-    "Unable to change your password" : "Kunne ikke endre passordet ditt",
     "Current password" : "Nåværende passord",
     "New password" : "Nytt passord",
     "Change password" : "Endre passord",
@@ -266,9 +261,7 @@
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!",
     "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
     "Show user backend" : "Vis bruker-server",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 78163d592c0..f9d16fed3d0 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Onjuist wachtwoord",
+    "Saved" : "Bewaard",
     "No user supplied" : "Geen gebruiker opgegeven",
     "Authentication error" : "Authenticatie fout",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
@@ -19,15 +20,14 @@ OC.L10N.register(
     "Unable to add group." : "Kan groep niet toevoegen.",
     "Unable to delete group." : "Kan groep niet verwijderen.",
     "log-level out of allowed range" : "loggingniveau buiten toegestane bereik",
-    "Saved" : "Bewaard",
     "test email settings" : "test e-mailinstellingen",
-    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.  (Fout: %s)",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer je instellingen.  (Fout: %s)",
     "Email sent" : "E-mail verzonden",
-    "You need to set your user email before being able to send test emails." : "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
+    "You need to set your user email before being able to send test emails." : "Je moet uw e-mailadres invoeren voordat je testberichten kunt versturen.",
     "Invalid mail address" : "Ongeldig e-mailadres",
     "A user with that name already exists." : "Er bestaat al een gebruiker met die naam.",
     "Unable to create user." : "Kan gebruiker niet aanmaken.",
-    "Your %s account was created" : "Uw %s account is aangemaakt",
+    "Your %s account was created" : "Je %s account is aangemaakt",
     "Unable to delete user." : "Kan gebruiker niet verwijderen.",
     "Forbidden" : "Verboden",
     "Invalid user" : "Ongeldige gebruiker",
@@ -53,7 +53,7 @@ OC.L10N.register(
     "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
     "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
     "Couldn't update app." : "Kon de app niet bijwerken.",
-    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet je zeker dat je \"{domain}\" als een vertrouwd domein wilt toevoegen?",
     "Add trusted domain" : "Vertrouwd domein toevoegen",
     "Migration in progress. Please wait until the migration is finished" : "Migratie bezig. Wacht tot het proces klaar is.",
     "Migration started …" : "Migratie gestart...",
@@ -62,11 +62,11 @@ OC.L10N.register(
     "Approved" : "Goedgekeurd",
     "Experimental" : "Experimenteel",
     "All" : "Alle",
-    "No apps found for your version" : "Geen apps gevonden voor uw versie",
+    "No apps found for your version" : "Geen apps gevonden voor jouw versie",
     "The app will be downloaded from the app store" : "De app zal worden gedownload van de app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Officiële apps worden ontwikkeld door en binnen de community. Ze bieden centrale functionaliteit en zijn klaar voor productie.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
-    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat  bekend als onstabiel. Installeren op eigen risico.",
     "Update to %s" : "Bijgewerkt naar %s",
     "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"],
     "Please wait...." : "Even geduld a.u.b.",
@@ -83,7 +83,7 @@ OC.L10N.register(
     "Uninstalling ...." : "De-installeren ...",
     "Error while uninstalling app" : "Fout bij de-installeren app",
     "Uninstall" : "De-installeren",
-    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. Je wordt over 5 seconden doorgeleid naar de bijwerkpagina.",
     "App update" : "App update",
     "No apps found for {query}" : "Geen apps gevonden voor {query}",
     "Disconnect" : "Verbreek verbinding",
@@ -133,12 +133,12 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
+    "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van je server, zeker bij gebrjuik van als php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
-    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Uw database draait niet met \"READ COMMITED\" transactie isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITED\" transactie isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Je server draait op Microsoft Windows. We adviseren je om een linux server te gebruiken voor een optimale gebruikerservaring.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.",
     "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.",
     "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
@@ -175,15 +175,15 @@ OC.L10N.register(
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
     "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Alleen maar versleutelen is geen garantie voor veiligheid van het systeem. Lees de ownCloud documentatie voor meer informatie over de versleutelingsapp en de ondersteunde use cases.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
     "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van uw bestanden te maken. Zorg ervoor dat u in geval van versleuteling ook de cryptosleutel met uw gegevens backupt.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt je versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "U moet uw cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "U moet uw cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
     "Start migration" : "Start migratie",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Deze app heeft geen minimum Nextcloud versie toegewezen gekregen. In de toekomst wordt dit wordt een fout.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Deze app heeft geen maximum Nextcloud versie toegewezen gekregen. In de toekomst wordt dit wordt een fout.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld:",
     "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
     "Uninstall App" : "De-installeren app",
@@ -265,29 +265,29 @@ OC.L10N.register(
     "No email address set" : "Geen e-mailadres opgegeven",
     "You are member of the following groups:" : "U bent lid van de volgende groepen:",
     "Password" : "Wachtwoord",
-    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
     "Current password" : "Huidig wachtwoord",
     "New password" : "Nieuw",
     "Change password" : "Wijzig wachtwoord",
     "Language" : "Taal",
     "Help translate" : "Help met vertalen",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dit zijn de web, desktop en mobiele clients die momenteel zijn verbonden met uw ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Er zijn momenteel web, desktop en mobiele clients ingelogd met je account.",
     "Browser" : "Browser",
     "Most recent activity" : "Meest recente activiteit",
-    "You've linked these apps." : "U hebt deze apps gelinkt.",
+    "You've linked these apps." : "Je hebt deze apps gekoppeld.",
     "Name" : "Naam",
-    "App name" : "App naam",
-    "Create new app password" : "Creëer nieuw app wachtwoord",
-    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om uw app of apparaat te configureren.",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Een app wachtwoord is een toegangscode die een app of apparaat toegang geven om je %s account te gebruiken.",
+    "App name" : "Appnaam",
+    "Create new app password" : "Creëer een nieuw app wachtwoord",
+    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om je app of apparaat te configureren.",
     "Username" : "Gebruikersnaam",
     "Done" : "Gedaan",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ondersteun het project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel het mee</a>\n\t\tof\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het woord</a>!",
     "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
     "Show user backend" : "Toon backend gebruiker",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index a4e1aa2ccba..3596723f0c5 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Onjuist wachtwoord",
+    "Saved" : "Bewaard",
     "No user supplied" : "Geen gebruiker opgegeven",
     "Authentication error" : "Authenticatie fout",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
@@ -17,15 +18,14 @@
     "Unable to add group." : "Kan groep niet toevoegen.",
     "Unable to delete group." : "Kan groep niet verwijderen.",
     "log-level out of allowed range" : "loggingniveau buiten toegestane bereik",
-    "Saved" : "Bewaard",
     "test email settings" : "test e-mailinstellingen",
-    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.  (Fout: %s)",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer je instellingen.  (Fout: %s)",
     "Email sent" : "E-mail verzonden",
-    "You need to set your user email before being able to send test emails." : "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
+    "You need to set your user email before being able to send test emails." : "Je moet uw e-mailadres invoeren voordat je testberichten kunt versturen.",
     "Invalid mail address" : "Ongeldig e-mailadres",
     "A user with that name already exists." : "Er bestaat al een gebruiker met die naam.",
     "Unable to create user." : "Kan gebruiker niet aanmaken.",
-    "Your %s account was created" : "Uw %s account is aangemaakt",
+    "Your %s account was created" : "Je %s account is aangemaakt",
     "Unable to delete user." : "Kan gebruiker niet verwijderen.",
     "Forbidden" : "Verboden",
     "Invalid user" : "Ongeldige gebruiker",
@@ -51,7 +51,7 @@
     "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
     "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
     "Couldn't update app." : "Kon de app niet bijwerken.",
-    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet je zeker dat je \"{domain}\" als een vertrouwd domein wilt toevoegen?",
     "Add trusted domain" : "Vertrouwd domein toevoegen",
     "Migration in progress. Please wait until the migration is finished" : "Migratie bezig. Wacht tot het proces klaar is.",
     "Migration started …" : "Migratie gestart...",
@@ -60,11 +60,11 @@
     "Approved" : "Goedgekeurd",
     "Experimental" : "Experimenteel",
     "All" : "Alle",
-    "No apps found for your version" : "Geen apps gevonden voor uw versie",
+    "No apps found for your version" : "Geen apps gevonden voor jouw versie",
     "The app will be downloaded from the app store" : "De app zal worden gedownload van de app store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Officiële apps worden ontwikkeld door en binnen de community. Ze bieden centrale functionaliteit en zijn klaar voor productie.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
-    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat  bekend als onstabiel. Installeren op eigen risico.",
     "Update to %s" : "Bijgewerkt naar %s",
     "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"],
     "Please wait...." : "Even geduld a.u.b.",
@@ -81,7 +81,7 @@
     "Uninstalling ...." : "De-installeren ...",
     "Error while uninstalling app" : "Fout bij de-installeren app",
     "Uninstall" : "De-installeren",
-    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. Je wordt over 5 seconden doorgeleid naar de bijwerkpagina.",
     "App update" : "App update",
     "No apps found for {query}" : "Geen apps gevonden voor {query}",
     "Disconnect" : "Verbreek verbinding",
@@ -131,12 +131,12 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
+    "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van je server, zeker bij gebrjuik van als php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
-    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Uw database draait niet met \"READ COMMITED\" transactie isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITED\" transactie isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Je server draait op Microsoft Windows. We adviseren je om een linux server te gebruiken voor een optimale gebruikerservaring.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.",
     "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.",
     "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
@@ -173,15 +173,15 @@
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
     "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Als versleuteling is ingeschakeld, worden alle geüploade bestanden vanaf dat moment versleuteld opgeslagen op de server.  Het is alleen mogelijk om de versleuteling later uit te schakelen als de actieve versleutelingsmodule dit ondersteunt en aan alle pré-condities (mn de ingestelde herstelsleutel) wordt voldaan.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Alleen maar versleutelen is geen garantie voor veiligheid van het systeem. Lees de ownCloud documentatie voor meer informatie over de versleutelingsapp en de ondersteunde use cases.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Versleuteling alleen gerandeert geen beveiliging van het systeem. Lees de documentatie voor meer achtergrond over de werking van de crypto app an de relevante use cases.",
     "Be aware that encryption always increases the file size." : "Let erop dat versleuteling de bestandsomvang altijd laat toenemen.",
-    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van uw bestanden te maken. Zorg ervoor dat u in geval van versleuteling ook de cryptosleutel met uw gegevens backupt.",
-    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Het is altijd verstandig om regelmatig backups van je bestanden te maken. Zorg ervoor dat je in geval van versleuteling ook de cryptosleutel met je gegevens backupt.",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt je versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "U moet uw cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "U moet uw cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Activeer de \"Standaard cryptomodule\" en start 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe.",
     "Start migration" : "Start migratie",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
@@ -226,8 +226,8 @@
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Deze app heeft geen minimum Nextcloud versie toegewezen gekregen. In de toekomst wordt dit wordt een fout.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Deze app heeft geen maximum Nextcloud versie toegewezen gekregen. In de toekomst wordt dit wordt een fout.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld:",
     "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
     "Uninstall App" : "De-installeren app",
@@ -263,29 +263,29 @@
     "No email address set" : "Geen e-mailadres opgegeven",
     "You are member of the following groups:" : "U bent lid van de volgende groepen:",
     "Password" : "Wachtwoord",
-    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
     "Current password" : "Huidig wachtwoord",
     "New password" : "Nieuw",
     "Change password" : "Wijzig wachtwoord",
     "Language" : "Taal",
     "Help translate" : "Help met vertalen",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dit zijn de web, desktop en mobiele clients die momenteel zijn verbonden met uw ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Er zijn momenteel web, desktop en mobiele clients ingelogd met je account.",
     "Browser" : "Browser",
     "Most recent activity" : "Meest recente activiteit",
-    "You've linked these apps." : "U hebt deze apps gelinkt.",
+    "You've linked these apps." : "Je hebt deze apps gekoppeld.",
     "Name" : "Naam",
-    "App name" : "App naam",
-    "Create new app password" : "Creëer nieuw app wachtwoord",
-    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om uw app of apparaat te configureren.",
+    "An app password is a passcode that gives an app or device permissions to access your %s account." : "Een app wachtwoord is een toegangscode die een app of apparaat toegang geven om je %s account te gebruiken.",
+    "App name" : "Appnaam",
+    "Create new app password" : "Creëer een nieuw app wachtwoord",
+    "Use the credentials below to configure your app or device." : "Gebruik onderstaande inloggegevens om je app of apparaat te configureren.",
     "Username" : "Gebruikersnaam",
     "Done" : "Gedaan",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ondersteun het project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel het mee</a>\n\t\tof\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het woord</a>!",
     "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
     "Show user backend" : "Toon backend gebruiker",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index 4cee3292b71..751c2eed92f 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -63,7 +63,7 @@ OC.L10N.register(
     "Experimental" : "Experimental",
     "All" : "Totes",
     "No apps found for your version" : "Pas d'aplicacion trobada per vòstra version",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat Nextcloud. Ofrisson sas foncionalitats principalas a Nextcloud e son prèstas per una utilizacion en produccion. ",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Aquesta aplicacion es novèla o instabla, e sa seguretat es pas estada verificada. Installatz-la a vòstras riscas e perilhs !",
     "Update to %s" : "Metre a nivèl cap a la version %s",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 9a8568a2c7a..51abd9afa5d 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -61,7 +61,7 @@
     "Experimental" : "Experimental",
     "All" : "Totes",
     "No apps found for your version" : "Pas d'aplicacion trobada per vòstra version",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat Nextcloud. Ofrisson sas foncionalitats principalas a Nextcloud e son prèstas per una utilizacion en produccion. ",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Aquesta aplicacion es novèla o instabla, e sa seguretat es pas estada verificada. Installatz-la a vòstras riscas e perilhs !",
     "Update to %s" : "Metre a nivèl cap a la version %s",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index a9d9427a782..185b63bd15e 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Senha errada",
+    "Saved" : "Salvo",
     "No user supplied" : "Nenhum usuário fornecido",
     "Authentication error" : "Erro de autenticação",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
     "log-level out of allowed range" : "log-nível acima do permitido",
-    "Saved" : "Salvo",
     "test email settings" : "testar configurações de email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações. (Erro: %s)",
     "Email sent" : "E-mail enviado",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Todos",
     "No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
     "The app will be downloaded from the app store" : "O aplicativo será baixado na App Store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Aplicativos oficiais são desenvolvidos pela comunidade e dentro da comunidade. Eles oferecem funcionalidades centrais e estão prontos para uso em produção.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
     "Update to %s" : "Atualizado para %s",
@@ -175,7 +175,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Criptografia por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para obter mais informações sobre como o aplicativo de criptografia funciona, e os casos de uso suportados.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por sí só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
     "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
@@ -228,8 +228,8 @@ OC.L10N.register(
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Este aplicativo tem uma atualização disponível.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma  versão ownCloud mínima. Isto será um erro no ownCloud 11 e posterior.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma  versão ownCloud máxima. Isto será um erro no ownCloud 11 e posterior.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Este aplicativo não possui versão mínima atribuida para uso no Nextcloud. Isto poderá se converter em um erro no futuro.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Este aplicativo não possui versão máxima atribuida para uso no Nextcloud. Isto poderá se converter em um erro no futuro.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Este aplicativo não pode ser instalado porque as seguintes dependências não forão cumpridas:",
     "Enable only for specific groups" : "Ativar apenas para grupos específicos",
     "Uninstall App" : "Desinstalar Aplicativo",
@@ -265,13 +265,12 @@ OC.L10N.register(
     "No email address set" : "Nenhum endereço de email foi configurado",
     "You are member of the following groups:" : "Você é membro dos seguintes grupos:",
     "Password" : "Senha",
-    "Unable to change your password" : "Não é possivel alterar a sua senha",
     "Current password" : "Senha atual",
     "New password" : "Nova senha",
     "Change password" : "Alterar senha",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estes são os clientes web, desktop e clientes móveis atualmente conectado ao seu ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Você possui seus clientes web, desktop e móvel atualmente logados em sua conta.",
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "You've linked these apps." : "Você vinculou esses aplicativos.",
@@ -286,9 +285,9 @@ OC.L10N.register(
     "Desktop client" : "Cliente Desktop",
     "Android app" : "App Android",
     "iOS app" : "App iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você deseja apoiar o projeto,\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">juntar-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contar para todo mundo</a>!",
     "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
     "Show user backend" : "Mostrar administrador do usuário",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 1ed78c7925e..9c5e1f0eefb 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Senha errada",
+    "Saved" : "Salvo",
     "No user supplied" : "Nenhum usuário fornecido",
     "Authentication error" : "Erro de autenticação",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
     "log-level out of allowed range" : "log-nível acima do permitido",
-    "Saved" : "Salvo",
     "test email settings" : "testar configurações de email",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações. (Erro: %s)",
     "Email sent" : "E-mail enviado",
@@ -62,7 +62,7 @@
     "All" : "Todos",
     "No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
     "The app will be downloaded from the app store" : "O aplicativo será baixado na App Store",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+    "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Aplicativos oficiais são desenvolvidos pela comunidade e dentro da comunidade. Eles oferecem funcionalidades centrais e estão prontos para uso em produção.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
     "Update to %s" : "Atualizado para %s",
@@ -173,7 +173,7 @@
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Criptografia por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para obter mais informações sobre como o aplicativo de criptografia funciona, e os casos de uso suportados.",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Encriptação, por sí só, não garante segurança do sistema. Por favor, veja a documentação para mais informações sobe como o aplicativo de encriptação funciona e os casos de uso suportados.",
     "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
@@ -226,8 +226,8 @@
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Este aplicativo tem uma atualização disponível.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma  versão ownCloud mínima. Isto será um erro no ownCloud 11 e posterior.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma  versão ownCloud máxima. Isto será um erro no ownCloud 11 e posterior.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Este aplicativo não possui versão mínima atribuida para uso no Nextcloud. Isto poderá se converter em um erro no futuro.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Este aplicativo não possui versão máxima atribuida para uso no Nextcloud. Isto poderá se converter em um erro no futuro.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Este aplicativo não pode ser instalado porque as seguintes dependências não forão cumpridas:",
     "Enable only for specific groups" : "Ativar apenas para grupos específicos",
     "Uninstall App" : "Desinstalar Aplicativo",
@@ -263,13 +263,12 @@
     "No email address set" : "Nenhum endereço de email foi configurado",
     "You are member of the following groups:" : "Você é membro dos seguintes grupos:",
     "Password" : "Senha",
-    "Unable to change your password" : "Não é possivel alterar a sua senha",
     "Current password" : "Senha atual",
     "New password" : "Nova senha",
     "Change password" : "Alterar senha",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estes são os clientes web, desktop e clientes móveis atualmente conectado ao seu ownCloud.",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "Você possui seus clientes web, desktop e móvel atualmente logados em sua conta.",
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "You've linked these apps." : "Você vinculou esses aplicativos.",
@@ -284,9 +283,9 @@
     "Desktop client" : "Cliente Desktop",
     "Android app" : "App Android",
     "iOS app" : "App iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você deseja apoiar o projeto,\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">juntar-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">contar para todo mundo</a>!",
     "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
     "Show user backend" : "Mostrar administrador do usuário",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index f0c707c1328..e0422ba07f6 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Palavra-passe errada",
+    "Saved" : "Guardado",
     "No user supplied" : "Nenhum utilizador especificado",
     "Authentication error" : "Erro na autenticação",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário serão perdidos todos os dados",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Impossível adicionar o grupo.",
     "Unable to delete group." : "Impossível eliminar grupo.",
     "log-level out of allowed range" : "log-level fora do alcance permitido",
-    "Saved" : "Guardado",
     "test email settings" : "testar as definições de e-mail",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições. (Erro: %s)",
     "Email sent" : "Mensagem de correio eletrónico enviada",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Todos",
     "No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
     "The app will be downloaded from the app store" : "A aplicação será descarregada da loja de aplicações",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.",
     "Update to %s" : "Actualizar para %s",
@@ -174,7 +173,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "A encriptação por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para mais informação acerca de como funciona a aplicação de encriptação, assim como os casos de uso suportados.",
     "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
@@ -226,8 +224,6 @@ OC.L10N.register(
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Esta aplicação tem uma atualização disponível.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão mínima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão máxima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
@@ -263,13 +259,11 @@ OC.L10N.register(
     "No email address set" : "Nenhum endereço de email estabelecido",
     "You are member of the following groups:" : "Você é membro dos seguintes grupos:",
     "Password" : "Palavra-passe",
-    "Unable to change your password" : "Não foi possível alterar a sua palavra-passe",
     "Current password" : "Palavra-passe atual",
     "New password" : "Nova palavra-passe",
     "Change password" : "Alterar palavra-passe",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estes são os clientes web, desktop e móveis actualmente ligados à sua ownCloud.",
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "Name" : "Nome",
@@ -279,9 +273,7 @@ OC.L10N.register(
     "Desktop client" : "Cliente Desktop",
     "Android app" : "Aplicação Android",
     "iOS app" : "Aplicação iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Show user backend" : "Mostrar interface do utilizador",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 6d0344bdbb6..a4b188da10d 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Palavra-passe errada",
+    "Saved" : "Guardado",
     "No user supplied" : "Nenhum utilizador especificado",
     "Authentication error" : "Erro na autenticação",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário serão perdidos todos os dados",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Impossível adicionar o grupo.",
     "Unable to delete group." : "Impossível eliminar grupo.",
     "log-level out of allowed range" : "log-level fora do alcance permitido",
-    "Saved" : "Guardado",
     "test email settings" : "testar as definições de e-mail",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições. (Erro: %s)",
     "Email sent" : "Mensagem de correio eletrónico enviada",
@@ -62,7 +62,6 @@
     "All" : "Todos",
     "No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
     "The app will be downloaded from the app store" : "A aplicação será descarregada da loja de aplicações",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.",
     "Update to %s" : "Actualizar para %s",
@@ -172,7 +171,6 @@
     "Enable server-side encryption" : "Ativar encriptação do lado do servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia cuidadosamente antes de ativar a encriptação do lado do servidor:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez ativada a encriptação, todos os ficheiros carregados para o servidor a partir deste ponto serão encriptados pelo servidor. Só será possível desativar a encriptação numa data mais tarde se o módulo de encriptação ativo suportar essa função, assim como todas as pré-condições (e.g. definir chave de recuperação) sejam cumpridas.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "A encriptação por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para mais informação acerca de como funciona a aplicação de encriptação, assim como os casos de uso suportados.",
     "Be aware that encryption always increases the file size." : "Tenha em conta que a encriptação aumenta sempre o tamanho do ficheiro.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar cópias de segurança regulares dos seus dados, em caso de encriptação tenha a certeza de que faz cópia das chaves de encriptação em conjunto com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: quer mesmo ativar a encriptação?",
@@ -224,8 +222,6 @@
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Esta aplicação tem uma atualização disponível.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão mínima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão máxima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
@@ -261,13 +257,11 @@
     "No email address set" : "Nenhum endereço de email estabelecido",
     "You are member of the following groups:" : "Você é membro dos seguintes grupos:",
     "Password" : "Palavra-passe",
-    "Unable to change your password" : "Não foi possível alterar a sua palavra-passe",
     "Current password" : "Palavra-passe atual",
     "New password" : "Nova palavra-passe",
     "Change password" : "Alterar palavra-passe",
     "Language" : "Idioma",
     "Help translate" : "Ajude a traduzir",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Estes são os clientes web, desktop e móveis actualmente ligados à sua ownCloud.",
     "Browser" : "Navegador",
     "Most recent activity" : "Atividade mais recente",
     "Name" : "Nome",
@@ -277,9 +271,7 @@
     "Desktop client" : "Cliente Desktop",
     "Android app" : "Aplicação Android",
     "iOS app" : "Aplicação iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Show user backend" : "Mostrar interface do utilizador",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 9c666219e98..7fd17b4a7f8 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Неправильный пароль",
+    "Saved" : "Сохранено",
     "No user supplied" : "Пользователь не задан",
     "Authentication error" : "Ошибка аутентификации",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
     "log-level out of allowed range" : "уровень журнала вышел за разрешенный диапазон",
-    "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Во время отправки письма произошла ошибка. Пожалуйста проверьте настройки. (Ошибка: %s)",
     "Email sent" : "Письмо отправлено",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Все",
     "No apps found for your version" : "Не найдено приложений для вашей версии",
     "The app will be downloaded from the app store" : "Приложение будет скачано из магазина приложений",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они составляют основу возможностей ownCloud и готовы к эксплуатации.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, также оно может работать нестабильно. Устанавливайте на свой страх и риск.",
     "Update to %s" : "Обновить до %s",
@@ -175,7 +174,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
     "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста читайте документацию для получения дополнительной информации о работе модуля шифрования и поддерживаемых вариантах его использования.",
     "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
     "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
@@ -228,8 +226,6 @@ OC.L10N.register(
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app has an update available." : "Для этого приложения доступно обновление.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Для этого приложения не указана минимальная версия ownClowd. Будет считаться ошибкой начиная с версии ownClowd 11.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Для этого приложения не указана максимальная версия ownClowd. Будет считаться ошибкой начиная с версии ownClowd 11.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Приложение не может быть установлено, следующие зависимости не удовлетворены:",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
@@ -265,13 +261,11 @@ OC.L10N.register(
     "No email address set" : "Адрес не указан",
     "You are member of the following groups:" : "Вы являетесь членом следующих групп:",
     "Password" : "Пароль",
-    "Unable to change your password" : "Невозможно сменить пароль",
     "Current password" : "Текущий пароль",
     "New password" : "Новый пароль",
     "Change password" : "Сменить пароль",
     "Language" : "Язык",
     "Help translate" : "Помочь с переводом",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Это сессии, вошедшие в настоящий момент в ваш ownCloud через веб, клиенты для ПК или мобильных устройств.",
     "Browser" : "Браузер",
     "Most recent activity" : "Последняя активность",
     "You've linked these apps." : "Вы привязали это приложение.",
@@ -279,16 +273,13 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Пароль приложения представляет собой код доступа, который дает приложению или устройству разрешения на доступ к вашему аккаунту %s.",
     "App name" : "Название приложения",
     "Create new app password" : "Создать новый пароль для приложения",
-    "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже, чтобы настроить ваше приложение или устройство.",
     "Username" : "Имя пользователя",
     "Done" : "Выполнено",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
     "Android app" : "Android приложение",
     "iOS app" : "iOS приложение",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">распространяйте вести</a>!",
     "Show First Run Wizard again" : "Показать помощник настройки снова",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
     "Show user backend" : "Показать механизм учёта пользователей",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index bb9debee626..d3515dd923b 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Неправильный пароль",
+    "Saved" : "Сохранено",
     "No user supplied" : "Пользователь не задан",
     "Authentication error" : "Ошибка аутентификации",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
     "log-level out of allowed range" : "уровень журнала вышел за разрешенный диапазон",
-    "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Во время отправки письма произошла ошибка. Пожалуйста проверьте настройки. (Ошибка: %s)",
     "Email sent" : "Письмо отправлено",
@@ -62,7 +62,6 @@
     "All" : "Все",
     "No apps found for your version" : "Не найдено приложений для вашей версии",
     "The app will be downloaded from the app store" : "Приложение будет скачано из магазина приложений",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они составляют основу возможностей ownCloud и готовы к эксплуатации.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, также оно может работать нестабильно. Устанавливайте на свой страх и риск.",
     "Update to %s" : "Обновить до %s",
@@ -173,7 +172,6 @@
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
     "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Когда вы включите шифрование, все файлы, загруженные с этого момента на сервер, будут храниться в зашифрованном виде. Отключить шифрование в более позднее время возможно только в случае, если выбранный модуль шифрования поддерживает эту функцию, и все дополнительные условия соблюдены (например настроен ключ восстановления).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Шифрование само по себе не гарантирует безопасность системы. Пожалуйста читайте документацию для получения дополнительной информации о работе модуля шифрования и поддерживаемых вариантах его использования.",
     "Be aware that encryption always increases the file size." : "Будьте в курсе, что шифрование всегда увеличивает размер файла.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Хорошая практика делать регулярные резервные копии ваших данных. При использовании шифрования сохраняйте не только данные, но и ключи.",
     "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
@@ -226,8 +224,6 @@
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app has an update available." : "Для этого приложения доступно обновление.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Для этого приложения не указана минимальная версия ownClowd. Будет считаться ошибкой начиная с версии ownClowd 11.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Для этого приложения не указана максимальная версия ownClowd. Будет считаться ошибкой начиная с версии ownClowd 11.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Приложение не может быть установлено, следующие зависимости не удовлетворены:",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
@@ -263,13 +259,11 @@
     "No email address set" : "Адрес не указан",
     "You are member of the following groups:" : "Вы являетесь членом следующих групп:",
     "Password" : "Пароль",
-    "Unable to change your password" : "Невозможно сменить пароль",
     "Current password" : "Текущий пароль",
     "New password" : "Новый пароль",
     "Change password" : "Сменить пароль",
     "Language" : "Язык",
     "Help translate" : "Помочь с переводом",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Это сессии, вошедшие в настоящий момент в ваш ownCloud через веб, клиенты для ПК или мобильных устройств.",
     "Browser" : "Браузер",
     "Most recent activity" : "Последняя активность",
     "You've linked these apps." : "Вы привязали это приложение.",
@@ -277,16 +271,13 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Пароль приложения представляет собой код доступа, который дает приложению или устройству разрешения на доступ к вашему аккаунту %s.",
     "App name" : "Название приложения",
     "Create new app password" : "Создать новый пароль для приложения",
-    "Use the credentials below to configure your app or device." : "Используйте учётные данные ниже, чтобы настроить ваше приложение или устройство.",
     "Username" : "Имя пользователя",
     "Done" : "Выполнено",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
     "Android app" : "Android приложение",
     "iOS app" : "iOS приложение",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">распространяйте вести</a>!",
     "Show First Run Wizard again" : "Показать помощник настройки снова",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
     "Show user backend" : "Показать механизм учёта пользователей",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index c249801c02c..b72175410a3 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Nesprávne heslo",
+    "Saved" : "Uložené",
     "No user supplied" : "Nebol uvedený používateľ",
     "Authentication error" : "Chyba autentifikácie",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
@@ -17,7 +18,6 @@ OC.L10N.register(
     "Unable to add group." : "Nie je možné pridať skupinu.",
     "Unable to delete group." : "Nie je možné zmazať skupinu.",
     "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia",
-    "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)",
     "Email sent" : "Email odoslaný",
@@ -207,7 +207,6 @@ OC.L10N.register(
     "No email address set" : "Emailová adresa nie je nastavená",
     "You are member of the following groups:" : "Ste členom nasledovných skupín:",
     "Password" : "Heslo",
-    "Unable to change your password" : "Nie je možné zmeniť vaše heslo",
     "Current password" : "Aktuálne heslo",
     "New password" : "Nové heslo",
     "Change password" : "Zmeniť heslo",
@@ -220,9 +219,7 @@ OC.L10N.register(
     "Desktop client" : "Desktopový klient",
     "Android app" : "Android aplikácia",
     "iOS app" : "iOS aplikácia",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!",
     "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
     "Show user backend" : "Zobraziť backend používateľa",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 383795d6f3b..644f5615b42 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Nesprávne heslo",
+    "Saved" : "Uložené",
     "No user supplied" : "Nebol uvedený používateľ",
     "Authentication error" : "Chyba autentifikácie",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
@@ -15,7 +16,6 @@
     "Unable to add group." : "Nie je možné pridať skupinu.",
     "Unable to delete group." : "Nie je možné zmazať skupinu.",
     "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia",
-    "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)",
     "Email sent" : "Email odoslaný",
@@ -205,7 +205,6 @@
     "No email address set" : "Emailová adresa nie je nastavená",
     "You are member of the following groups:" : "Ste členom nasledovných skupín:",
     "Password" : "Heslo",
-    "Unable to change your password" : "Nie je možné zmeniť vaše heslo",
     "Current password" : "Aktuálne heslo",
     "New password" : "Nové heslo",
     "Change password" : "Zmeniť heslo",
@@ -218,9 +217,7 @@
     "Desktop client" : "Desktopový klient",
     "Android app" : "Android aplikácia",
     "iOS app" : "iOS aplikácia",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!",
     "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
     "Show user backend" : "Zobraziť backend používateľa",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 57ae1eaac4c..69ec93a2373 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Napačno geslo",
+    "Saved" : "Shranjeno",
     "No user supplied" : "Ni navedenega uporabnika",
     "Authentication error" : "Napaka med overjanjem",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
@@ -18,7 +19,6 @@ OC.L10N.register(
     "Unable to add group." : "Ni mogoče dodati skupine",
     "Unable to delete group." : "Ni mogoče izbrisati skupine.",
     "log-level out of allowed range" : "stopnja zapisovanja je izven dovoljenega območja",
-    "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je prišlo do napake. Preverite nastavitve (napaka: %s).",
     "Email sent" : "Elektronska pošta je poslana",
@@ -83,9 +83,9 @@ OC.L10N.register(
     "App update" : "Posodabljanje vstavkov",
     "No apps found for {query}" : "Ni programov, skladnih z nizom \"{query}\".",
     "Disconnect" : "Prekinjeni povezavo",
-    "Error while loading browser sessions and device tokens" : "Napaka med nalaganjem brskalnika in ključev naprave",
-    "Error while creating device token" : "Napaka med izdelavo ključa naprave",
-    "Error while deleting the token" : "Napaka med brisanjem ključa",
+    "Error while loading browser sessions and device tokens" : " Napaka med nalaganjem brskalnika in ključev naprave",
+    "Error while creating device token" : " Napaka med izdelavo ključa naprave",
+    "Error while deleting the token" : " Napaka med brisanjem ključa",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
@@ -115,7 +115,7 @@ OC.L10N.register(
     "Unlimited" : "Neomejeno",
     "Personal info" : "Osebni podatki",
     "Sessions" : "Seje",
-    "App passwords" : "Gesla aplikacije",
+    "App passwords" : " Gesla aplikacije",
     "Sync clients" : "Uskladi odjemalce",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
@@ -128,6 +128,7 @@ OC.L10N.register(
     "NT LAN Manager" : "Upravljalnik NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : " Izgleda, da je PHP nastavljen, da odreže znake v 'inline doc' blokih. To bo povzročilo, da nekateri osnovni moduli ne bodo dosegljivi.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Strežnik ownCloud je nameščen v okolju Microsoft Windows. Toplo priporočamo okolje Linux za najboljšo uporabniško izkušnjo.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
@@ -150,17 +151,18 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Dovoli uporabnikom pošiljanje obvestil o souporabi datotek z drugimi uporabniki.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-    "Last cron job execution: %s." : "Zadnje periodično opravilo: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
+    "Last cron job execution: %s." : " Zadnje periodično opravilo: %s.",
+    "Last cron job execution: %s. Something seems wrong." : " Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
     "Please read carefully before activating server-side encryption: " : "Pozorno preberite opombe, preden omogočite strežniško šifriranje:",
-    "Be aware that encryption always increases the file size." : "Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
-    "This is the final warning: Do you really want to enable encryption?" : "To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
+    "Be aware that encryption always increases the file size." : " Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
+    "This is the final warning: Do you really want to enable encryption?" : " To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
     "Enable encryption" : "Omogoči šifriranje",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
     "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
     "Start migration" : "Začni selitev",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
@@ -203,6 +205,8 @@ OC.L10N.register(
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
     "This app has an update available." : "Za program so na voljo posodobitve.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Ta aplikacija nima določene minimalne NextCloud verzije. V prihodnosti bo to napaka.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Ta aplikacija nima določene maksimalne NextCloud verzije. V prihodnosti bo to napaka.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:",
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
@@ -227,7 +231,7 @@ OC.L10N.register(
     "Select from Files" : "Izbor iz datotek",
     "Remove image" : "Odstrani sliko",
     "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB",
-    "Picture provided by original account" : "Slika iz izvornega računa",
+    "Picture provided by original account" : "Slika iz originalnega računa",
     "Cancel" : "Prekliči",
     "Choose as profile picture" : "Izberi kot sliko profila",
     "Full name" : "Polno ime",
@@ -238,17 +242,17 @@ OC.L10N.register(
     "No email address set" : "Poštni naslov ni nastavljen",
     "You are member of the following groups:" : "Ste član naslednjih skupin:",
     "Password" : "Geslo",
-    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
     "Current password" : "Trenutno geslo",
     "New password" : "Novo geslo",
     "Change password" : "Spremeni geslo",
     "Language" : "Jezik",
     "Help translate" : "Sodelujte pri prevajanju",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "To so web, namizni in mobilni odjemalci, ki so trenutno prijavljeni v vaš račun.",
     "Browser" : "Brskalnik",
     "Most recent activity" : "Zadnja dejavnost",
-    "You've linked these apps." : "Vi ste povezali te aplikacije.",
+    "You've linked these apps." : "Povezali ste ti dve aplikaciji.",
     "Name" : "Ime",
-    "App name" : "Naziv aplikacije",
+    "App name" : "Ime aplikacije",
     "Create new app password" : "Ustvari novo geslo aplikacije",
     "Username" : "Uporabniško ime",
     "Done" : "Končano",
@@ -256,9 +260,7 @@ OC.L10N.register(
     "Desktop client" : "Namizni odjemalec",
     "Android app" : "Program za Android",
     "iOS app" : "Program za iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če želite podpreti projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">se pridružite razvijalcem</a>\n\t\tali pa le\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite dober glas</a>!",
     "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Programski paket razvija {communityopen}skupnost ownCloud{linkclose}, {githubopen}izvorna koda{linkclose} pa je objavljena z dovoljenjem {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show user backend" : "Pokaži ozadnji program",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 9d8dfa0652d..f3a86661fdc 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Napačno geslo",
+    "Saved" : "Shranjeno",
     "No user supplied" : "Ni navedenega uporabnika",
     "Authentication error" : "Napaka med overjanjem",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
@@ -16,7 +17,6 @@
     "Unable to add group." : "Ni mogoče dodati skupine",
     "Unable to delete group." : "Ni mogoče izbrisati skupine.",
     "log-level out of allowed range" : "stopnja zapisovanja je izven dovoljenega območja",
-    "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je prišlo do napake. Preverite nastavitve (napaka: %s).",
     "Email sent" : "Elektronska pošta je poslana",
@@ -81,9 +81,9 @@
     "App update" : "Posodabljanje vstavkov",
     "No apps found for {query}" : "Ni programov, skladnih z nizom \"{query}\".",
     "Disconnect" : "Prekinjeni povezavo",
-    "Error while loading browser sessions and device tokens" : "Napaka med nalaganjem brskalnika in ključev naprave",
-    "Error while creating device token" : "Napaka med izdelavo ključa naprave",
-    "Error while deleting the token" : "Napaka med brisanjem ključa",
+    "Error while loading browser sessions and device tokens" : " Napaka med nalaganjem brskalnika in ključev naprave",
+    "Error while creating device token" : " Napaka med izdelavo ključa naprave",
+    "Error while deleting the token" : " Napaka med brisanjem ključa",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
@@ -113,7 +113,7 @@
     "Unlimited" : "Neomejeno",
     "Personal info" : "Osebni podatki",
     "Sessions" : "Seje",
-    "App passwords" : "Gesla aplikacije",
+    "App passwords" : " Gesla aplikacije",
     "Sync clients" : "Uskladi odjemalce",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
@@ -126,6 +126,7 @@
     "NT LAN Manager" : "Upravljalnik NT LAN",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : " Izgleda, da je PHP nastavljen, da odreže znake v 'inline doc' blokih. To bo povzročilo, da nekateri osnovni moduli ne bodo dosegljivi.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Strežnik ownCloud je nameščen v okolju Microsoft Windows. Toplo priporočamo okolje Linux za najboljšo uporabniško izkušnjo.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
@@ -148,17 +149,18 @@
     "Allow users to send mail notification for shared files to other users" : "Dovoli uporabnikom pošiljanje obvestil o souporabi datotek z drugimi uporabniki.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-    "Last cron job execution: %s." : "Zadnje periodično opravilo: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
+    "Last cron job execution: %s." : " Zadnje periodično opravilo: %s.",
+    "Last cron job execution: %s. Something seems wrong." : " Zadnje periodično opravilo: %s. Nekaj izgleda narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
     "Please read carefully before activating server-side encryption: " : "Pozorno preberite opombe, preden omogočite strežniško šifriranje:",
-    "Be aware that encryption always increases the file size." : "Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
-    "This is the final warning: Do you really want to enable encryption?" : "To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
+    "Be aware that encryption always increases the file size." : " Upoštevajte, da šifriranje vedno poveča velikost datoteke.",
+    "This is the final warning: Do you really want to enable encryption?" : " To je zadnje opozorilo. Ali resnično želite vključiti šifriranje?",
     "Enable encryption" : "Omogoči šifriranje",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Modul za šifriranje ni naložen. Prosim, omogočite en šifrirni modul v spisku aplikacij.",
     "Select default encryption module:" : "Izbor privzetega modula za šifriranje:",
     "Start migration" : "Začni selitev",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
@@ -201,6 +203,8 @@
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
     "This app has an update available." : "Za program so na voljo posodobitve.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Ta aplikacija nima določene minimalne NextCloud verzije. V prihodnosti bo to napaka.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Ta aplikacija nima določene maksimalne NextCloud verzije. V prihodnosti bo to napaka.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:",
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
@@ -225,7 +229,7 @@
     "Select from Files" : "Izbor iz datotek",
     "Remove image" : "Odstrani sliko",
     "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB",
-    "Picture provided by original account" : "Slika iz izvornega računa",
+    "Picture provided by original account" : "Slika iz originalnega računa",
     "Cancel" : "Prekliči",
     "Choose as profile picture" : "Izberi kot sliko profila",
     "Full name" : "Polno ime",
@@ -236,17 +240,17 @@
     "No email address set" : "Poštni naslov ni nastavljen",
     "You are member of the following groups:" : "Ste član naslednjih skupin:",
     "Password" : "Geslo",
-    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
     "Current password" : "Trenutno geslo",
     "New password" : "Novo geslo",
     "Change password" : "Spremeni geslo",
     "Language" : "Jezik",
     "Help translate" : "Sodelujte pri prevajanju",
+    "These are the web, desktop and mobile clients currently logged in to your account." : "To so web, namizni in mobilni odjemalci, ki so trenutno prijavljeni v vaš račun.",
     "Browser" : "Brskalnik",
     "Most recent activity" : "Zadnja dejavnost",
-    "You've linked these apps." : "Vi ste povezali te aplikacije.",
+    "You've linked these apps." : "Povezali ste ti dve aplikaciji.",
     "Name" : "Ime",
-    "App name" : "Naziv aplikacije",
+    "App name" : "Ime aplikacije",
     "Create new app password" : "Ustvari novo geslo aplikacije",
     "Username" : "Uporabniško ime",
     "Done" : "Končano",
@@ -254,9 +258,7 @@
     "Desktop client" : "Namizni odjemalec",
     "Android app" : "Program za Android",
     "iOS app" : "Program za iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če želite podpreti projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">se pridružite razvijalcem</a>\n\t\tali pa le\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite dober glas</a>!",
     "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Programski paket razvija {communityopen}skupnost ownCloud{linkclose}, {githubopen}izvorna koda{linkclose} pa je objavljena z dovoljenjem {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show user backend" : "Pokaži ozadnji program",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 302f2f7ebc9..65a4f199e75 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Fjalëkalim i gabuar",
+    "Saved" : "U ruajt",
     "No user supplied" : "S’u dha përdorues",
     "Authentication error" : "Gabim mirëfilltësimi",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutemi, jepni një fjalëkalim rikthimesh për përgjegjësin, në të kundërt të gjitha të dhënat do të humbasin",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "S’arrin të shtojë grup.",
     "Unable to delete group." : "S’arrin të fshijë grup.",
     "log-level out of allowed range" : "nivel regjistrimi jashtë intervalit të lejuar",
-    "Saved" : "U ruajt",
     "test email settings" : "testoni rregullime email-i",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ndodhi një gabim gjatë dërgimit të email-it. Ju lutemi, rishikoni rregullimet tuaja. (Error: %s)",
     "Email sent" : "Email-i u dërgua",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Krejt",
     "No apps found for your version" : "S’u gjetën aplikacione për versionin tuaj",
     "The app will be downloaded from the app store" : "Aplikacioni do të shkarkohet nga shitorja e aplikacioneve",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë ownCloud. Ato ofrojnë funksione qendrore për ownCloud dhe janë gati për t’u përdorur në prodhim.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.",
     "Update to %s" : "Përditësoje me %s",
@@ -175,7 +174,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
     "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Fshehtëzimi, dhe vetëm kaq, s’garanton sigurinë e sistemit. Ju lutemi, për më tepër të dhëna se si funksionon aplikacioni i fshehtëzimeve, dhe për raste përdorimi që mbulon, lexoni dokumentimin e ownCloud-it.",
     "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
     "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
@@ -228,8 +226,6 @@ OC.L10N.register(
     "Show description …" : "Shfaq përshkrim …",
     "Hide description …" : "Fshihe përshkrimin …",
     "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version minimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version maksimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ky aplikacion s’mund të instalohet, ngaqë për të nuk plotësohen varësitë vijuese:",
     "Enable only for specific groups" : "Aktivizoje vetëm për grupe të veçantë",
     "Uninstall App" : "Çinstaloje Aplikacionin",
@@ -265,13 +261,11 @@ OC.L10N.register(
     "No email address set" : "S’është caktuar adresë email",
     "You are member of the following groups:" : "Jeni anëtar i grupeve vijuese:",
     "Password" : "Fjalëkalim",
-    "Unable to change your password" : "S’arrin të ndryshojë fjalëkalimin tuaj",
     "Current password" : "Fjalëkalimi i tanishëm",
     "New password" : "Fjalëkalimi i ri",
     "Change password" : "Ndrysho fjalëkalimin",
     "Language" : "Gjuhë",
     "Help translate" : "Ndihmoni në përkthim",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Këta janë klientët web, desktop dhe celular të futur në këtë çast në ownCloud-in tuaj.",
     "Browser" : "Shfletues",
     "Most recent activity" : "Veprimtaria më e freskët",
     "You've linked these apps." : "I keni lidhur këto aplikacione.",
@@ -279,16 +273,13 @@ OC.L10N.register(
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Fjalëkalimet e aplikacioneve janë kodkalime që u japin leje një aplikacioni ose pajisjeje të hyjnë në llogarinë tuaj %s.",
     "App name" : "Emër aplikacioni",
     "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
-    "Use the credentials below to configure your app or device." : "Përdorni kredencialet më poshtë për të formësuar aplikacionin apo pajisjen tuaj.",
     "Username" : "Emër përdoruesi",
     "Done" : "U bë",
     "Get the apps to sync your files" : "Merrni aplikacionet për njëkohësim të kartelave tuaja",
     "Desktop client" : "Klient desktopi",
     "Android app" : "Aplikacion për Android",
     "iOS app" : "Aplikacion për iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!",
     "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Krijuar nga {communityopen}bashkësia ownCloud{linkclose}, {githubopen}kodi burim{linkclose} mund të përdoret sipas licencës {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Shfaq vendndodhje depozite",
     "Show last log in" : "Shfaq hyrjen e fundit",
     "Show user backend" : "Shfaq programin klient të përdoruesit",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 5ec0798b2f3..640a7dbfcf2 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Fjalëkalim i gabuar",
+    "Saved" : "U ruajt",
     "No user supplied" : "S’u dha përdorues",
     "Authentication error" : "Gabim mirëfilltësimi",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutemi, jepni një fjalëkalim rikthimesh për përgjegjësin, në të kundërt të gjitha të dhënat do të humbasin",
@@ -17,7 +18,6 @@
     "Unable to add group." : "S’arrin të shtojë grup.",
     "Unable to delete group." : "S’arrin të fshijë grup.",
     "log-level out of allowed range" : "nivel regjistrimi jashtë intervalit të lejuar",
-    "Saved" : "U ruajt",
     "test email settings" : "testoni rregullime email-i",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ndodhi një gabim gjatë dërgimit të email-it. Ju lutemi, rishikoni rregullimet tuaja. (Error: %s)",
     "Email sent" : "Email-i u dërgua",
@@ -62,7 +62,6 @@
     "All" : "Krejt",
     "No apps found for your version" : "S’u gjetën aplikacione për versionin tuaj",
     "The app will be downloaded from the app store" : "Aplikacioni do të shkarkohet nga shitorja e aplikacioneve",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë ownCloud. Ato ofrojnë funksione qendrore për ownCloud dhe janë gati për t’u përdorur në prodhim.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.",
     "Update to %s" : "Përditësoje me %s",
@@ -173,7 +172,6 @@
     "Enable server-side encryption" : "Aktivizo fshehtëzim më anë të shërbyesit",
     "Please read carefully before activating server-side encryption: " : "Ju lutemi, lexoni me kujdes përpara aktivizimit të fshehtëzimeve më anë shërbyesi: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Pasi të jetë aktivizuar fshehtëzimi, krejt kartelat e ngarkuara te shërbyesi nga kjo pikë e tutje do të fshehtëzohen pasi të jenë depozituar në shërbyes. Çaktivizimi i fshehtëzimit në një datë të mëvonshme do të jetë i mundur vetëm nëse moduli aktiv i fshehtëzimeve e mbulon këtë funksion, dhe nëse plotësohen krejt parakushtet (p.sh. caktimi i një kyçi rimarrjesh).",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Fshehtëzimi, dhe vetëm kaq, s’garanton sigurinë e sistemit. Ju lutemi, për më tepër të dhëna se si funksionon aplikacioni i fshehtëzimeve, dhe për raste përdorimi që mbulon, lexoni dokumentimin e ownCloud-it.",
     "Be aware that encryption always increases the file size." : "Kini parasysh që fshehtëzimi e rrit gjithnjë madhësinë e kartelës.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Është gjithmonë ide e mirë të krijohen kopjeruajtje të rregullta të të dhënave tuaja, në rast fshehtëzimi sigurohuni që bëni kopjeruajtje të kyçeve të fshehtëzimit, tok me të dhënat tuaja.",
     "This is the final warning: Do you really want to enable encryption?" : "Ky është sinjalizimi përfundimtar: Doni vërtet të aktivizohet fshehtëzimi?",
@@ -226,8 +224,6 @@
     "Show description …" : "Shfaq përshkrim …",
     "Hide description …" : "Fshihe përshkrimin …",
     "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version minimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version maksimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ky aplikacion s’mund të instalohet, ngaqë për të nuk plotësohen varësitë vijuese:",
     "Enable only for specific groups" : "Aktivizoje vetëm për grupe të veçantë",
     "Uninstall App" : "Çinstaloje Aplikacionin",
@@ -263,13 +259,11 @@
     "No email address set" : "S’është caktuar adresë email",
     "You are member of the following groups:" : "Jeni anëtar i grupeve vijuese:",
     "Password" : "Fjalëkalim",
-    "Unable to change your password" : "S’arrin të ndryshojë fjalëkalimin tuaj",
     "Current password" : "Fjalëkalimi i tanishëm",
     "New password" : "Fjalëkalimi i ri",
     "Change password" : "Ndrysho fjalëkalimin",
     "Language" : "Gjuhë",
     "Help translate" : "Ndihmoni në përkthim",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Këta janë klientët web, desktop dhe celular të futur në këtë çast në ownCloud-in tuaj.",
     "Browser" : "Shfletues",
     "Most recent activity" : "Veprimtaria më e freskët",
     "You've linked these apps." : "I keni lidhur këto aplikacione.",
@@ -277,16 +271,13 @@
     "An app password is a passcode that gives an app or device permissions to access your %s account." : "Fjalëkalimet e aplikacioneve janë kodkalime që u japin leje një aplikacioni ose pajisjeje të hyjnë në llogarinë tuaj %s.",
     "App name" : "Emër aplikacioni",
     "Create new app password" : "Krijoni fjalëkalim aplikacioni të ri",
-    "Use the credentials below to configure your app or device." : "Përdorni kredencialet më poshtë për të formësuar aplikacionin apo pajisjen tuaj.",
     "Username" : "Emër përdoruesi",
     "Done" : "U bë",
     "Get the apps to sync your files" : "Merrni aplikacionet për njëkohësim të kartelave tuaja",
     "Desktop client" : "Klient desktopi",
     "Android app" : "Aplikacion për Android",
     "iOS app" : "Aplikacion për iOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!",
     "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Krijuar nga {communityopen}bashkësia ownCloud{linkclose}, {githubopen}kodi burim{linkclose} mund të përdoret sipas licencës {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Shfaq vendndodhje depozite",
     "Show last log in" : "Shfaq hyrjen e fundit",
     "Show user backend" : "Shfaq programin klient të përdoruesit",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 12fd48962be..c2ea9e601f1 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Погрешна лозинка",
+    "Saved" : "Сачувано",
     "No user supplied" : "Није наведен корисник",
     "Authentication error" : "Грешка при провери идентитета",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Наведите администраторску лозинку опоравка. У супротном, сви кориснички подаци биће изгубљени.",
@@ -17,7 +18,6 @@ OC.L10N.register(
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
     "log-level out of allowed range" : "ниво бележења је ван дозвољеног опсега",
-    "Saved" : "Сачувано",
     "test email settings" : "тестирајте поставке е-поште",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Појавио се проблем приликом слања е-поште. Проверите ваше поставке. (Грешка: %s)",
     "Email sent" : "Порука је послата",
@@ -61,7 +61,6 @@ OC.L10N.register(
     "Experimental" : "Експерименталне",
     "All" : "Све",
     "No apps found for your version" : "Нема апликација за вашу верзију",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране и унутар оунКлауд заједнице. Оне пружају главне функционалности и спремне су и стабилне за свакодневну употребу.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Одобрене апликације су развили проверени програмери и апликације су прошле основне безбедносне провере. Оне се активно одржавају у репозиторијуму за апликације отвореног кода и њихови одржаватељи сматрају да су стабилне за уобичајену употребу.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ова апликација није проверена по питању безбедности и нова је или зна да буде нестабилна. Инсталирате је на сопствену одговорност.",
     "Update to %s" : "Ажурирај на %s",
@@ -216,7 +215,6 @@ OC.L10N.register(
     "No email address set" : "Није постављена е-адреса",
     "You are member of the following groups:" : "Имате чланство у следећим групама:",
     "Password" : "Лозинка",
-    "Unable to change your password" : "Не могу да изменим вашу лозинку",
     "Current password" : "Тренутна лозинка",
     "New password" : "Нова лозинка",
     "Change password" : "Измени лозинку",
@@ -229,9 +227,7 @@ OC.L10N.register(
     "Desktop client" : "Клијент за рачунар",
     "Android app" : "Андроид апликација",
     "iOS app" : "иОС апликација",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!",
     "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index b47ec180dd7..0da4fbf2daa 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Погрешна лозинка",
+    "Saved" : "Сачувано",
     "No user supplied" : "Није наведен корисник",
     "Authentication error" : "Грешка при провери идентитета",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Наведите администраторску лозинку опоравка. У супротном, сви кориснички подаци биће изгубљени.",
@@ -15,7 +16,6 @@
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
     "log-level out of allowed range" : "ниво бележења је ван дозвољеног опсега",
-    "Saved" : "Сачувано",
     "test email settings" : "тестирајте поставке е-поште",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Појавио се проблем приликом слања е-поште. Проверите ваше поставке. (Грешка: %s)",
     "Email sent" : "Порука је послата",
@@ -59,7 +59,6 @@
     "Experimental" : "Експерименталне",
     "All" : "Све",
     "No apps found for your version" : "Нема апликација за вашу верзију",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране и унутар оунКлауд заједнице. Оне пружају главне функционалности и спремне су и стабилне за свакодневну употребу.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Одобрене апликације су развили проверени програмери и апликације су прошле основне безбедносне провере. Оне се активно одржавају у репозиторијуму за апликације отвореног кода и њихови одржаватељи сматрају да су стабилне за уобичајену употребу.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ова апликација није проверена по питању безбедности и нова је или зна да буде нестабилна. Инсталирате је на сопствену одговорност.",
     "Update to %s" : "Ажурирај на %s",
@@ -214,7 +213,6 @@
     "No email address set" : "Није постављена е-адреса",
     "You are member of the following groups:" : "Имате чланство у следећим групама:",
     "Password" : "Лозинка",
-    "Unable to change your password" : "Не могу да изменим вашу лозинку",
     "Current password" : "Тренутна лозинка",
     "New password" : "Нова лозинка",
     "Change password" : "Измени лозинку",
@@ -227,9 +225,7 @@
     "Desktop client" : "Клијент за рачунар",
     "Android app" : "Андроид апликација",
     "iOS app" : "иОС апликација",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!",
     "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од стране {communityopen}оунКлауд заједнице{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 82223adf662..b188b6e7eb5 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Fel lösenord",
+    "Saved" : "Sparad",
     "No user supplied" : "Ingen användare angiven",
     "Authentication error" : "Fel vid autentisering",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Lyckades inte lägga till grupp.",
     "Unable to delete group." : "Lyckades inte radera grupp.",
     "log-level out of allowed range" : "logg-nivå utanför tillåtet område",
-    "Saved" : "Sparad",
     "test email settings" : "Testa e-post inställningar",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ett problem uppstod när mail försökte skickas. Var god kontrollera dina inställningar. (Error: %s)",
     "Email sent" : "E-post skickad",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Alla",
     "No apps found for your version" : "Inga appar funna för din version",
     "The app will be downloaded from the app store" : "Appen kommer hämtas från appstore",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.",
     "Update to %s" : "Uppdatera till %s",
@@ -174,7 +173,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Aktivera kryptering på server.",
     "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering ensamt garanterar inte säkerhet av själva systemet. Var god see Owncloud's dokumentation för mer information om hur krypteringsapplikationen fungerar, och de användarfallen som stöds.",
     "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
     "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
@@ -227,8 +225,6 @@ OC.L10N.register(
     "Show description …" : "Visa beskrivning",
     "Hide description …" : "Dölj beskrivning",
     "This app has an update available." : "Denna applikation har en uppdatering tillgänglig.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen minimum version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen maximal version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s",
     "Enable only for specific groups" : "Aktivera endast för specifika grupper",
     "Uninstall App" : "Avinstallera applikation",
@@ -264,13 +260,11 @@ OC.L10N.register(
     "No email address set" : "Ingen e-postadress angiven",
     "You are member of the following groups:" : "Du är medlem i följande grupper:",
     "Password" : "Lösenord",
-    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
     "Current password" : "Nuvarande lösenord",
     "New password" : "Nytt lösenord",
     "Change password" : "Ändra lösenord",
     "Language" : "Språk",
     "Help translate" : "Hjälp att översätta",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dessa webbläsare,pc och mobila klienter är för tillfället inloggade på din ownCloud.",
     "Browser" : "Webbläsare",
     "Most recent activity" : "Senaste aktivitet",
     "Name" : "Namn",
@@ -280,9 +274,7 @@ OC.L10N.register(
     "Desktop client" : "Skrivbordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Om du vill stödja projektet\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">delta i utevcklingen</a>\n⇥⇥eller\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">sprid det vidare</a>!",
     "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utvecklad av {communityopen}ownCloud community{linkclose}, {githubopen}källkoden {linkclose} är licensierad under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-backend",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 5e4faebb3cc..0cc8e36f59a 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Fel lösenord",
+    "Saved" : "Sparad",
     "No user supplied" : "Ingen användare angiven",
     "Authentication error" : "Fel vid autentisering",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Lyckades inte lägga till grupp.",
     "Unable to delete group." : "Lyckades inte radera grupp.",
     "log-level out of allowed range" : "logg-nivå utanför tillåtet område",
-    "Saved" : "Sparad",
     "test email settings" : "Testa e-post inställningar",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ett problem uppstod när mail försökte skickas. Var god kontrollera dina inställningar. (Error: %s)",
     "Email sent" : "E-post skickad",
@@ -62,7 +62,6 @@
     "All" : "Alla",
     "No apps found for your version" : "Inga appar funna för din version",
     "The app will be downloaded from the app store" : "Appen kommer hämtas från appstore",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.",
     "Update to %s" : "Uppdatera till %s",
@@ -172,7 +171,6 @@
     "Enable server-side encryption" : "Aktivera kryptering på server.",
     "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering ensamt garanterar inte säkerhet av själva systemet. Var god see Owncloud's dokumentation för mer information om hur krypteringsapplikationen fungerar, och de användarfallen som stöds.",
     "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.",
     "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?",
@@ -225,8 +223,6 @@
     "Show description …" : "Visa beskrivning",
     "Hide description …" : "Dölj beskrivning",
     "This app has an update available." : "Denna applikation har en uppdatering tillgänglig.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen minimum version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen maximal version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s",
     "Enable only for specific groups" : "Aktivera endast för specifika grupper",
     "Uninstall App" : "Avinstallera applikation",
@@ -262,13 +258,11 @@
     "No email address set" : "Ingen e-postadress angiven",
     "You are member of the following groups:" : "Du är medlem i följande grupper:",
     "Password" : "Lösenord",
-    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
     "Current password" : "Nuvarande lösenord",
     "New password" : "Nytt lösenord",
     "Change password" : "Ändra lösenord",
     "Language" : "Språk",
     "Help translate" : "Hjälp att översätta",
-    "These are the web, desktop and mobile clients currently logged in to your ownCloud." : "Dessa webbläsare,pc och mobila klienter är för tillfället inloggade på din ownCloud.",
     "Browser" : "Webbläsare",
     "Most recent activity" : "Senaste aktivitet",
     "Name" : "Namn",
@@ -278,9 +272,7 @@
     "Desktop client" : "Skrivbordsklient",
     "Android app" : "Android-app",
     "iOS app" : "iOS-app",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Om du vill stödja projektet\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">delta i utevcklingen</a>\n⇥⇥eller\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">sprid det vidare</a>!",
     "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utvecklad av {communityopen}ownCloud community{linkclose}, {githubopen}källkoden {linkclose} är licensierad under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-backend",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index b205728a30f..fe30e1f0fdb 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "รหัสผ่านไม่ถูกต้อง",
+    "Saved" : "บันทึกแล้ว",
     "No user supplied" : "ไม่มีผู้ใช้",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "โปรดให้กู้คืนรหัสผ่านของผู้ดูแลระบบมิฉะนั้นข้อมูลของผู้ใช้ทั้งหมดจะหายไป",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "ไม่สามารถเพิ่มกลุ่ม",
     "Unable to delete group." : "ไม่สามารถลบกลุ่ม",
     "log-level out of allowed range" : "ระดับ-บันทึก ไม่ได้อยู่ในช่วงที่ได้รับอนุญาต",
-    "Saved" : "บันทึกแล้ว",
     "test email settings" : "ทดสอบการตั้งค่าอีเมล",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "เกิดปัญหาขึ้นในขณะที่ส่งอีเมล กรุณาแก้ไขการตั้งค่าของคุณ (ข้อผิดพลาด: %s)",
     "Email sent" : "ส่งอีเมลแล้ว",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "ทั้งหมด",
     "No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ",
     "The app will be downloaded from the app store" : "แอพฯจะดาวน์โหลดได้จากแอพสโตร์",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "แอพฯ นี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นแอพฯใหม่หรือที่รู้จักกันคือจะไม่เสถียร ติดตั้งบนความเสี่ยงของคุณเอง",
     "Update to %s" : "อัพเดทไปยัง %s",
@@ -165,7 +164,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "การเข้ารหัสลับเพียงอย่างเดียวไม่ได้รับประกันความปลอดภัยของระบบ โปรดดูเอกสาร ownCloud สำหรับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการเข้ารหัสแอพพลิเคชันและกรณีการสนับสนุน",
     "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
@@ -214,8 +212,6 @@ OC.L10N.register(
     "Admin documentation" : "เอกสารผู้ดูแลระบบ",
     "Show description …" : "แสดงรายละเอียด ...",
     "Hide description …" : "ซ่อนรายละเอียด ...",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "แอพฯนี้ได้ไม่บ่งบอกรุ่นต่ำสุดของ ownCloud นี้จะเป็นปัญหาใน ownCloud รุ่น 11 และรุ่นต่อไป",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "แอพฯนี้ได้ไม่บ่งบอกรุ่นสูงสุดของ ownCloud  นี้จะเป็นข้อผิดพลาดใน ownCloud ที่ 11 และรุ่นต่อมา",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "ไม่สามารถติดตั้งแอพฯนี้เพราะไม่มีตัวอ้างอิงต่อไปนี้:",
     "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม",
     "Uninstall App" : "ถอนการติดตั้งแอพฯ",
@@ -251,7 +247,6 @@ OC.L10N.register(
     "No email address set" : "ไม่ได้ตั้งค่าที่อยู่อีเมล",
     "You are member of the following groups:" : "คุณเป็นสมาชิกของกลุ่มต่อไปนี้:",
     "Password" : "รหัสผ่าน",
-    "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
     "Current password" : "รหัสผ่านปัจจุบัน",
     "New password" : "รหัสผ่านใหม่",
     "Change password" : "เปลี่ยนรหัสผ่าน",
@@ -264,9 +259,7 @@ OC.L10N.register(
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการสนับสนุนโครงการสามารถทำได้โดย <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">โปรโมท</a>!\n\t\t",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "พัฒนาโดย {communityopen}ownCloud{linkclose} {githubopen}ต้นฉบับ Github{linkclose} อยู่ภายใต้สัญญา {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}",
     "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล",
     "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด",
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index ab451fbcb4c..8f30fdf69e1 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "รหัสผ่านไม่ถูกต้อง",
+    "Saved" : "บันทึกแล้ว",
     "No user supplied" : "ไม่มีผู้ใช้",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "โปรดให้กู้คืนรหัสผ่านของผู้ดูแลระบบมิฉะนั้นข้อมูลของผู้ใช้ทั้งหมดจะหายไป",
@@ -17,7 +18,6 @@
     "Unable to add group." : "ไม่สามารถเพิ่มกลุ่ม",
     "Unable to delete group." : "ไม่สามารถลบกลุ่ม",
     "log-level out of allowed range" : "ระดับ-บันทึก ไม่ได้อยู่ในช่วงที่ได้รับอนุญาต",
-    "Saved" : "บันทึกแล้ว",
     "test email settings" : "ทดสอบการตั้งค่าอีเมล",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "เกิดปัญหาขึ้นในขณะที่ส่งอีเมล กรุณาแก้ไขการตั้งค่าของคุณ (ข้อผิดพลาด: %s)",
     "Email sent" : "ส่งอีเมลแล้ว",
@@ -62,7 +62,6 @@
     "All" : "ทั้งหมด",
     "No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ",
     "The app will be downloaded from the app store" : "แอพฯจะดาวน์โหลดได้จากแอพสโตร์",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "แอพฯ นี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นแอพฯใหม่หรือที่รู้จักกันคือจะไม่เสถียร ติดตั้งบนความเสี่ยงของคุณเอง",
     "Update to %s" : "อัพเดทไปยัง %s",
@@ -163,7 +162,6 @@
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "เมื่อเปิดใช้งานการเข้ารหัส ไฟล์ทั้งหมดที่อัพโหลดไปยังเซิร์ฟเวอร์นั้นจะถูกเข้ารหัสในส่วนของเซิฟเวอร์ มันเป็นไปได้ที่จะปิดใช้งานการเข้ารหัสในภายหลัง ถ้าเปิดใช้ฟังก์ชั่นการสนับสนุนโมดูลการเข้ารหัสที่และเงื่อนไขก่อน (เช่น การตั้งค่าคีย์กู้คืน)",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "การเข้ารหัสลับเพียงอย่างเดียวไม่ได้รับประกันความปลอดภัยของระบบ โปรดดูเอกสาร ownCloud สำหรับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการเข้ารหัสแอพพลิเคชันและกรณีการสนับสนุน",
     "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "มันจะดีถ้าคุณสำรองข้อมูลบ่อยๆ ในกรณีของการเข้ารหัสโปรดแน่ใจว่าจะสำรองคีย์การเข้ารหัสลับพร้อมกับข้อมูลของคุณ",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
@@ -212,8 +210,6 @@
     "Admin documentation" : "เอกสารผู้ดูแลระบบ",
     "Show description …" : "แสดงรายละเอียด ...",
     "Hide description …" : "ซ่อนรายละเอียด ...",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "แอพฯนี้ได้ไม่บ่งบอกรุ่นต่ำสุดของ ownCloud นี้จะเป็นปัญหาใน ownCloud รุ่น 11 และรุ่นต่อไป",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "แอพฯนี้ได้ไม่บ่งบอกรุ่นสูงสุดของ ownCloud  นี้จะเป็นข้อผิดพลาดใน ownCloud ที่ 11 และรุ่นต่อมา",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "ไม่สามารถติดตั้งแอพฯนี้เพราะไม่มีตัวอ้างอิงต่อไปนี้:",
     "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม",
     "Uninstall App" : "ถอนการติดตั้งแอพฯ",
@@ -249,7 +245,6 @@
     "No email address set" : "ไม่ได้ตั้งค่าที่อยู่อีเมล",
     "You are member of the following groups:" : "คุณเป็นสมาชิกของกลุ่มต่อไปนี้:",
     "Password" : "รหัสผ่าน",
-    "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
     "Current password" : "รหัสผ่านปัจจุบัน",
     "New password" : "รหัสผ่านใหม่",
     "Change password" : "เปลี่ยนรหัสผ่าน",
@@ -262,9 +257,7 @@
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการสนับสนุนโครงการสามารถทำได้โดย <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">โปรโมท</a>!\n\t\t",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "พัฒนาโดย {communityopen}ownCloud{linkclose} {githubopen}ต้นฉบับ Github{linkclose} อยู่ภายใต้สัญญา {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}",
     "Show storage location" : "แสดงสถานที่จัดเก็บข้อมูล",
     "Show last log in" : "แสดงการเข้าสู่ระบบล่าสุด",
     "Show user backend" : "แสดงแบ็กเอนด์ของผู้ใช้",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 38a06e23850..a2c69b7740d 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Hatalı parola",
+    "Saved" : "Kaydedildi",
     "No user supplied" : "Kullanıcı girilmedi",
     "Authentication error" : "Kimlik doğrulama hatası",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Grup ekleme başarısız.",
     "Unable to delete group." : "Grubu silme başarısız.",
     "log-level out of allowed range" : "günlük seviyesi izin verilen aralık dışında",
-    "Saved" : "Kaydedildi",
     "test email settings" : "e-posta ayarlarını sına",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı gözden geçirin. (Hata: %s)",
     "Email sent" : "E-posta gönderildi",
@@ -64,7 +64,6 @@ OC.L10N.register(
     "All" : "Tümü",
     "No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
     "The app will be downloaded from the app store" : "uygulama uygulama dükkanından indirilebilecek",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.",
     "Update to %s" : "%s sürümüne güncelle",
@@ -168,7 +167,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistem güvenliğini garanti etmez. Lütfen şifreleme uygulamasının çalışma bilgisi ve desteklenen kullanım durumları için ownCloud belgelerine bakın.",
     "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
@@ -219,8 +217,6 @@ OC.L10N.register(
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app has an update available." : "Bu uygulamanın bir güncellemesi var.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en düşük ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en yüksek ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
     "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
     "Uninstall App" : "Uygulamayı Kaldır",
@@ -256,7 +252,6 @@ OC.L10N.register(
     "No email address set" : "E-posta adresi ayarlanmamış",
     "You are member of the following groups:" : "Şu grupların üyesisiniz:",
     "Password" : "Parola",
-    "Unable to change your password" : "Parolanız değiştirilemiyor",
     "Current password" : "Mevcut parola",
     "New password" : "Yeni parola",
     "Change password" : "Parola değiştir",
@@ -269,9 +264,7 @@ OC.L10N.register(
     "Desktop client" : "Masaüstü istemcisi",
     "Android app" : "Android uygulaması",
     "iOS app" : "iOS uygulaması",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!",
     "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
     "Show user backend" : "Kullanıcı arka ucunu göster",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 07b7584bd42..93c6b71fdf3 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Hatalı parola",
+    "Saved" : "Kaydedildi",
     "No user supplied" : "Kullanıcı girilmedi",
     "Authentication error" : "Kimlik doğrulama hatası",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Grup ekleme başarısız.",
     "Unable to delete group." : "Grubu silme başarısız.",
     "log-level out of allowed range" : "günlük seviyesi izin verilen aralık dışında",
-    "Saved" : "Kaydedildi",
     "test email settings" : "e-posta ayarlarını sına",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı gözden geçirin. (Hata: %s)",
     "Email sent" : "E-posta gönderildi",
@@ -62,7 +62,6 @@
     "All" : "Tümü",
     "No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
     "The app will be downloaded from the app store" : "uygulama uygulama dükkanından indirilebilecek",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.",
     "Update to %s" : "%s sürümüne güncelle",
@@ -166,7 +165,6 @@
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Şifreleme etkinleştirildiğinde, sunucuya yüklenen tüm dosyalar şifrelenmiş olarak kalacaktır. Şifrelemeyi devre dışı bırakmak sadece ileriki zamanlarda aktif şifreleme modülü desteklediğinde ve ön koşullar (örn: düzenleme anahtarı oluşturulması) yerine getirildiğinde yapılabilir.",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Şifreleme tek başına sistem güvenliğini garanti etmez. Lütfen şifreleme uygulamasının çalışma bilgisi ve desteklenen kullanım durumları için ownCloud belgelerine bakın.",
     "Be aware that encryption always increases the file size." : "Şifrelemenin dosya boyutunu büyüteceğini unutmayın.",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Verilerinizi düzenli yedekleyin ve şifreleme anahtarlarınızın verilerinizle birlikte yedeklendiğinden emin olun. ",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
@@ -217,8 +215,6 @@
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app has an update available." : "Bu uygulamanın bir güncellemesi var.",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en düşük ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en yüksek ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
     "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
     "Uninstall App" : "Uygulamayı Kaldır",
@@ -254,7 +250,6 @@
     "No email address set" : "E-posta adresi ayarlanmamış",
     "You are member of the following groups:" : "Şu grupların üyesisiniz:",
     "Password" : "Parola",
-    "Unable to change your password" : "Parolanız değiştirilemiyor",
     "Current password" : "Mevcut parola",
     "New password" : "Yeni parola",
     "Change password" : "Parola değiştir",
@@ -267,9 +262,7 @@
     "Desktop client" : "Masaüstü istemcisi",
     "Android app" : "Android uygulaması",
     "iOS app" : "iOS uygulaması",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!",
     "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
     "Show user backend" : "Kullanıcı arka ucunu göster",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index f7ab8f88361..640f40eb2d6 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "Невірний пароль",
+    "Saved" : "Збережено",
     "No user supplied" : "Користувача не вказано",
     "Authentication error" : "Помилка автентифікації",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль відновлення адміністратора, інакше всі дані будуть втрачені",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
     "log-level out of allowed range" : "рівень протоколювання перевищує дозволені межі",
-    "Saved" : "Збережено",
     "test email settings" : "тест налаштувань електронної пошти",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час надсилання email сталася помилка. Будь ласка перевірте налаштування. (Помилка: %s)",
     "Email sent" : "Лист надіслано",
@@ -62,7 +62,6 @@ OC.L10N.register(
     "Experimental" : "Експериментальні",
     "All" : "Всі",
     "No apps found for your version" : "Немає застосунків для вашої версії",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
     "Update to %s" : "Оновити до %s",
@@ -220,7 +219,6 @@ OC.L10N.register(
     "No email address set" : "E-mail не вказано",
     "You are member of the following groups:" : "Ви є членом наступних груп:",
     "Password" : "Пароль",
-    "Unable to change your password" : "Не вдалося змінити Ваш пароль",
     "Current password" : "Поточний пароль",
     "New password" : "Новий пароль",
     "Change password" : "Змінити пароль",
@@ -233,9 +231,7 @@ OC.L10N.register(
     "Desktop client" : "Клієнт для ПК",
     "Android app" : "Android-додаток",
     "iOS app" : "iOS додаток",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !",
     "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
     "Show user backend" : "Показати користувача",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index a1ce577740c..caed4f0aa05 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "Невірний пароль",
+    "Saved" : "Збережено",
     "No user supplied" : "Користувача не вказано",
     "Authentication error" : "Помилка автентифікації",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль відновлення адміністратора, інакше всі дані будуть втрачені",
@@ -17,7 +18,6 @@
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
     "log-level out of allowed range" : "рівень протоколювання перевищує дозволені межі",
-    "Saved" : "Збережено",
     "test email settings" : "тест налаштувань електронної пошти",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час надсилання email сталася помилка. Будь ласка перевірте налаштування. (Помилка: %s)",
     "Email sent" : "Лист надіслано",
@@ -60,7 +60,6 @@
     "Experimental" : "Експериментальні",
     "All" : "Всі",
     "No apps found for your version" : "Немає застосунків для вашої версії",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
     "Update to %s" : "Оновити до %s",
@@ -218,7 +217,6 @@
     "No email address set" : "E-mail не вказано",
     "You are member of the following groups:" : "Ви є членом наступних груп:",
     "Password" : "Пароль",
-    "Unable to change your password" : "Не вдалося змінити Ваш пароль",
     "Current password" : "Поточний пароль",
     "New password" : "Новий пароль",
     "Change password" : "Змінити пароль",
@@ -231,9 +229,7 @@
     "Desktop client" : "Клієнт для ПК",
     "Android app" : "Android-додаток",
     "iOS app" : "iOS додаток",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !",
     "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
     "Show user backend" : "Показати користувача",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index df0a5873876..56ace07b97f 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "错误密码",
+    "Saved" : "已保存",
     "No user supplied" : "没有满足的用户",
     "Authentication error" : "认证错误",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "无法添加组。",
     "Unable to delete group." : "无法删除组",
     "log-level out of allowed range" : "日志级别超出允许的范围",
-    "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "实验",
     "All" : "全部",
     "No apps found for your version" : "未找到适合当前版本的应用",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
@@ -162,7 +161,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "启用服务器端加密",
     "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "加密本身并不能保证系统的安全性。请参阅ownCloud文档有关加密应用程序是如何工作和支持用例的详细信息等。",
     "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
     "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
@@ -211,8 +209,6 @@ OC.L10N.register(
     "Show description …" : "显示描述...",
     "Hide description …" : "隐藏描述...",
     "This app has an update available." : "此应用有可用的更新。",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "这个程序没有指定最低的ownCloud版本。这是在ownCloud11之后版本的错误。",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "这个程序没有指定最高的ownCloud版本。这是在ownCloud11之后版本的错误。",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
@@ -247,7 +243,6 @@ OC.L10N.register(
     "No email address set" : "尚未设置 Email 地址",
     "You are member of the following groups:" : "您是以下组的成员：",
     "Password" : "密码",
-    "Unable to change your password" : "无法修改密码",
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
@@ -259,9 +254,7 @@ OC.L10N.register(
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！",
     "Show First Run Wizard again" : "再次显示首次运行向导",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}的发布需遵守 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可协议{linkclose}。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Show user backend" : "显示用户后端",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 1e56a61f06b..c1244678aa9 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "错误密码",
+    "Saved" : "已保存",
     "No user supplied" : "没有满足的用户",
     "Authentication error" : "认证错误",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
@@ -17,7 +18,6 @@
     "Unable to add group." : "无法添加组。",
     "Unable to delete group." : "无法删除组",
     "log-level out of allowed range" : "日志级别超出允许的范围",
-    "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
@@ -61,7 +61,6 @@
     "Experimental" : "实验",
     "All" : "全部",
     "No apps found for your version" : "未找到适合当前版本的应用",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
@@ -160,7 +159,6 @@
     "Enable server-side encryption" : "启用服务器端加密",
     "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密被启用，之后上传到服务器的所有文件都将服务器上加密。只有当启用状态的加密模块支持解密并且所有的先决条件(例如，设定恢复键)得到满足时才能解除加密。",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "加密本身并不能保证系统的安全性。请参阅ownCloud文档有关加密应用程序是如何工作和支持用例的详细信息等。",
     "Be aware that encryption always increases the file size." : "请注意，加密会增加文件大小。",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定期备份数据有利于保证数据完整，并且确保备份您的加密数据和加密密钥。",
     "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
@@ -209,8 +207,6 @@
     "Show description …" : "显示描述...",
     "Hide description …" : "隐藏描述...",
     "This app has an update available." : "此应用有可用的更新。",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "这个程序没有指定最低的ownCloud版本。这是在ownCloud11之后版本的错误。",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "这个程序没有指定最高的ownCloud版本。这是在ownCloud11之后版本的错误。",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
@@ -245,7 +241,6 @@
     "No email address set" : "尚未设置 Email 地址",
     "You are member of the following groups:" : "您是以下组的成员：",
     "Password" : "密码",
-    "Unable to change your password" : "无法修改密码",
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
@@ -257,9 +252,7 @@
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！",
     "Show First Run Wizard again" : "再次显示首次运行向导",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}的发布需遵守 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可协议{linkclose}。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Show user backend" : "显示用户后端",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 83d3b254093..bd248b5dcae 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
     "No user supplied" : "未提供使用者",
     "Authentication error" : "認證錯誤",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "請提供管理者還原密碼，否則會遺失所有使用者資料",
@@ -19,7 +20,6 @@ OC.L10N.register(
     "Unable to add group." : "無法新增群組",
     "Unable to delete group." : "無法刪除群組",
     "log-level out of allowed range" : "log-level 超過允許範圍",
-    "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Experimental" : "實驗性質",
     "All" : "所有",
     "No apps found for your version" : "沒有找到適合您的版本的應用程式",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方應用程式由 ownCloud 社群開發，他們提供 ownCloud 的主要功能，並確保穩定性足供正式使用",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "審查通過的應用程式經由可信任的開發人員所設計，並且經過一連串的安全測試，他們在開放的程式庫中維護這些應用程式，而且確保這些應用程式能穩定運作",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "這個新應用程式並沒有經過安全檢測，可能會是不穩定的，如果您要安裝的話，風險自行負責。",
     "Update to %s" : "更新到 %s",
@@ -158,7 +157,6 @@ OC.L10N.register(
     "Enable server-side encryption" : "啟用伺服器端加密",
     "Please read carefully before activating server-side encryption: " : "在您啟動伺服器端加密之前，請仔細閱讀：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密模式啟動，從各地上傳到伺服器端的檔案都會被加密，若日後要停用加密，需要加密模組的支援，而且所有的設定（例如: 還原金鑰）都正確",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "單純的加密不能保障系統的安全，請參閱 ownCloud 說明文件以瞭解加密程式的運作，還有它支援的使用情境",
     "Be aware that encryption always increases the file size." : "請注意，加密一定會增加檔案的大小",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定時備份您的資料沒有壞處，若您有啟用加密，請確保您也有備份加密金鑰",
     "This is the final warning: Do you really want to enable encryption?" : "這是最後的警告：請問您真的要開啟加密模式？",
@@ -205,8 +203,6 @@ OC.L10N.register(
     "Admin documentation" : "管理者文件",
     "Show description …" : "顯示描述",
     "Hide description …" : "隱藏描述",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "此應用程式沒有指定支援的最小 ownCloud 版本，從 ownCloud 11 之後這會是個錯誤",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "此應用程式沒有指定支援的最大 ownCloud 版本，從 ownCloud 11 之後這會是個錯誤",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "這個應用程式無法被安裝，因為欠缺下列相依套件：",
     "Enable only for specific groups" : "僅對特定的群組啟用",
     "Uninstall App" : "解除安裝 App",
@@ -241,7 +237,6 @@ OC.L10N.register(
     "No email address set" : "未設定電子郵件信箱",
     "You are member of the following groups:" : "您的帳號屬於這些群組：",
     "Password" : "密碼",
-    "Unable to change your password" : "無法變更您的密碼",
     "Current password" : "目前密碼",
     "New password" : "新密碼",
     "Change password" : "變更密碼",
@@ -253,9 +248,7 @@ OC.L10N.register(
     "Desktop client" : "桌面客戶端",
     "Android app" : "Android 應用程式",
     "iOS app" : "iOS 應用程式",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社群{linkclose} 開發，{githubopen}原始碼{linkclose}使用 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 授權釋出",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index f48f802c7d6..8e4415de276 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
     "No user supplied" : "未提供使用者",
     "Authentication error" : "認證錯誤",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "請提供管理者還原密碼，否則會遺失所有使用者資料",
@@ -17,7 +18,6 @@
     "Unable to add group." : "無法新增群組",
     "Unable to delete group." : "無法刪除群組",
     "log-level out of allowed range" : "log-level 超過允許範圍",
-    "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
@@ -61,7 +61,6 @@
     "Experimental" : "實驗性質",
     "All" : "所有",
     "No apps found for your version" : "沒有找到適合您的版本的應用程式",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方應用程式由 ownCloud 社群開發，他們提供 ownCloud 的主要功能，並確保穩定性足供正式使用",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "審查通過的應用程式經由可信任的開發人員所設計，並且經過一連串的安全測試，他們在開放的程式庫中維護這些應用程式，而且確保這些應用程式能穩定運作",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "這個新應用程式並沒有經過安全檢測，可能會是不穩定的，如果您要安裝的話，風險自行負責。",
     "Update to %s" : "更新到 %s",
@@ -156,7 +155,6 @@
     "Enable server-side encryption" : "啟用伺服器端加密",
     "Please read carefully before activating server-side encryption: " : "在您啟動伺服器端加密之前，請仔細閱讀：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密模式啟動，從各地上傳到伺服器端的檔案都會被加密，若日後要停用加密，需要加密模組的支援，而且所有的設定（例如: 還原金鑰）都正確",
-    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "單純的加密不能保障系統的安全，請參閱 ownCloud 說明文件以瞭解加密程式的運作，還有它支援的使用情境",
     "Be aware that encryption always increases the file size." : "請注意，加密一定會增加檔案的大小",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定時備份您的資料沒有壞處，若您有啟用加密，請確保您也有備份加密金鑰",
     "This is the final warning: Do you really want to enable encryption?" : "這是最後的警告：請問您真的要開啟加密模式？",
@@ -203,8 +201,6 @@
     "Admin documentation" : "管理者文件",
     "Show description …" : "顯示描述",
     "Hide description …" : "隱藏描述",
-    "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "此應用程式沒有指定支援的最小 ownCloud 版本，從 ownCloud 11 之後這會是個錯誤",
-    "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "此應用程式沒有指定支援的最大 ownCloud 版本，從 ownCloud 11 之後這會是個錯誤",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "這個應用程式無法被安裝，因為欠缺下列相依套件：",
     "Enable only for specific groups" : "僅對特定的群組啟用",
     "Uninstall App" : "解除安裝 App",
@@ -239,7 +235,6 @@
     "No email address set" : "未設定電子郵件信箱",
     "You are member of the following groups:" : "您的帳號屬於這些群組：",
     "Password" : "密碼",
-    "Unable to change your password" : "無法變更您的密碼",
     "Current password" : "目前密碼",
     "New password" : "新密碼",
     "Change password" : "變更密碼",
@@ -251,9 +246,7 @@
     "Desktop client" : "桌面客戶端",
     "Android app" : "Android 應用程式",
     "iOS app" : "iOS 應用程式",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社群{linkclose} 開發，{githubopen}原始碼{linkclose}使用 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} 授權釋出",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9195e03ff48..f41c0d3c101 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -362,7 +362,7 @@ if ($_['cronErrors']) {
 		<p><?php p($l->t('Please read carefully before activating server-side encryption: ')); ?></p>
 		<ul>
 			<li><?php p($l->t('Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.')); ?></li>
-			<li><?php p($l->t('Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.')); ?></li>
+			<li><?php p($l->t('Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases.')); ?></li>
 			<li><?php p($l->t('Be aware that encryption always increases the file size.')); ?></li>
 			<li><?php p($l->t('It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.')); ?></li>
 		</ul>
@@ -519,6 +519,7 @@ if ($_['cronErrors']) {
 					p($entry->time);
 				}?>
 			</td>
+			<td><?php isset($entry->user) ? p($entry->user) : p('--') ?></td>
 		</tr>
 		<?php endforeach;?>
 	</table>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d3c14332693..2edbf1530eb 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -117,12 +117,12 @@ script(
 
 	{{#if missingMinOwnCloudVersion}}
 		<div class="app-dependencies">
-			<p><?php p($l->t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
+			<p><?php p($l->t('This app has no minimum Nextcloud version assigned. This will be an error in the future.')); ?></p>
 		</div>
 	{{else}}
 		{{#if missingMaxOwnCloudVersion}}
 			<div class="app-dependencies">
-				<p><?php p($l->t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
+				<p><?php p($l->t('This app has no maximum Nextcloud version assigned. This will be an error in the future.')); ?></p>
 			</div>
 		{{/if}}
 	{{/if}}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index a31cf1ed7b2..2f656d39fbb 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -118,8 +118,7 @@ if($_['passwordChangeSupported']) {
 ?>
 <form id="passwordform" class="section">
 	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
-	<div class="hidden icon-checkmark" id="password-changed"></div>
-	<div class="hidden" id="password-error"><?php p($l->t('Unable to change your password'));?></div>
+	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 	<br>
 	<label for="pass1" class="hidden-visually"><?php echo $l->t('Current password');?>: </label>
 	<input type="password" id="pass1" name="oldpassword"
@@ -133,7 +132,6 @@ if($_['passwordChangeSupported']) {
 	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
-	<div class="strengthify-wrapper"></div>
 </form>
 <?php
 }
@@ -169,7 +167,7 @@ if($_['passwordChangeSupported']) {
 
 <div id="sessions" class="section">
 	<h2><?php p($l->t('Sessions'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your ownCloud.'));?></span>
+	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your account.'));?></span>
 	<table>
 		<thead class="token-list-header">
 			<tr>
@@ -234,10 +232,10 @@ if($_['passwordChangeSupported']) {
 	<?php if (OC_Util::getEditionString() === ''): ?>
 	<p>
 		<?php print_unescaped($l->t('If you want to support the project
-		<a href="https://owncloud.org/contribute"
+		<a href="https://nextcloud.com/contribute"
 			target="_blank" rel="noreferrer">join development</a>
 		or
-		<a href="https://owncloud.org/promote"
+		<a href="https://nextcloud.com/contribute"
 			target="_blank" rel="noreferrer">spread the word</a>!'));?>
 	</p>
 	<?php endif; ?>
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
index c88c90f6b6b..2834277cfd6 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings.development.notice.php
@@ -8,12 +8,12 @@
 				'{linkclose}',
 			],
 			[
-				'<a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">',
+				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
 				'<a href="https://github.com/owncloud" target="_blank" rel="noreferrer">',
 				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">',
 				'</a>',
 			],
-			$l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
+			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
 		)); ?>
 	</p>
 <?php endif; ?>