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/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -293,6 +293,10 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "today",
+        "id": "relative_time.today"
+      },
      {
        "defaultMessage": "now",
        "id": "relative_time.just_now"
@@ -1742,6 +1746,14 @@
        "defaultMessage": "Home",
        "id": "column.home"
      },
+      {
+        "defaultMessage": "Show announcements",
+        "id": "home.show_announcements"
+      },
+      {
+        "defaultMessage": "Hide announcements",
+        "id": "home.hide_announcements"
+      },
      {
        "defaultMessage": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
        "id": "empty_column.home"