From 69141dca26f8a28d3aff63387b1c8d2bba7fdfa3 Mon Sep 17 00:00:00 2001
From: Alex Gessner <alex.gessner@gmail.com>
Date: Thu, 28 Mar 2019 13:01:09 -0400
Subject: squashed identity proof updates (#10375)

---
 config/locales/en.yml | 3 +++
 config/routes.rb      | 1 +
 2 files changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d91e89d95..64467be39 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -648,10 +648,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 194b4c09b..a98dbb700 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -354,6 +354,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
-- 
cgit 


From 1a7d1f4a42e4988713bad82db39f23e5e13a3bb2 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Thu, 28 Mar 2019 18:01:28 +0100
Subject: I18n: Update Czech translation (#10410)

---
 app/javascript/mastodon/locales/cs.json | 2 +-
 config/locales/activerecord.cs.yml      | 5 +++--
 config/locales/cs.yml                   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 1a776cf95..9115f5081 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -83,7 +83,7 @@
   "compose_form.spoiler.unmarked": "Text není skrytý",
   "compose_form.spoiler_placeholder": "Sem napište vaše varování",
   "confirmation_modal.cancel": "Zrušit",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
   "confirmations.block.message": "Jste si jistý/á, že chcete zablokovat uživatele {name}?",
   "confirmations.delete.confirm": "Smazat",
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í
-- 
cgit