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

Conflicts:
 	config/i18n-tasks.yml

config/i18n-tasks.yml

@@ -63,3 +63,4 @@ ignore_unused:
   - 'admin.accounts.roles.*'
   - 'admin.action_logs.actions.*'
   - 'themes.default'
+  - 'statuses.attached.*'

config/locales/en.yml

@@ -645,6 +645,15 @@ en:
     two_factor_authentication: Two-factor Auth
     your_apps: Your applications
   statuses:
+    attached:
+      description: 'Attached: %{attached}'
+      image:
+        one: "%{count} image"
+        other: "%{count} images"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    content_warning: 'Content warning: %{warning}'
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors: