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'), 'error.loading.file' => $this->trans->t('Error loading file'),
// js/app/controllers/credential.js // 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.created' => $this->trans->t('Credential created!'),
'credential.deleted' => $this->trans->t('Credential deleted'), 'credential.deleted' => $this->trans->t('Credential deleted'),
'credential.updated' => $this->trans->t('Credential updated'), 'credential.updated' => $this->trans->t('Credential updated'),