From e477723da0bbf2cede83982eb4c88d943f74514b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 Dec 2017 17:55:15 +0100 Subject: [PATCH 1/3] no ...., expire time, or Github --- templates/public_share.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/public_share.php b/templates/public_share.php index 63c85712..0401bfe5 100644 --- a/templates/public_share.php +++ b/templates/public_share.php @@ -81,7 +81,7 @@ style('passman', 'public-page');
- t("Awwhh.... credential not found. Maybe it expired")); ?> + t("Awwhh… could not find the credential. Maybe it expired?")); ?>
@@ -161,7 +161,7 @@ style('passman', 'public-page');
- t("Expire time")); ?> + t("Expiration time")); ?> {{shared_credential.expire_time * 1000 | @@ -196,7 +196,7 @@ style('passman', 'public-page');
Github | GitHub | Wiki | Date: Sat, 7 Apr 2018 04:25:07 +0200 Subject: [PATCH 2/3] "expires:" --- templates/public_share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/public_share.php b/templates/public_share.php index 0401bfe5..ec234446 100644 --- a/templates/public_share.php +++ b/templates/public_share.php @@ -161,7 +161,7 @@ style('passman', 'public-page');
- t("Expiration time")); ?> + t("Expires:")); ?> {{shared_credential.expire_time * 1000 | From 65c14089093b94186554b51635358b474c956a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 7 Apr 2018 04:46:03 +0200 Subject: [PATCH 3/3] into vault, insufficient, unlabeled, "Share" --- controller/translationcontroller.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/controller/translationcontroller.php b/controller/translationcontroller.php index f6da073d..00311a01 100644 --- a/controller/translationcontroller.php +++ b/controller/translationcontroller.php @@ -57,7 +57,7 @@ class TranslationController extends ApiController { 'credential.updated' => $this->trans->t('Credential updated'), 'credential.recovered' => $this->trans->t('Credential recovered'), 'credential.destroyed' => $this->trans->t('Credential destroyed'), - 'error.loading.file.perm' => $this->trans->t('Error downloading file, you probably don\'t have sufficient permissions'), + 'error.loading.file.perm' => $this->trans->t('Error downloading file, you probably have insufficient permissions'), // js/app/controllers/edit_credential.js 'invalid.qr' => $this->trans->t('Invalid QR code'), @@ -68,10 +68,10 @@ class TranslationController extends ApiController { 'done' => $this->trans->t('Done'), // js/app/controllers/import.js - 'import.file.read' => $this->trans->t('File read successfully.'), + 'import.file.read' => $this->trans->t('File read.'), 'import.steps' => $this->trans->t('Proceed with the following steps to import your file'), - 'import.no.label' => $this->trans->t('Credential has no label, skipping'), + 'import.no.label' => $this->trans->t('Skipping unlabeled credential'), 'import.adding' => $this->trans->t('Adding {{credential}}'), 'import.added' => $this->trans->t('Added {{credential}}'), 'import.skipping' => $this->trans->t('Skipping credential, missing label on line {{line}}'), @@ -104,7 +104,7 @@ class TranslationController extends ApiController { 'settings.export' => $this->trans->t('Export credentials'), 'settings.sharing' => $this->trans->t('Sharing'), 'changepw.navigate.away.warning' => $this->trans->t('Are you sure you want to leave? This will destroy all your credentials'), - 'incorrect.password' => $this->trans->t('Your old password is incorrect!'), + 'incorrect.password' => $this->trans->t('Old password field incorrect!'), 'password.no.match' => $this->trans->t('New password does not match!'), 'login.new.pass' => $this->trans->t('Please log in with your new vault password'), @@ -208,7 +208,7 @@ class TranslationController extends ApiController { 'version' => $this->trans->t('Version'), 'donate.support' => $this->trans->t('Donate to support development'), 'bookmarklet' => $this->trans->t('Bookmarklet'), - 'bookmarklet.info1' => $this->trans->t('Save your passwords with 1 click!'), + 'bookmarklet.info1' => $this->trans->t('Save your passwords with one click.'), 'bookmarklet.info2' => $this->trans->t('Drag below button to your bookmark toolbar.'), 'delete.vault' => $this->trans->t('Delete vault'), 'vault.password' => $this->trans->t('Vault password'), @@ -236,7 +236,7 @@ class TranslationController extends ApiController { 'generating.keys' => $this->trans->t('Generating sharing keys'), // templates/views/partials/forms/settings/tool.html - 'tool.intro' => $this->trans->t('The password tool will scan your password, calculate the average crack time and list those which are below the threshold'), + 'tool.intro' => $this->trans->t('The password tool scans your password, calculates average cracking time, listing those below the threshold'), 'min.strength' => $this->trans->t('Minimum password stength'), 'scan.start' => $this->trans->t('Start scan'), 'scan.result.msg' => $this->trans->t('Result'), @@ -251,7 +251,7 @@ class TranslationController extends ApiController { 'uploading' => $this->trans->t('Uploading'), 'user' => $this->trans->t('User'), 'crypto.time' => $this->trans->t('Crypto time'), - 'crypto.total.time' => $this->trans->t('Total time spent cyphering'), + 'crypto.total.time' => $this->trans->t('Total time spent encrypting'), 'perm.read' => $this->trans->t('Read'), 'perm.write' => $this->trans->t('Write'), 'perm.files' => $this->trans->t('Files'), @@ -263,7 +263,7 @@ class TranslationController extends ApiController { 'enable.link.sharing' => $this->trans->t('Enable link sharing'), 'share.until.date' => $this->trans->t('Share until date'), 'expire.views' => $this->trans->t('Expire after views'), - 'click.share' => $this->trans->t('Click Share first'), + 'click.share' => $this->trans->t('Click \"Share\" first'), 'show.files' => $this->trans->t('Show files'), @@ -339,7 +339,7 @@ class TranslationController extends ApiController { 'use.regex' => $this->trans->t('Use regex'), 'sharereq.title' => $this->trans->t('You have incoming share requests.'), 'sharereq.line1' => $this->trans->t('If you want to put the credential in another vault,'), - 'sharereq.line2' => $this->trans->t('log out of this vault and log in to the vault you want the shared credential in.'), + 'sharereq.line2' => $this->trans->t('log out of this vault and log into the vault you want the shared credential in.'), 'permissions' => $this->trans->t('Permissions'), 'received.from' => $this->trans->t('Received from'), 'date' => $this->trans->t('Date'), @@ -359,7 +359,7 @@ class TranslationController extends ApiController { 'new.vault.name' => $this->trans->t('Please give your new vault a name.'), 'new.vault.pass' => $this->trans->t('Vault password'), 'new.vault.passr' => $this->trans->t('Repeat vault password'), - 'new.vault.sharing_key_notice' => $this->trans->t('Your sharing key\'s will have a strength of 1024 bit, which you can change in Settings later .'), + 'new.vault.sharing_key_notice' => $this->trans->t('Your sharing key\'s will have a strength of 1024 bit, which you can change in \"Settings\" later .'), 'new.vault.create' => $this->trans->t('Create vault'), 'go.back.vaults' => $this->trans->t('Go back to vaults'), 'input.vault.password' => $this->trans->t('Please input the password for'), @@ -384,7 +384,7 @@ class TranslationController extends ApiController { // templates/bookmarklet.php 'http.warning' => $this->trans->t('Warning! Adding credentials over HTTP is insecure!'), - 'bm.active.vault' => $this->trans->t('Logged in to {{vault_name}}'), + 'bm.active.vault' => $this->trans->t('Logged into {{vault_name}}'), 'change.vault' => $this->trans->t('Change vault'), // templates/main.php