Merge branch 'Valdnet-patch-2' into next

This commit is contained in:
Marcos Zuriaga 2021-08-22 13:26:01 +02:00
commit 0298c6dfc1
No known key found for this signature in database
GPG key ID: 7D15585354D072FF
2 changed files with 9 additions and 9 deletions

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 ( %s / 2)','%step'),
'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'),
@ -145,7 +145,7 @@ class TranslationController extends ApiController {
'use.icon' => $this->trans->t('Use this icon'),
'use.icon.delete' => $this->trans->t('Delete current icon'),
'use.icon.refresh' => $this->trans->t('Get icon from page'),
'use.icon.refresh.trying' => $this->trans->t('This may take a few seconds…'),
'use.icon.refresh.trying' => $this->trans->t('This may take a few seconds …'),
'use.icon.refresh.error' => $this->trans->t('There was an error fetching the icon!'),
'selected.icon' => $this->trans->t('Selected icon'),
@ -220,7 +220,7 @@ class TranslationController extends ApiController {
'vault.password' => $this->trans->t('Vault password'),
'vault.remove.notice' => $this->trans->t('This process is irreversible'),
'delete.vault.checkbox' => $this->trans->t('Delete my precious passwords'),
'deleting.pw' => $this->trans->t('Deleting {{password}}…'),
'deleting.pw' => $this->trans->t('Deleting {{password}} …'),
'delete.vault.confirm' => $this->trans->t('Yes, delete my precious passwords'),
@ -251,7 +251,7 @@ class TranslationController extends ApiController {
'action' => $this->trans->t('Action'),
// templates/vieuws/partials/forms/share_credential/basics.html
'search.u.g' => $this->trans->t('Search users…'),
'search.u.g' => $this->trans->t('Search users …'),
'search.result.missing' => $this->trans->t('Missing users? Only users that have vaults are shown.'),
'cyphering' => $this->trans->t('Cyphering'),
'uploading' => $this->trans->t('Uploading'),
@ -325,7 +325,7 @@ class TranslationController extends ApiController {
'deleted.since' => $this->trans->t('Showing deleted since'),
'alltime' => $this->trans->t('Beginning'),
'number.filtered' => $this->trans->t('Showing {{number_filtered}} of {{credential_number}} credentials'),
'search.credential' => $this->trans->t('Search for credential…'),
'search.credential' => $this->trans->t('Search for credential …'),
'account' => $this->trans->t('Account'),
'password' => $this->trans->t('Password'),
'otp' => $this->trans->t('OTP'),
@ -381,7 +381,7 @@ class TranslationController extends ApiController {
'input.vault.password' => $this->trans->t('Please input the password for'),
'vault.default' => $this->trans->t('Set this vault as the default.'),
'vault.auto.login' => $this->trans->t('Log into this vault automatically.'),
'auto.logout' => $this->trans->t('Log out of this vault automatically after: '),
'auto.logout' => $this->trans->t('Log out of this vault automatically after:'),
'vault.decrypt' => $this->trans->t('Decrypt vault'),
'req.intro1' => $this->trans->t('Seems you lost the vault password and you\'re unable to log in.'),
@ -421,8 +421,8 @@ class TranslationController extends ApiController {
// templates/public_share.php
'share.page.text' => $this->trans->t('Someone has shared a credential with you.'),
'share.page.link' => $this->trans->t('Click here to request it'),
'share.page.link_loading' => $this->trans->t('Loading…'),
'expired.share' => $this->trans->t('Awwhh… credential not found. Maybe it expired'),
'share.page.link_loading' => $this->trans->t('Loading …'),
'expired.share' => $this->trans->t('Oops! Credential not found. Maybe it expired.'),
//compromised credentials
'compromised.label' => $this->trans->t('Mark as Compromised'),

View file

@ -82,7 +82,7 @@ style('passman', 'public-page');
</button>
</div>
<div ng-if="expired">
<?php p($l->t("Awwhh… could not find the credential. Maybe it expired?")); ?>
<?php p($l->t("Oops! Credential not found. Maybe it expired.")); ?>
</div>
<div ng-if="shared_credential">
<table class="table">