summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-02-12 11:03:49 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-02-12 11:03:49 +0100
commit0b38a48bb4f1150710209577d15d8041574aa29a (patch)
tree7c99d5e0361d5e26b18d620b939385e6763fbe2c
parentf4182d2dc9380015a1dadc6be40a731b8092c971 (diff)
parentf24f7f7c74aec95b0630ac196bc6ee1c5837854a (diff)
downloadnextcloud-server-0b38a48bb4f1150710209577d15d8041574aa29a.tar.gz
nextcloud-server-0b38a48bb4f1150710209577d15d8041574aa29a.zip
Merge pull request #14135 from cmeh/master
Clean-up of messages (orthography, format)
-rw-r--r--settings/changepassword/controller.php2
-rw-r--r--settings/templates/admin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 4ed907daf96..4af250f1814 100644
--- a/settings/changepassword/controller.php
+++ b/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) {
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index cd26d64aa03..a739e517ede 100644
--- a/settings/templates/admin.php
+++ b/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; ?>