Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml

app/javascript/mastodon/locales/defaultMessages.json

@@ -92,6 +92,15 @@
     ],
     "path": "app/javascript/mastodon/components/column_header.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Unhide {domain}",
+        "id": "account.unblock_domain"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/domain.json"
+  },
   {
     "descriptors": [
       {
@@ -298,6 +307,19 @@
     ],
     "path": "app/javascript/mastodon/containers/account_container.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Hide entire domain",
+        "id": "confirmations.domain_block.confirm"
+      },
+      {
+        "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
+        "id": "confirmations.domain_block.message"
+      }
+    ],
+    "path": "app/javascript/mastodon/containers/domain_container.json"
+  },
   {
     "descriptors": [
       {
@@ -849,6 +871,19 @@
     ],
     "path": "app/javascript/mastodon/features/compose/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Hidden domains",
+        "id": "column.domain_blocks"
+      },
+      {
+        "defaultMessage": "Unhide {domain}",
+        "id": "account.unblock_domain"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/domain_blocks/index.json"
+  },
   {
     "descriptors": [
       {
@@ -930,6 +965,10 @@
         "defaultMessage": "Blocked users",
         "id": "navigation_bar.blocks"
       },
+      {
+        "defaultMessage": "Hidden domains",
+        "id": "navigation_bar.domain_blocks"
+      },
       {
         "defaultMessage": "Muted users",
         "id": "navigation_bar.mutes"