about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-03 10:27:07 +0100
committerGitHub <noreply@github.com>2020-02-03 10:27:07 +0100
commit94cdbc4982bde9709a633d26ff9a083dd9661258 (patch)
tree66a2d3ef757eb5f7ed7b57a7dc215e77c0a18e97 /config
parent4cd2d13bd226c005317adf9848f4c0316401b2ff (diff)
parent3dcb279da31bc7810b7f58991dad4f886aaade34 (diff)
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/simple_form.en.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f52f6eff6..dcfe5f1cc 100644
--- 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:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 2f0820906..ca105defa 100644
--- 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