From 120a168b91877994aaadf136a7aba6f100503eac Mon Sep 17 00:00:00 2001 From: brantje Date: Wed, 12 Jul 2017 19:48:51 +0200 Subject: Merge comradekingu-patch-2 and sign --- controller/translationcontroller.php | 70 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/controller/translationcontroller.php b/controller/translationcontroller.php index 7bb75162..6eac3266 100644 --- a/controller/translationcontroller.php +++ b/controller/translationcontroller.php @@ -46,18 +46,18 @@ class TranslationController extends ApiController { 'password.do.not.match' => $this->trans->t('Passwords do not match'), 'general' => $this->trans->t('General'), 'custom.fields' => $this->trans->t('Custom Fields'), - 'error.no.label' => $this->trans->t('Please fill in a label!'), - 'error.no.value' => $this->trans->t('Please fill in a value!'), + 'error.no.label' => $this->trans->t('Please fill in a label.'), + 'error.no.value' => $this->trans->t('Please fill in a value.'), 'error.loading.file' => $this->trans->t('Error loading file'), // js/app/controllers/credential.js - 'error.decrypt' => $this->trans->t('An error happened during decryption'), + 'error.decrypt' => $this->trans->t('An error occurred during decryption'), 'credential.created' => $this->trans->t('Credential created!'), 'credential.deleted' => $this->trans->t('Credential deleted'), '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 enough permissions'), + 'error.loading.file.perm' => $this->trans->t('Error downloading file, you probably don\'t have sufficient permissions'), // js/app/controllers/edit_credential.js 'invalid.qr' => $this->trans->t('Invalid QR code'), @@ -68,8 +68,8 @@ class TranslationController extends ApiController { 'done' => $this->trans->t('Done'), // js/app/controllers/import.js - 'import.file.read' => $this->trans->t('File read successfully!'), - 'import.steps' => $this->trans->t('Follow the following steps to import your file'), + 'import.file.read' => $this->trans->t('File read successfully.'), + '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.adding' => $this->trans->t('Adding {{credential}}'), @@ -83,9 +83,9 @@ class TranslationController extends ApiController { 'parsed.csv.rows' => $this->trans->t('Parsed {{rows}} lines from CSV file'), 'skip.first.row' => $this->trans->t('Skip first row'), 'import.csv.label.req' => $this->trans->t('You need to assign the label field before you can start the import.'), - 'first.five.lines' => $this->trans->t('First 5 lines of the CSV are shown.'), + 'first.five.lines' => $this->trans->t('The first 5 lines of the CSV are shown.'), 'assign.column' => $this->trans->t('Assign the proper fields to each column.'), - 'example.credential' => $this->trans->t('Example imported credential'), + 'example.credential' => $this->trans->t('Example of imported credential'), 'missing.importer' => $this->trans->t('Missing an importer? Try it with the generic CSV importer.'), 'missing.importer.back' => $this->trans->t('Go back to importers.'), @@ -95,18 +95,18 @@ class TranslationController extends ApiController { 'revision.restored' => $this->trans->t('Revision restored'), // js/app/controllers/settings.js - 'bookmarklet.text' => $this->trans->t('Save in passman'), + 'bookmarklet.text' => $this->trans->t('Save in Passman'), 'settings.saved' => $this->trans->t('Settings saved'), 'settings.general' => $this->trans->t('General settings'), - 'settings.audit' => $this->trans->t('Password Audit'), + 'settings.audit' => $this->trans->t('Password audit'), 'settings.password' => $this->trans->t('Password settings'), 'settings.import' => $this->trans->t('Import credentials'), '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 corrupt all your credentials'), + '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!'), - 'password.no.match' => $this->trans->t('New passwords do not match!'), - 'login.new.pass' => $this->trans->t('Please login with your new vault password'), + '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'), // js/app/controllers/share.js 'share.u.g' => $this->trans->t('Share with users and groups'), @@ -138,7 +138,7 @@ class TranslationController extends ApiController { // templates/views/partials/edit_credential/basics.html 'username' => $this->trans->t('Username'), 'password.r' => $this->trans->t('Repeat password'), - 'add.tag' => $this->trans->t('Add Tag'), + 'add.tag' => $this->trans->t('Add tag'), // templates/views/partials/edit_credential/custom_fields.html 'field.label' => $this->trans->t('Field label'), @@ -166,8 +166,8 @@ class TranslationController extends ApiController { // templates/views/partials/edit_credential/password.html - 'expire.date' => $this->trans->t('Expire date'), - 'no.expire.date' => $this->trans->t('No expire date set'), + 'expire.date' => $this->trans->t('Expiration date'), + 'no.expire.date' => $this->trans->t('No expiration date set'), 'renew.interval' => $this->trans->t('Renew interval'), 'disabled' => $this->trans->t('Disabled'), 'days' => $this->trans->t('Day(s)'), @@ -197,7 +197,7 @@ class TranslationController extends ApiController { 'change.vault.key' => $this->trans->t('Change vault key'), 'old.vault.password' => $this->trans->t('Old vault password'), 'new.vault.password' => $this->trans->t('New vault password'), - 'new.vault.pw.r' => $this->trans->t('New vault password repeat'), + 'new.vault.pw.r' => $this->trans->t('Repeat new vault password'), 'warning.leave' => $this->trans->t('Please wait your vault is being updated, do not leave this page.'), 'processing' => $this->trans->t('Processing'), 'total.progress' => $this->trans->t('Total progress'), @@ -211,7 +211,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'), @@ -242,7 +242,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 or groups...'), + 'search.u.g' => $this->trans->t('Search users or groups…'), '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'), @@ -260,7 +260,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'), @@ -314,9 +314,9 @@ class TranslationController extends ApiController { // templates/views/show_vault.html 'deleted.since' => $this->trans->t('Showing deleted since'), - 'alltime' => $this->trans->t('All time'), + 'alltime' => $this->trans->t('Beginning'), 'number.filtered' => $this->trans->t('Showing {{number_filtered}} of {{credential_number}} credentials'), - 'search.credential' => $this->trans->t('Search credential...'), + 'search.credential' => $this->trans->t('Search for credential…'), 'account' => $this->trans->t('Account'), 'password' => $this->trans->t('Password'), 'otp' => $this->trans->t('OTP'), @@ -324,7 +324,7 @@ class TranslationController extends ApiController { 'url' => $this->trans->t('URL'), 'notes' => $this->trans->t('Notes'), 'files' => $this->trans->t('Files'), - 'expire.time' => $this->trans->t('Expire time'), + 'expire.time' => $this->trans->t('Expiry time'), 'changed' => $this->trans->t('Changed'), 'created' => $this->trans->t('Created'), 'edit' => $this->trans->t('Edit'), @@ -335,8 +335,8 @@ class TranslationController extends ApiController { 'destroy' => $this->trans->t('Destroy'), '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 a other vault,'), - 'sharereq.line2' => $this->trans->t('logout of this vault and login to the vault you want the shared credential in.'), + '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.'), 'permissions' => $this->trans->t('Permissions'), 'received.from' => $this->trans->t('Received from'), 'date' => $this->trans->t('Date'), @@ -356,21 +356,21 @@ 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 later in settings.'), + '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'), - 'vault.default' => $this->trans->t('Set this vault as default.'), + '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('Logout 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 login.'), + 'req.intro1' => $this->trans->t('Seems you lost the vault password and you\'re unable to log in.'), 'req.intro2' => $this->trans->t('If you want this vault to be removed you can request that here.'), - 'req.intro3' => $this->trans->t('An admin then accepts to the request (or not)'), + 'req.intro3' => $this->trans->t('An admin then accepts or declines the request'), - 'request.deletion.warning' => $this->trans->t('After an admin destroys this vault, all credentials inside will be lost'), - 'request.deletion.reason' => $this->trans->t('Reason to request deletion (optional):'), + 'request.deletion.warning' => $this->trans->t('After an admin destroys this vault, all credentials in it will be lost'), + 'request.deletion.reason' => $this->trans->t('Reason for requesting deletion (optional):'), 'request.deletion' => $this->trans->t('Request vault destruction'), 'request.deletion.accept' => $this->trans->t('Yes, request an admin to destroy this vault'), 'cancel.request.deletion' => $this->trans->t('Cancel destruction request'), @@ -380,7 +380,7 @@ class TranslationController extends ApiController { // templates/bookmarklet.php - 'http.warning' => $this->trans->t('Warning! Adding credentials over http can be insecure!'), + 'http.warning' => $this->trans->t('Warning! Adding credentials over HTTP is insecure!'), 'bm.active.vault' => $this->trans->t('Logged in to {{vault_name}}'), 'change.vault' => $this->trans->t('Change vault'), @@ -392,8 +392,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('Awwhh… credential not found. Maybe it expired'), ); return new JSONResponse($translations); -- cgit v1.2.3