Merge pull request #14135 from cmeh/master

Clean-up of messages (orthography, format)

settings/changepassword/controller.php

@@ -78,7 +78,7 @@ class Controller {
 					$l = new \OC_L10n('settings');
 					\OC_JSON::error(array(
 						"data" => array(
-							"message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.")
+							"message" => $l->t("Backend doesn't support password change, but the user's encryption key was successfully updated.")
 						)
 					));
 				} elseif (!$result && !$recoveryEnabledForUser) {

settings/templates/admin.php

@@ -516,7 +516,7 @@ if ($_['suggestedOverwriteCliUrl']) {
 	<?php if ($_['logFileSize'] > (100 * 1024 * 1024)): ?>
 	<br>
 	<em>
-		<?php p($l->t('The logfile is bigger than 100MB. Downloading it may take some time!')); ?>
+		<?php p($l->t('The logfile is bigger than 100 MB. Downloading it may take some time!')); ?>
 	</em>
 	<?php endif; ?>
 	<?php endif; ?>