Merge remote-tracking branch 'upstream/master'

2017-06-27 20:46:13 +00:00
parent e6300de142 da42bfadb5
commit ddafde942c
91 changed files with 1274 additions and 751 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1151,6 +1151,23 @@
    ],
    "path": "app/javascript/mastodon/features/ui/components/onboarding_modal.json"
  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Additional comments",
+        "id": "report.placeholder"
+      },
+      {
+        "defaultMessage": "Submit",
+        "id": "report.submit"
+      },
+      {
+        "defaultMessage": "Report {target}",
+        "id": "report.target"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/report_modal.json"
+  },
  {
    "descriptors": [
      {