diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-20 20:13:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 20:13:22 +0100 |
| commit | bde9196b70299405ebe9b16500b7a3f65539b2c3 (patch) | |
| tree | 4bec904a28c70b916d18055f8291f17c2e58e07b /config/locales | |
| parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
| parent | 8b5b686f087f99d1a2b54e0760add8180d77fa7e (diff) | |
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 81059b163..7e1d92884 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -637,6 +637,21 @@ en: validation_errors: one: Something isn't quite right yet! Please review the error below other: Something isn't quite right yet! Please review %{count} errors below + identity_proofs: + active: Active + authorize: Yes, authorize + authorize_connection_prompt: Authorize this cryptographic connection? + errors: + failed: The cryptographic connection failed. Please try again from %{provider}. + 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. + 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 + status: Verification status + view_proof: View proof imports: modes: merge: Merge @@ -840,6 +855,7 @@ en: export: Data export featured_tags: Featured hashtags flavours: Flavours + identity_proofs: Identity proofs import: Import migrate: Account migration notifications: Notifications |