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

2020-05-28 13:44:57 +02:00
parent ead09f5ddc 57e5e65687
commit ef6bfaf12e
27 changed files with 337 additions and 367 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -217,7 +217,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Hide media",
+        "defaultMessage": "Hide {number, plural, one {image} other {images}}",
        "id": "media_gallery.toggle_visible"
      },
      {
@@ -2982,4 +2982,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]