diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 18:45:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 18:45:28 +0100 |
| commit | fad29fd23052cdf3d51a6e0eb03557554572d402 (patch) | |
| tree | 4ba415e02d601654867889da11391b509909635d /config/locales/en.yml | |
| parent | bb316faffff7a76bc89f7e942233f0e14caf60f5 (diff) | |
| parent | ce7d055d3cc7927a597c8bb56b45f8e0aae91319 (diff) | |
Merge pull request #973 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 252f8a8c5..682f85406 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -652,10 +652,13 @@ en: keybase: 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. 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}' status: Verification status view_proof: View proof imports: |