Merge branch 'fix238' of https://github.com/OS3DrNick/passman into OS3DrNick-fix238

This commit is contained in:
brantje 2017-10-26 18:49:29 +02:00
commit 74b5c856cd
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -41,7 +41,7 @@ class TranslationController extends ApiController {
public function getLanguageStrings() {
$translations = array(
// js/app/controllers/bookmarklet.js
'generating.sharing.keys' => $this->trans->t('Generating sharing keys ( %step / 2)'),
'generating.sharing.keys' => $this->trans->t('Generating sharing keys ( %s / 2)','%step'),
'invalid.vault.key' => $this->trans->t('Incorrect vault password!'),
'password.do.not.match' => $this->trans->t('Passwords do not match'),
'general' => $this->trans->t('General'),