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

2020-01-13 13:14:35 +01:00
parent 7ab12b7654 3287ec8ca3
commit 83f8bf48d9
75 changed files with 311 additions and 245 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -1550,6 +1550,23 @@
    ],
    "path": "app/javascript/mastodon/features/following/index.json"
  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      },
+      {
+        "defaultMessage": "Previous",
+        "id": "lightbox.previous"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "lightbox.next"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/getting_started/components/announcements.json"
+  },
  {
    "descriptors": [
      {