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

2020-02-03 09:22:58 +01:00
parent 4cd2d13bd2 3adc722d1c
commit 369201a425
23 changed files with 179 additions and 52 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1103,6 +1103,7 @@ en:
        other: "%{count} votes"
      vote: Vote
    show_more: Show more
+    show_thread: Show thread
    sign_in_to_participate: Sign in to participate in the conversation
    title: '%{name}: "%{quote}"'
    visibilities:
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -98,7 +98,7 @@ en:
        all_day: All-day event
        ends_at: End of event
        scheduled_at: Schedule publication
-        starts_at: Begin of event
+        starts_at: Start of event
        text: Announcement
      defaults:
        autofollow: Invite to follow your account