Merge branch 'master' into glitch-soc/merge-upstream

4 files changed, 8 insertions, 2 deletions

diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
index e9465228d..57240a19e 100644
--- a/config/locales/activerecord.cs.yml
+++ b/config/locales/activerecord.cs.yml
@@ -2,8 +2,9 @@
 cs:
   activerecord:
     attributes:
-      status:
-        owned_poll: Anketa
+      poll:
+        expires_at: Uzávěrka
+        options: Volby
     errors:
       models:
         account:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index fa4a00cb5..2ec3f6790 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -249,6 +249,7 @@ cs:
       feature_profile_directory: Adresář profilů
       feature_registrations: Registrace
       feature_relay: Federovací most
+      feature_timeline_preview: Náhled časové osy
       features: Vlastnosti
       hidden_service: Federace se skrytými službami
       open_reports: otevřená hlášení
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:
diff --git a/config/routes.rb b/config/routes.rb
index 24e1f8e16..5a51cc6e8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -366,6 +366,7 @@ Rails.application.routes.draw do
         resources :followers, only: :index, controller: 'accounts/follower_accounts'
         resources :following, only: :index, controller: 'accounts/following_accounts'
         resources :lists, only: :index, controller: 'accounts/lists'
+        resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'
 
         member do
           post :follow