diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-13 23:46:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 23:46:09 +0200 |
| commit | e1d282023432ff4a88cb795f3a9889704314e448 (patch) | |
| tree | 89f9525142d0bf876a4fb6e0117163c0a76bb78a /config/locales | |
| parent | c6ff4c634caf718adf7280e04909c091d15add1d (diff) | |
| parent | d147dd7588502f22ac825780bb1d6e54eb3613e6 (diff) | |
Merge pull request #1327 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index edb7bb684..9d0e2e092 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -858,12 +858,14 @@ en: invalid_token: Keybase tokens are hashes of signatures and must be 66 hex characters verification_failed: Keybase does not recognize this token as a signature of Keybase user %{kb_username}. Please retry from Keybase. wrong_user: Cannot create a proof for %{proving} while logged in as %{current}. Log in as %{proving} and try again. - explanation_html: Here you can cryptographically connect your other identities, such as a Keybase profile. This lets other people send you encrypted messages and trust content you send them. + explanation_html: Here you can cryptographically connect your other identities from other platforms, such as Keybase. This lets other people send you encrypted messages on those platforms and allows them to trust that the content you send them comes from you. i_am_html: I am %{username} on %{service}. identity: Identity inactive: Inactive publicize_checkbox: 'And toot this:' publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}' + remove: Remove proof from account + removed: Successfully removed proof from account status: Verification status view_proof: View proof imports: @@ -918,7 +920,7 @@ en: cancelled_msg: Successfully cancelled the redirect. errors: already_moved: is the same account you have already moved to - missing_also_known_as: is not back-referencing this account + missing_also_known_as: is not an alias of this account move_to_self: cannot be current account not_found: could not be found on_cooldown: You are on cooldown |