diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 23:41:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 23:41:01 +0100 |
| commit | 4aec8087c71a623abdf201bbc2619507a6b02374 (patch) | |
| tree | 931f4c972e55ec032f3f5f6b58621d0380a92a5e /config/locales | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | ca5d78816bb31454de28480dec5c6384ed259eef (diff) | |
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index c98b82801..1aa96ba0f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -985,26 +985,6 @@ en: other: Something isn't quite right yet! Please review %{count} errors below html_validator: invalid_markup: 'contains invalid HTML markup: %{error}' - 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. - 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 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: errors: over_rows_processing_limit: contains more than %{count} rows @@ -1279,7 +1259,6 @@ en: edit_profile: Edit profile export: Data export featured_tags: Featured hashtags - identity_proofs: Identity proofs import: Import import_and_export: Import and export migrate: Account migration |