diff options
author | Joas Schilling <coding@schilljs.com> | 2017-04-18 09:53:02 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-18 16:40:53 -0500 |
commit | 1c0bffe87f578403b130015f8fee5560cc075b34 (patch) | |
tree | ddf334b5dfd362f9c905ed2e9ed27fd8aa584694 /settings | |
parent | b072d2c49d6f61c2b55abf12e04bdf2166dbd4f4 (diff) | |
download | nextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.tar.gz nextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.zip |
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'settings')
-rw-r--r-- | settings/Activity/Provider.php | 6 | ||||
-rw-r--r-- | settings/Controller/ChangePasswordController.php | 2 | ||||
-rw-r--r-- | settings/js/apps.js | 2 | ||||
-rw-r--r-- | settings/templates/admin/server.php | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/settings/Activity/Provider.php b/settings/Activity/Provider.php index f7ea425f628..7893b450a44 100644 --- a/settings/Activity/Provider.php +++ b/settings/Activity/Provider.php @@ -89,11 +89,11 @@ class Provider implements IProvider { $subject = $this->l->t('Your password was reset by an administrator'); } else if ($event->getSubject() === self::EMAIL_CHANGED_BY) { - $subject = $this->l->t('{actor} changed your email'); + $subject = $this->l->t('{actor} changed your email address'); } else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) { - $subject = $this->l->t('You changed your email'); + $subject = $this->l->t('You changed your email address'); } else if ($event->getSubject() === self::EMAIL_CHANGED) { - $subject = $this->l->t('Your email was changed by an administrator'); + $subject = $this->l->t('Your email address was changed by an administrator'); } else { throw new \InvalidArgumentException(); diff --git a/settings/Controller/ChangePasswordController.php b/settings/Controller/ChangePasswordController.php index b82751bcac2..4faed3a8fa6 100644 --- a/settings/Controller/ChangePasswordController.php +++ b/settings/Controller/ChangePasswordController.php @@ -243,7 +243,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was successfully updated.'), + 'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was updated.'), ] ]); } elseif (!$result && !$recoveryEnabledForUser) { diff --git a/settings/js/apps.js b/settings/js/apps.js index 215b3c2c92e..9a3ff09337d 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -435,7 +435,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } OC.Settings.Apps.hideErrorMessage(appId); - element.val(t('settings','Uninstalling ....')); + element.val(t('settings','Uninstalling …')); $.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app')); diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php index d87fa81729f..d0fc6378e9a 100644 --- a/settings/templates/admin/server.php +++ b/settings/templates/admin/server.php @@ -81,7 +81,7 @@ if (!$_['has_fileinfo']) { ?> <li> - <?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?> + <?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?> </li> <?php } |