Merge branch 'translation-issue'

This commit is contained in:
brantje 2016-12-29 13:06:16 +01:00
commit 2f24c04ad3
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -46,7 +46,7 @@ class TranslationController extends ApiController {
'error.loading.file' => $this->trans->t('Error loading file'),
// js/app/controllers/credential.js
'error.decrypt' => $this->trans->t('An error happend during decryption'),
'error.decrypt' => $this->trans->t('An error happened during decryption'),
'credential.created' => $this->trans->t('Credential created!'),
'credential.deleted' => $this->trans->t('Credential deleted'),
'credential.updated' => $this->trans->t('Credential updated'),
@ -318,7 +318,7 @@ class TranslationController extends ApiController {
'last.access' => $this->trans->t('Last accessed'),
'never' => $this->trans->t('Never'),
'no.vaults' => $this->trans->t('No vaults found, why not create one?'),
'min.vault.key.strength' => $this->trans->t('Password strength must be atleast: {{strength}}'),
'min.vault.key.strength' => $this->trans->t('Password strength must be at least: {{strength}}'),
'new.vault.name' => $this->trans->t('Please give your new vault a name.'),
'new.vault.pass' => $this->trans->t('Vault password'),
@ -350,4 +350,4 @@ class TranslationController extends ApiController {
);
return new JSONResponse($translations);
}
}
}