diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index bd09f19705a732f2db57c1523ba7402cbfb1d1cb..6a34d39fe2c2ceffc09f223256d7a587a7f08c19 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "الإخطارات",
   "upload_area.title": "إسحب ثم أفلت للرفع",
   "upload_button.label": "إضافة وسائط",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "إلغاء",
   "upload_progress.label": "يرفع...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "وسّع الفيديو",
-  "video_player.toggle_sound": "تبديل الصوت",
-  "video_player.toggle_visible": "إظهار / إخفاء الفيديو",
-  "video_player.video_error": "تعذر تشغيل الفيديو"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index d391a57ba0798fd31d0d1fd5465b2baeac9b3a82..aaf99a5f1b3480c44b25288acc5dba022c1a11e3 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Известия",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Добави медия",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Отмяна",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Звук",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 286da3ac67706d5b9b4d50d1ac13016657ed01c4..2829656c8139b34a5006138215b3f280835a7f9c 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notificacions",
   "upload_area.title": "Arrossega i deixa anar per carregar",
   "upload_button.label": "Afegir multimèdia",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Desfer",
   "upload_progress.label": "Pujant...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Ampliar el vídeo",
-  "video_player.toggle_sound": "Alternar so",
-  "video_player.toggle_visible": "Alternar visibilitat",
-  "video_player.video_error": "El vídeo no es pot reproduir"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 9b340b71c1b1417d118437ac94678fccaa85a81f..88859e49db7daa52f8eb052f57aca0b6f997993e 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Mitteilungen",
   "upload_area.title": "Hereinziehen zum Hochladen",
   "upload_button.label": "Mediendatei hinzufügen",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Entfernen",
   "upload_progress.label": "Lade hoch …",
   "video.close": "Video schließen",
@@ -206,9 +207,5 @@
   "video.mute": "Stummschalten",
   "video.pause": "Pause",
   "video.play": "Abspielen",
-  "video.unmute": "Ton einschalten",
-  "video_player.expand": "Video vergrößern",
-  "video_player.toggle_sound": "Ton an/aus",
-  "video_player.toggle_visible": "Video zeigen/verbergen",
-  "video_player.video_error": "Video konnte nicht abgespielt werden"
+  "video.unmute": "Ton einschalten"
 }
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 86e1efaaf1f84df5076bfe7c38898c899d88e187..521fe9f20ca3dfe279d57ff9860e1bdcb853907c 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -227,39 +227,6 @@
     ],
     "path": "app/javascript/mastodon/components/status.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Toggle sound",
-        "id": "video_player.toggle_sound"
-      },
-      {
-        "defaultMessage": "Toggle visibility",
-        "id": "video_player.toggle_visible"
-      },
-      {
-        "defaultMessage": "Expand video",
-        "id": "video_player.expand"
-      },
-      {
-        "defaultMessage": "Sensitive content",
-        "id": "status.sensitive_warning"
-      },
-      {
-        "defaultMessage": "Click to view",
-        "id": "status.sensitive_toggle"
-      },
-      {
-        "defaultMessage": "Media hidden",
-        "id": "status.media_hidden"
-      },
-      {
-        "defaultMessage": "Video could not be played",
-        "id": "video_player.video_error"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/video_player.json"
-  },
   {
     "descriptors": [
       {
@@ -656,20 +623,24 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Undo",
-        "id": "upload_form.undo"
+        "defaultMessage": "Uploading...",
+        "id": "upload_progress.label"
       }
     ],
-    "path": "app/javascript/mastodon/features/compose/components/upload_form.json"
+    "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
   },
   {
     "descriptors": [
       {
-        "defaultMessage": "Uploading...",
-        "id": "upload_progress.label"
+        "defaultMessage": "Undo",
+        "id": "upload_form.undo"
+      },
+      {
+        "defaultMessage": "Describe for the visually impaired",
+        "id": "upload_form.description"
       }
     ],
-    "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
+    "path": "app/javascript/mastodon/features/compose/components/upload.json"
   },
   {
     "descriptors": [
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fc6aa4280fa6fb89c4b2c04641da10a3af84ff41..278f3309289ed5bc070e76f576d42f8f5d4bbc19 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifications",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Undo",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Toggle sound",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 21b92ed3a1a01173046cc6844bd4e5cb9c1167cd..ef185a5e1594eab8245f0602a80e2a9410cef370 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Sciigoj",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Aldoni enhavaĵon",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Malfari",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Aktivigi sonojn",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 59c7dc5a72e71742029297644927f1554bdde152..9dd22da95b65a1f53d284082c0d588b26bab0823 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notificaciones",
   "upload_area.title": "Arrastra y suelta para subir",
   "upload_button.label": "Subir multimedia",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Deshacer",
   "upload_progress.label": "Subiendo…",
   "video.close": "Cerrar video",
@@ -206,9 +207,5 @@
   "video.mute": "Silenciar sonido",
   "video.pause": "Pausar",
   "video.play": "Reproducir",
-  "video.unmute": "Dejar de silenciar sonido",
-  "video_player.expand": "Expandir vídeo",
-  "video_player.toggle_sound": "Activar/Desactivar sonido",
-  "video_player.toggle_visible": "Cambiar visibilidad",
-  "video_player.video_error": "No se pudo reproducir el vídeo"
+  "video.unmute": "Dejar de silenciar sonido"
 }
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6e4771392eb66abb50a200ab6cffcc512552410e..7b5709e735ddeaae7a5b1737f1da5d31c09380fa 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "اعلان‌ها",
   "upload_area.title": "برای بارگذاری به این‌جا بکشید",
   "upload_button.label": "افزودن تصویر",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "واگردانی",
   "upload_progress.label": "بارگذاری...",
   "video.close": "بستن ویدیو",
@@ -206,9 +207,5 @@
   "video.mute": "قطع صدا",
   "video.pause": "توقف",
   "video.play": "پخش",
-  "video.unmute": "پخش صدا",
-  "video_player.expand": "بازکردن ویدیو",
-  "video_player.toggle_sound": "تغییر صداداری",
-  "video_player.toggle_visible": "تغییر پیدایی",
-  "video_player.video_error": "ویدیو نمی‌تواند پخش شود"
+  "video.unmute": "پخش صدا"
 }
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index ccdf19dd65befc1f87c865f87278a2d577b33df3..6c01db06b9f619005b4e8869bca3a0e086f9de1e 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Ilmoitukset",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Lisää mediaa",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Peru",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Äänet päälle/pois",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 417c1062a1ea5d234e10c925af51141a184f574f..76ab68f6f64f4130ef1b1ecc4dec9d843248af7f 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifications",
   "upload_area.title": "Glissez et déposez pour envoyer",
   "upload_button.label": "Joindre un média",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Annuler",
   "upload_progress.label": "Envoi en cours…",
   "video.close": "Fermer la vidéo",
@@ -206,9 +207,5 @@
   "video.mute": "Couper le son",
   "video.pause": "Pause",
   "video.play": "Lecture",
-  "video.unmute": "Rétablir le son",
-  "video_player.expand": "Agrandir la vidéo",
-  "video_player.toggle_sound": "Activer/Désactiver le son",
-  "video_player.toggle_visible": "Afficher/Cacher la vidéo",
-  "video_player.video_error": "Erreur lors de la lecture de la vidéo"
+  "video.unmute": "Rétablir le son"
 }
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index f78c31a46444e8129d5dc432bbad242e0ff390bd..64246e8932cfb7e59ff3732cee22da04b6f9b06b 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "התראות",
   "upload_area.title": "ניתן להעלות על ידי Drag & drop",
   "upload_button.label": "הוספת מדיה",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "ביטול",
   "upload_progress.label": "עולה...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "הרחבת וידאו",
-  "video_player.toggle_sound": "הפעלת\\ביטול שמע",
-  "video_player.toggle_visible": "הפעלת\\ביטול תצוגה",
-  "video_player.video_error": "לא ניתן לנגן וידאו"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 43fe95eb8ebe155b4aaa456f47e019142edfb82d..39b5ede80d7d6aa5b5d388aba84dc9af2e100753 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifikacije",
   "upload_area.title": "Povuci i spusti kako bi uploadao",
   "upload_button.label": "Dodaj media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Poništi",
   "upload_progress.label": "Uploadam...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Proširi video",
-  "video_player.toggle_sound": "Toggle zvuk",
-  "video_player.toggle_visible": "Preklopi vidljivost",
-  "video_player.video_error": "Video ne može biti reproduciran"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index f73295dca276766af2dc73b6313e51be724f08a8..a52e0837c2da6bbd25856ce1d97f58fe2a198e19 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifications",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Média hozzáadása",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Mégsem",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Hang kapcsolása",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 4d5f0a5d8d5c72f7fb6354e7a08e18b504c20b75..ec4f7f3ecb26f8b8472dc34a54c0177181b2bc86 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifikasi",
   "upload_area.title": "Seret & lepaskan untuk mengunggah",
   "upload_button.label": "Tambahkan media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Undo",
   "upload_progress.label": "Mengunggah...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Tampilkan video",
-  "video_player.toggle_sound": "Suara",
-  "video_player.toggle_visible": "Tampilan",
-  "video_player.video_error": "Video tidak dapat diputar"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index d2c1ee73d66a1eccbad0986a3750ddcbfc4fd569..9df2177e912697608756c9a2f80b79ded5322b12 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Savigi",
   "upload_area.title": "Tranar faligar por kargar",
   "upload_button.label": "Adjuntar kontenajo",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Desfacar",
   "upload_progress.label": "Kargante...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Extensar video",
-  "video_player.toggle_sound": "Acendar sono",
-  "video_player.toggle_visible": "Chanjar videbleso",
-  "video_player.video_error": "Video ne povus pleesar"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 33f0e7fdce014ed8732252de17aca2064a1b932f..0eab2f225be20ee5ad2dd4f8fcd6fc0d079b4eff 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifiche",
   "upload_area.title": "Trascina per caricare",
   "upload_button.label": "Aggiungi file multimediale",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Annulla",
   "upload_progress.label": "Sto caricando...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Espandi video",
-  "video_player.toggle_sound": "Attiva suono",
-  "video_player.toggle_visible": "Attiva visibilità",
-  "video_player.video_error": "Il video non può essere riprodotto"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c3d96baf37ad827e036585e402f4f3d33d7c1520..37bc8356a70374459c4d9854c165656ce9bece39 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "通知",
   "upload_area.title": "ドラッグ＆ドロップでアップロード",
   "upload_button.label": "メディアを追加",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "やり直す",
   "upload_progress.label": "アップロード中...",
   "video.close": "動画を閉じる",
@@ -206,9 +207,5 @@
   "video.mute": "ミュート",
   "video.pause": "一時停止",
   "video.play": "再生",
-  "video.unmute": "ミュートを解除する",
-  "video_player.expand": "動画の詳細",
-  "video_player.toggle_sound": "音の切り替え",
-  "video_player.toggle_visible": "表示切り替え",
-  "video_player.video_error": "動画の再生に失敗しました"
+  "video.unmute": "ミュートを解除する"
 }
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index c50bb2f340440f2d9a56ff59fd4e0b1393566373..e593721d48290f3dccffcfb54ed6fcb7e0968888 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "알림",
   "upload_area.title": "드래그 & 드롭으로 업로드",
   "upload_button.label": "미디어 추가",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "재시도",
   "upload_progress.label": "업로드 중...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "동영상 자세히 보기",
-  "video_player.toggle_sound": "소리 토글하기",
-  "video_player.toggle_visible": "표시 전환",
-  "video_player.video_error": "동영상 재생에 실패했습니다"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index c333bec706559d0ed970ba1fb2b595e7144890a9..e223b4a3e6b612d05ca5556b7fcb1349be88ba12 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Meldingen",
   "upload_area.title": "Hierin slepen om te uploaden",
   "upload_button.label": "Media toevoegen",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Ongedaan maken",
   "upload_progress.label": "Uploaden...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Geluid uitschakelen",
   "video.pause": "Pauze",
   "video.play": "Afspelen",
-  "video.unmute": "Geluid inschakelen",
-  "video_player.expand": "Video groter maken",
-  "video_player.toggle_sound": "Geluid in-/uitschakelen",
-  "video_player.toggle_visible": "Video wel/niet tonen",
-  "video_player.video_error": "Video kon niet afgespeeld worden"
+  "video.unmute": "Geluid inschakelen"
 }
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index d28190faf7398ccd8c0c0326604c25aa787e4a33..0ad9919278e563a5b9413aba0bd5e1b816ff5e87 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Varslinger",
   "upload_area.title": "Dra og slipp for å laste opp",
   "upload_button.label": "Legg til media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Angre",
   "upload_progress.label": "Laster opp...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Utvid video",
-  "video_player.toggle_sound": "Veksle lyd",
-  "video_player.toggle_visible": "Veksle synlighet",
-  "video_player.video_error": "Video kunne ikke spilles av"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 8e9d06642a083d05cf5a95bb5a45740511344ed9..1ad7bf59204e60c76689abb43c9f18a24b1087fa 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notificacions",
   "upload_area.title": "Lisatz e depausatz per mandar",
   "upload_button.label": "Ajustar un mèdia",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Anullar",
   "upload_progress.label": "Mandadís…",
   "video.close": "Tampar la vidèo",
@@ -206,9 +207,5 @@
   "video.mute": "Copar lo son",
   "video.pause": "Pausa",
   "video.play": "Lectura",
-  "video.unmute": "Restablir lo son",
-  "video_player.expand": "Mostrar la vidèo",
-  "video_player.toggle_sound": "Activar/Desactivar lo son",
-  "video_player.toggle_visible": "Mostrar/Rescondre la vidèo",
-  "video_player.video_error": "Fracàs de la lectura de la vidèo"
+  "video.unmute": "Restablir lo son"
 }
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35b1a31010b4ecc844ce65555b753b9ee6e81bc1..bca22d09ddd7aff84bc648c66ae67e9dfe5ba5f0 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Powiadomienia",
   "upload_area.title": "Przeciągnij i upuść aby wysłać",
   "upload_button.label": "Dodaj zawartość multimedialną",
+  "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
   "upload_form.undo": "Cofnij",
   "upload_progress.label": "Wysyłanie",
   "video.close": "Zamknij film",
@@ -206,9 +207,5 @@
   "video.mute": "Wycisz",
   "video.pause": "Pauzuj",
   "video.play": "Odtwórz",
-  "video.unmute": "Cofnij wyciszenie",
-  "video_player.expand": "Rozszerz film",
-  "video_player.toggle_sound": "Przełącz dźwięk",
-  "video_player.toggle_visible": "Przełącz widoczność",
-  "video_player.video_error": "Nie można odtworzyć pliku wideo"
+  "video.unmute": "Cofnij wyciszenie"
 }
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 187343e83f7b1aa91192da9e69b0d291b9a14b2d..80917393f5653100d4a600e7e66b70b0ad5979a2 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notificações",
   "upload_area.title": "Arraste e solte para enviar",
   "upload_button.label": "Adicionar mídia",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Anular",
   "upload_progress.label": "Salvando...",
   "video.close": "Fechar vídeo",
@@ -206,9 +207,5 @@
   "video.mute": "Silenciar vídeo",
   "video.pause": "Parar",
   "video.play": "Reproduzir",
-  "video.unmute": "Retirar silêncio",
-  "video_player.expand": "Expandir vídeo",
-  "video_player.toggle_sound": "Ligar/Desligar som",
-  "video_player.toggle_visible": "Ligar/Desligar vídeo",
-  "video_player.video_error": "Não é possível ver o vídeo"
+  "video.unmute": "Retirar silêncio"
 }
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 782aaf114330d31c326762ef40bfaaa380c3cc50..9f9da9f1ea7038f7ec8ffdb6406b7974a3d00782 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notificações",
   "upload_area.title": "Arraste e solte para enviar",
   "upload_button.label": "Adicionar media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Anular",
   "upload_progress.label": "A gravar...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expandir vídeo",
-  "video_player.toggle_sound": "Ligar/Desligar som",
-  "video_player.toggle_visible": "Ligar/Desligar vídeo",
-  "video_player.video_error": "Não é possível ver o vídeo"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 6f39d098c2bdfae1775f0aa0b7a429402be81c84..59491c62d4ff39b363daf2095ca8e14aa5a573f8 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Уведомления",
   "upload_area.title": "Перетащите сюда, чтобы загрузить",
   "upload_button.label": "Добавить медиаконтент",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Отменить",
   "upload_progress.label": "Загрузка...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Развернуть видео",
-  "video_player.toggle_sound": "Вкл./выкл. звук",
-  "video_player.toggle_visible": "Показать/скрыть",
-  "video_player.video_error": "Видео не может быть проиграно"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index ecc7a00db75aecdfc237e22a35e9ad3f168d90a5..ff39b1b941eadf0993a31d7477f454baafbc9cb5 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Notifications",
   "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add media",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Undo",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Expand video",
-  "video_player.toggle_sound": "Toggle sound",
-  "video_player.toggle_visible": "Toggle visibility",
-  "video_player.video_error": "Video could not be played"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index b7ecd2cdb40aede6c3b1745aa692ada919953e2a..e485396836af536b02cdc86e117a48cca1687a58 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Bildirimler",
   "upload_area.title": "Upload için sürükle bırak yapınız",
   "upload_button.label": "Görsel ekle",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Geri al",
   "upload_progress.label": "Yükleniyor...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Videoyu geniÅŸlet",
-  "video_player.toggle_sound": "Sesi aç/kapa",
-  "video_player.toggle_visible": "Göster/gizle",
-  "video_player.video_error": "Video oynatılamadı"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 45b2c2ee010686c252a69f2325e6868e7eebacce..b72ea5b3786b181ab006d478b52736b53d2d734c 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "Сповіщення",
   "upload_area.title": "Перетягніть сюди, щоб завантажити",
   "upload_button.label": "Додати медіаконтент",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "Відмінити",
   "upload_progress.label": "Завантаження...",
   "video.close": "Close video",
@@ -206,9 +207,5 @@
   "video.mute": "Mute sound",
   "video.pause": "Pause",
   "video.play": "Play",
-  "video.unmute": "Unmute sound",
-  "video_player.expand": "Розгорнути ",
-  "video_player.toggle_sound": "Увімкнути/вимкнути звук",
-  "video_player.toggle_visible": "Показати/приховати",
-  "video_player.video_error": "Відео не може бути відтворено"
+  "video.unmute": "Unmute sound"
 }
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 58e3d678033850c5960425d7d9992fadb494c9f9..595eec30b74407db6c278419272600eaa98e6ca2 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "通知",
   "upload_area.title": "将文件拖放至此上传",
   "upload_button.label": "上传媒体文件",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "还原",
   "upload_progress.label": "上传中……",
   "video.close": "关闭影片",
@@ -206,9 +207,5 @@
   "video.mute": "静音",
   "video.pause": "暂停",
   "video.play": "播放",
-  "video.unmute": "解除静音",
-  "video_player.expand": "展开影片",
-  "video_player.toggle_sound": "开关音效",
-  "video_player.toggle_visible": "打开或关上",
-  "video_player.video_error": "视频无法播放啦……"
+  "video.unmute": "解除静音"
 }
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 610aa6dafa0f89ad316282830ed4532f9d4dd54e..4fbfe7a8f0d182289f54c9685d78182c9822e4a1 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "通知",
   "upload_area.title": "將檔案拖放至此上載",
   "upload_button.label": "上載媒體檔案",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "還原",
   "upload_progress.label": "上載中……",
   "video.close": "關閉影片",
@@ -206,9 +207,5 @@
   "video.mute": "靜音",
   "video.pause": "暫停",
   "video.play": "播放",
-  "video.unmute": "解除靜音",
-  "video_player.expand": "展開影片",
-  "video_player.toggle_sound": "開關音效",
-  "video_player.toggle_visible": "打開或關上",
-  "video_player.video_error": "無法播放影片"
+  "video.unmute": "解除靜音"
 }
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index ad2f1a05ab73de0a3414aa8ee0a19135d990f212..11db0ea1419721316656c5ed93e3a606d38619c6 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -196,6 +196,7 @@
   "tabs_bar.notifications": "通知",
   "upload_area.title": "拖放來上傳",
   "upload_button.label": "增加媒體",
+  "upload_form.description": "Describe for the visually impaired",
   "upload_form.undo": "復原",
   "upload_progress.label": "上傳中...",
   "video.close": "關閉影片",
@@ -206,9 +207,5 @@
   "video.mute": "消音",
   "video.pause": "暫停",
   "video.play": "播放",
-  "video.unmute": "解除消音",
-  "video_player.expand": "展開影片",
-  "video_player.toggle_sound": "切換音效",
-  "video_player.toggle_visible": "切換可見性",
-  "video_player.video_error": "無法播放這影片"
+  "video.unmute": "解除消音"
 }
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f528831230b344b974577db399a8e8147ad24345..d49ecfbe6973b5bdb0a230018c11c59609cfb39a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -394,6 +394,12 @@ pl:
     next: Następna
     prev: Poprzednia
     truncate: "…"
+  preferences:
+    languages: Języki
+    notifications: Powiadomienia
+    other: Pozostałe
+    publishing: Publikowanie
+    web: Sieć
   push_notifications:
     favourite:
       title: "%{name} dodał Twój status do ulubionych"
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index d5de2dcd365c52923ac496db21b4c71b18420c6b..e5d40897304f1cd987532cc8e5b6bdd845f0c408 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -4,6 +4,7 @@ pl:
     hints:
       defaults:
         avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 120x120px
+        digest: Wysyłane po długiej nieaktywności, zawiera podsumowanie wspomnień o Twoich profilu
         display_name:
           few: Pozostały <span class="name-counter">%{count}</span> znaki.
           many: Pozostało <span class="name-counter">%{count}</span> znaków
@@ -23,7 +24,7 @@ pl:
       sessions:
         otp: Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych
       user:
-        filtered_languages: Wpisy w wybranych językach nie będą pojawiać się na publicznych osiach czasu.
+        filtered_languages: Wpisy w wybranych językach nie będą wyświetlać się na publicznych osiach czasu.
     labels:
       defaults:
         avatar: Awatar