Merge branch 'master' into glitch-soc/merge

Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
2018-05-11 18:12:42 +02:00
parent 34142ab29c 352bae8c3e
commit 45fce0e496
110 changed files with 1476 additions and 388 deletions
@@ -552,6 +552,10 @@
      {
        "defaultMessage": "Domain hidden",
        "id": "account.domain_blocked"
+      },
+      {
+        "defaultMessage": "Bot",
+        "id": "account.badges.bot"
      }
    ],
    "path": "app/javascript/mastodon/features/account/components/header.json"
@@ -815,7 +819,7 @@
        "id": "upload_form.description"
      },
      {
-        "defaultMessage": "Undo",
+        "defaultMessage": "Delete",
        "id": "upload_form.undo"
      },
      {
@@ -1866,4 +1870,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]