diff --git a/src/config/locales/cs/translation.json b/src/config/locales/cs/translation.json
index 8b20f37d..b3289cd8 100644
--- a/src/config/locales/cs/translation.json
+++ b/src/config/locales/cs/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Místní časová osa",
-    "public": "Veřejná časová osa",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Vyhledat",
     "lists": "Seznamy"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Přidat anketu",
-        "change_visibility": "Změnit viditelnost",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minut",
-          "30_minutes": "30 minut",
-          "1_hour": "1 hodina",
-          "6_hours": "6 hodin",
-          "1_day": "1 den",
-          "3_days": "3 dny",
-          "7_days": "7 dnů"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Přejít na..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/de/translation.json b/src/config/locales/de/translation.json
index f3051497..6a75f4a3 100644
--- a/src/config/locales/de/translation.json
+++ b/src/config/locales/de/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Lokale Timeline",
-    "public": "Öffenliche Timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Suche",
     "lists": "Listen"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Lokale Timeline",
-    "public": "Öffenliche Timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Suche",
     "lists": "Listen",
     "members": "Mitglieder",
-    "option": {
-      "title": "Einstellungen",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Antworten anzeigen",
-      "apply": "Übernehmen"
-    },
-    "new_toot": "Publish",
-    "reload": "Neu laden",
-    "settings": "Einstellungen"
+    "reload": "Neu laden"
   },
   "settings": {
     "title": "Einstellungen",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Zeitleiste",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Ungelesene Benachrichtigungen für jede Zeitleiste anpassen.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Lade die Zeitleiste von der letzten Lese-Position",
         "home": "Start",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Schreibe hier deine Warnung",
-      "status": "What's on your mind?",
-      "cancel": "Abbrechen",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Verwerfen",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Bilder hinzufügen",
-        "poll": "Eine Umfrage erstellen",
-        "change_visibility": "Sichtbarkeit ändern",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 Minuten",
-          "30_minutes": "30 Minuten",
-          "1_hour": "1 Stunde",
-          "6_hours": "6 Stunde",
-          "1_day": "1 Tag",
-          "3_days": "3 Tage",
-          "7_days": "7 Tage"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Springe zu..."
     },
@@ -331,13 +285,10 @@
       "title": "Tastenkürzel",
       "ctrl_number": "Wechsel zu einem anderen Konto",
       "ctrl_k": "Zu anderen Zeitleisten springen",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Wechsle den Fokus auf die linken Spalte",
-      "l": "Wechsle den Fokus auf die rechte Spalte",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Domainname wird benötigt",
       "domain_format": "Bitte gib nur den Domainnamen an"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "Du kannst maximal {{max}} Bilder anhängen",
-      "attach_length_plural": "Du kannst maximal {{max}} Bilder anhängen",
-      "attach_image": "Du kannst nur Bilder oder Videos anhängen",
-      "poll_invalid": "Ungültige Umfragen-Auswahl"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/es_es/translation.json b/src/config/locales/es_es/translation.json
index bec1eaba..2b6a809d 100644
--- a/src/config/locales/es_es/translation.json
+++ b/src/config/locales/es_es/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Línea de tiempo local",
-    "public": "Línea de tiempo pública",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Buscar",
     "lists": "Listas"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Línea de tiempo local",
-    "public": "Línea de tiempo pública",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Buscar",
     "lists": "Listas",
     "members": "Miembros",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Recargar",
-    "settings": "Configuración"
+    "reload": "Recargar"
   },
   "settings": {
     "title": "Configuración",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Línea de tiempo",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Personalizar notificaciones no leídas para cada línea de tiempo.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Escribe tu advertencia aquí",
-      "status": "What's on your mind?",
-      "cancel": "Cancelar",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Añadir imágenes",
-        "poll": "Añadir una encuesta",
-        "change_visibility": "Cambiar visibilidad",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutos",
-          "30_minutes": "30 minutos",
-          "1_hour": "1 hora",
-          "6_hours": "6 horas",
-          "1_day": "1 día",
-          "3_days": "3 días",
-          "7_days": "7 días"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Ir a..."
     },
@@ -331,13 +285,10 @@
       "title": "Atajos del teclado",
       "ctrl_number": "Cambiar de cuenta",
       "ctrl_k": "Ir a otras líneas de tiempo",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Cambiar el foco a la columna izquierda",
-      "l": "Cambiar el foco a la columna derecha",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Se requiere un nombre de dominio",
       "domain_format": "Por favor, introduzca sólo el nombre de dominio"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
-      "attach_image": "Sólo puede adjuntar imágenes o vídeos",
-      "poll_invalid": "Opciones de encuestas inválidas"
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/eu/translation.json b/src/config/locales/eu/translation.json
index 5ee363e0..2d8de989 100644
--- a/src/config/locales/eu/translation.json
+++ b/src/config/locales/eu/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Gogokoak",
     "bookmark": "Laster-markak",
     "local": "Denbora-lerro lokala",
-    "public": "Denbora-lerro publikoa",
+    "public": "Federated timeline",
     "hashtag": "Traolak",
     "search": "Bilaketa",
     "lists": "Zerrendak"
@@ -68,20 +68,12 @@
     "follow_requests": "Jarraipen-eskaerak",
     "direct_messages": "Mezu zuzenak",
     "local": "Denbora-lerro lokala",
-    "public": "Denbora-lerro publikoa",
+    "public": "Federated timeline",
     "hashtag": "Traolak",
     "search": "Bilaketa",
     "lists": "Zerrendak",
     "members": "Kideak",
-    "option": {
-      "title": "Aukerak",
-      "show_reblogs": "Erakutsi bultzadak",
-      "show_replies": "Erakutsi erantzunak",
-      "apply": "Ezarri"
-    },
-    "new_toot": "Argitaratu",
-    "reload": "Birkargatu",
-    "settings": "Ezarpenak"
+    "reload": "Birkargatu"
   },
   "settings": {
     "title": "Ezarpenak",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Denbora-lerroa",
-      "unread_notification": {
-        "title": "Irakurri gabeko jakinarazpenak",
-        "description": "Pertsonalizatu irakurri gabeko jakinarazpenak denbora-lerro bakoitzarentzat.",
-        "direct": "Mezu zuzenak",
-        "local": "Denbora-lerro lokala",
-        "public": "Denbora-lerro publikoa"
-      },
       "use_marker": {
         "title": "Kargatu denbora-lerroa irakurritako azken kokapenetik",
         "home": "Hasiera",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "Bidalketa berria",
-      "cw": "Idatzi abisua hemen",
-      "status": "Zer duzu buruan?",
-      "cancel": "Utzi",
-      "toot": "Argitaratu",
-      "close_confirm": "Ziur zaude bidalketa hau baztertu nahi duzula?",
-      "close_confirm_ok": "Bai, baztertu",
-      "close_confirm_cancel": "Ez, jarraitu editatzen",
-      "description": "Gehitu multimedia honen deskribapena",
-      "footer": {
-        "add_image": "Gehitu irudiak",
-        "poll": "Gehitu inkesta",
-        "change_visibility": "Aldatu ikusgaitasuna",
-        "change_sensitive": "Markatu multimedia hunkigarri gisa",
-        "add_cw": "Gehitu edukiari buruzko oharra",
-        "pined_hashtag": "Finkatutako traola"
-      },
-      "poll": {
-        "add_choice": "Gehitu aukera bat",
-        "expires": {
-          "5_minutes": "5 minutu",
-          "30_minutes": "30 minutu",
-          "1_hour": "Ordubete",
-          "6_hours": "6 ordu",
-          "1_day": "Egun 1",
-          "3_days": "3 egun",
-          "7_days": "7 egun"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Joan hona…"
     },
@@ -331,13 +285,10 @@
       "title": "Teklatuaren lasterbideak",
       "ctrl_number": "Aldatu kontuak",
       "ctrl_k": "Egin jauzi beste denbora-lerro batzuetara",
-      "ctrl_n": "Ireki bidalketa berria idazteko leihoa",
-      "ctrl_enter": "Argitaratu bidalketa",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Freskatu oraingo denbora-lerroa",
       "j": "Hautatu hurrengo bidalketa",
       "k": "Hautatu aurreko bidalketa",
-      "h": "Aldatu fokua ezkerreko zutabera",
-      "l": "Aldatu fokua eskumako zutabera",
       "r": "Erantzun hautatutako bidalketari",
       "b": "Bultzatu hautatutako bidalketa",
       "f": "Egin gogoko hautatutako bidalketa",
@@ -509,12 +460,12 @@
       "require_domain_name": "Domeinuaren izena ezinbestekoa da",
       "domain_format": "Sartu domeinuaren izena soilik"
     },
-    "new_toot": {
-      "toot_length": "Bidalketaren luzera {{min}} eta {{max}} artekoa izan behar da",
-      "attach_length": "Irudi bakar {{max}} erantsi dezakezu",
-      "attach_length_plural": "{{max}} irudi soilik erantsi ditzakezu",
-      "attach_image": "Irudiak edo bideoak soilik erantsi ditzakezu",
-      "poll_invalid": "Inkestaren aukerek ez dute balio"
+    "compose": {
+      "toot_length": "Post length should be between {{min}} and {{max}}",
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Inkesta amaitu da",
       "body": "{{username}}(r)en inkesta amaitu da"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/fa/translation.json b/src/config/locales/fa/translation.json
index ef520396..7c2933ac 100644
--- a/src/config/locales/fa/translation.json
+++ b/src/config/locales/fa/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/fr/translation.json b/src/config/locales/fr/translation.json
index 92b3d312..3b7bd8c9 100644
--- a/src/config/locales/fr/translation.json
+++ b/src/config/locales/fr/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Fil public local",
-    "public": "Fil public global",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Rechercher",
     "lists": "Listes"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Fil public local",
-    "public": "Fil public global",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Rechercher",
     "lists": "Listes",
     "members": "Membres",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Recharger",
-    "settings": "Paramètres"
+    "reload": "Recharger"
   },
   "settings": {
     "title": "Paramètres",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Fil d'actualité",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Personnalisez les notifications non lues pour chaque fil d'actualité.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Écrivez votre avertissement ici",
-      "status": "What's on your mind?",
-      "cancel": "Annuler",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Ajouter une image",
-        "poll": "Créer un sondage",
-        "change_visibility": "Changer la visibilité",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 heure",
-          "6_hours": "6 heures",
-          "1_day": "1 jour",
-          "3_days": "3 jours",
-          "7_days": "7 jours"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Aller à..."
     },
@@ -331,13 +285,10 @@
       "title": "Raccourcis clavier",
       "ctrl_number": "Changer de compte",
       "ctrl_k": "Aller aux autres fils",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Changer le focus sur la colonne de gauche",
-      "l": "Changer le focus sur la colonne de droite",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Un nom de domaine est requis",
       "domain_format": "Veuillez uniquement indiquer le nom de domaine"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
-      "attach_image": "Vous ne pouvez attacher que des images ou des vidéos",
-      "poll_invalid": "Choix de sondage invalides"
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/gd/translation.json b/src/config/locales/gd/translation.json
index 7746d1d8..48b8e9e1 100644
--- a/src/config/locales/gd/translation.json
+++ b/src/config/locales/gd/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Loidhne-ama ionadail",
-    "public": "Loidhne-ama phoblach",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Lorg",
     "lists": "Liostaichean"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Loidhne-ama ionadail",
-    "public": "Loidhne-ama phoblach",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Lorg",
     "lists": "Liostaichean",
     "members": "Buill",
-    "option": {
-      "title": "Roghainnean",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Seall na freagairtean",
-      "apply": "Cuir an sàs"
-    },
-    "new_toot": "Publish",
-    "reload": "Ath-luchdaich",
-    "settings": "Roghainnean"
+    "reload": "Ath-luchdaich"
   },
   "settings": {
     "title": "Roghainnean",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Loidhne-ama",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Gnàthaich na brathan nach deach a leughadh do gach loidhne-ama.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Luchdaich an loidhne-ama on ionad-leughaidh mu dheireadh",
         "home": "Dachaigh",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Sgrìobh an rabhadh agad an-seo",
-      "status": "What's on your mind?",
-      "cancel": "Sguir dheth",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Tilg air falbh",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Cuir dealbhan ris",
-        "poll": "Cuir cunntas-bheachd ris",
-        "change_visibility": "Atharraich an fhaicsinneachd",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 mionaidean",
-          "30_minutes": "Leth-uair a thìde",
-          "1_hour": "Uair a thìde",
-          "6_hours": "6 uairean a thìde",
-          "1_day": "Latha",
-          "3_days": "3 làithean",
-          "7_days": "Seachdain"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Leum gu…"
     },
@@ -331,13 +285,10 @@
       "title": "Ath-ghoiridean a’ mheur-chlàir",
       "ctrl_number": "Thoir leum gu cunntas eile",
       "ctrl_k": "Thoir leum gu loidhne-ama eile",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Cuir am fòcas air a’ cholbh taobh clì",
-      "l": "Cuir am fòcas air a’ cholbh taobh deas",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Tha feum air ainm àrainne",
       "domain_format": "Na cuir a-steach ach ainm na h-àrainne"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "Chan urrainn dhut barrachd air {{max}} dealbh a cheangal ris",
-      "attach_length_plural": "Chan urrainn dhut barrachd air {{max}} dealbh(an) a cheangal ris",
-      "attach_image": "Chan urrainn dhut ach dealbhan no videothan a cheangal ris",
-      "poll_invalid": "Roghainnean mì-dhligheach sa chunntas-bheachd"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/hu/translation.json b/src/config/locales/hu/translation.json
index ef520396..7c2933ac 100644
--- a/src/config/locales/hu/translation.json
+++ b/src/config/locales/hu/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/id/translation.json b/src/config/locales/id/translation.json
index bf39abcd..45217d91 100644
--- a/src/config/locales/id/translation.json
+++ b/src/config/locales/id/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Linimasa lokal",
-    "public": "Linimasa publik",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Cari",
     "lists": "Daftar"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Linimasa lokal",
-    "public": "Linimasa publik",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Cari",
     "lists": "Daftar",
     "members": "Anggota",
-    "option": {
-      "title": "Opsi",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Tampilkan balasan",
-      "apply": "Terapkan"
-    },
-    "new_toot": "Publish",
-    "reload": "Muat Ulang",
-    "settings": "Pengaturan"
+    "reload": "Muat Ulang"
   },
   "settings": {
     "title": "Pengaturan",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Linimasa",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Sesuaikan notifikasi belum terbaca untuk setiap linimasa.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Muat linimasa dari posisi baca terakhir",
         "home": "Beranda",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Tulis peringatanmu disini",
-      "status": "What's on your mind?",
-      "cancel": "Batal",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Buang",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Tambahkan gambar",
-        "poll": "Tambahkan polling",
-        "change_visibility": "Atur Visibilitas",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 menit",
-          "30_minutes": "30 menit",
-          "1_hour": "1 jam",
-          "6_hours": "6 jam",
-          "1_day": "1 hari",
-          "3_days": "3 hari",
-          "7_days": "7 hari"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Lompat ke..."
     },
@@ -331,13 +285,10 @@
       "title": "Pintasan keyboard",
       "ctrl_number": "Ganti akun",
       "ctrl_k": "Lompat ke linimasa lain",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Ubah fokus ke kolom kiri",
-      "l": "Ubah fokus ke kolom kanan",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Nama domain diperlukan",
       "domain_format": "Mohon masukkan nama domain"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "Anda hanya dapat melampirkan hingga {{max}} gambar",
-      "attach_length_plural": "Anda hanya dapat melampirkan hingga {{max}} gambar",
-      "attach_image": "Anda hanya dapat melampirkan gambar atau video",
-      "poll_invalid": "Pilihan angket invalid"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/is/translation.json b/src/config/locales/is/translation.json
index 56a934d7..a397b036 100644
--- a/src/config/locales/is/translation.json
+++ b/src/config/locales/is/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Staðvær tímalína",
-    "public": "Opinber tímalína",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Leita",
     "lists": "Listar"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Staðvær tímalína",
-    "public": "Opinber tímalína",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Leita",
     "lists": "Listar",
     "members": "Meðlimir",
-    "option": {
-      "title": "Valkostir",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Sýna svör",
-      "apply": "Virkja"
-    },
-    "new_toot": "Publish",
-    "reload": "Endurlesa",
-    "settings": "Stillingar"
+    "reload": "Endurlesa"
   },
   "settings": {
     "title": "Stillingar",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Tímalína",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Sérsníða ólesnar tilkynningar fyrir hverja tímalínu.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Hlaða inn tímalínunni þar sem síðast var verið að skoða",
         "home": "Heim",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Skrifaðu aðvörunina þína hér",
-      "status": "What's on your mind?",
-      "cancel": "Hætta við",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Henda",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Bæta við myndum",
-        "poll": "Bæta við könnun",
-        "change_visibility": "Breyta sýnileika",
-        "change_sensitive": "Merkja myndefni sem viðkvæmt",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 mínútur",
-          "30_minutes": "30 mínútur",
-          "1_hour": "1 klukkustund",
-          "6_hours": "6 klukkustundir",
-          "1_day": "1 dagur",
-          "3_days": "3 dagar",
-          "7_days": "7 dagar"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Hoppa á..."
     },
@@ -331,13 +285,10 @@
       "title": "Flýtileiðir á lyklaborði",
       "ctrl_number": "Skipta um notandaaðgang",
       "ctrl_k": "Hoppa á aðrar tímalínur",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Skipta yfir í dálkinn til vinstri",
-      "l": "Skipta yfir í dálkinn til hægri",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Heiti léns er nauðsynlegt",
       "domain_format": "Settu einungis inn heiti lénsins"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "Þú getur einungis hengt við {{max}} mynd",
-      "attach_length_plural": "Þú getur einungis hengt við {{max}} myndir",
-      "attach_image": "Þú getur einungis hengt við myndir eða myndskeið",
-      "poll_invalid": "Ógildir valkostir í könnun"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/it/translation.json b/src/config/locales/it/translation.json
index b90b2f31..f742b48c 100644
--- a/src/config/locales/it/translation.json
+++ b/src/config/locales/it/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Timeline locale",
-    "public": "Timeline pubblica",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Cerca",
     "lists": "Liste"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Timeline locale",
-    "public": "Timeline pubblica",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Cerca",
     "lists": "Liste",
     "members": "Membri",
-    "option": {
-      "title": "Opzioni",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Mostra risposte",
-      "apply": "Applica"
-    },
-    "new_toot": "Publish",
-    "reload": "Ricarica",
-    "settings": "Impostazioni"
+    "reload": "Ricarica"
   },
   "settings": {
     "title": "Impostazioni",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Cronologia",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Personalizza le notifiche non lette per ciascuna Timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Carica la timeline dall'ultima posizione di lettura",
         "home": "Pagina Iniziale",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Scrivi il tuo avviso qui",
-      "status": "What's on your mind?",
-      "cancel": "Annulla",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Scarta",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Aggiungi immagini",
-        "poll": "Aggiungi un sondaggio",
-        "change_visibility": "Modifica visibilità",
-        "change_sensitive": "Contrassegnare i media come sensibili",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minuti",
-          "30_minutes": "30 minuti",
-          "1_hour": "1 ora",
-          "6_hours": "6 ore",
-          "1_day": "1 giorno",
-          "3_days": "3 giorni",
-          "7_days": "7 giorni"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Salta a..."
     },
@@ -331,13 +285,10 @@
       "title": "Scorciatoie da Tastiera",
       "ctrl_number": "Passa ad un altro account",
       "ctrl_k": "Salta ad altre cronologie",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Abilita focalizzazione sulla colonna sinistra",
-      "l": "Abilita focalizzazione sulla colonna destra",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "È richiesto un nome dominio",
       "domain_format": "Per fovore, inserire solo il nome dominio"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "È possibile allegare solo fino a {{max}} immagine",
-      "attach_length_plural": "È possibile allegare solo fino a {{max}} immagini",
-      "attach_image": "È possibile allegare solo immagini o video",
-      "poll_invalid": "Scelte del sondaggio non valide"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
index fc43cd48..1d8fb759 100644
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@@ -55,7 +55,7 @@
     "favourite": "お気に入り",
     "bookmark": "ブックマーク",
     "local": "ローカル",
-    "public": "連合",
+    "public": "Federated timeline",
     "hashtag": "ハッシュタグ",
     "search": "検索",
     "lists": "リスト"
@@ -68,20 +68,12 @@
     "follow_requests": "フォロー申請",
     "direct_messages": "ダイレクトメッセージ",
     "local": "ローカルタイムライン",
-    "public": "連合タイムライン",
+    "public": "Federated timeline",
     "hashtag": "ハッシュタグ",
     "search": "検索",
     "lists": "リスト",
     "members": "メンバー",
-    "option": {
-      "title": "設定",
-      "show_reblogs": "ブースト表示",
-      "show_replies": "返信表示",
-      "apply": "適用"
-    },
-    "new_toot": "投稿",
-    "reload": "再読み込み",
-    "settings": "設定"
+    "reload": "再読み込み"
   },
   "settings": {
     "title": "設定",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "タイムライン",
-      "unread_notification": {
-        "title": "未読管理",
-        "description": "未読管理をするタイムラインを設定",
-        "direct": "ダイレクトメッセージ",
-        "local": "ローカルタイムライン",
-        "public": "連合タイムライン"
-      },
       "use_marker": {
         "title": "前回読んだ位置からタイムラインを読み込む",
         "home": "ホーム",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "投稿",
-      "cw": "ここに警告を書いてください",
-      "status": "今なにしてる?",
-      "cancel": "キャンセル",
-      "toot": "投稿",
-      "close_confirm": "この下書きを破棄してよろしいですか？",
-      "close_confirm_ok": "破棄",
-      "close_confirm_cancel": "編集を継続",
-      "description": "メディアの説明を追加",
-      "footer": {
-        "add_image": "画像を添付",
-        "poll": "アンケートを追加",
-        "change_visibility": "プライバシー設定",
-        "change_sensitive": "メディアを閲覧注意にする",
-        "add_cw": "コンテンツ警告を追加",
-        "pined_hashtag": "ハッシュタグを固定する"
-      },
-      "poll": {
-        "add_choice": "選択肢を追加",
-        "expires": {
-          "5_minutes": "5分後",
-          "30_minutes": "30分後",
-          "1_hour": "1時間後",
-          "6_hours": "6時間後",
-          "1_day": "1日後",
-          "3_days": "3日後",
-          "7_days": "7日後"
-        }
-      }
-    },
     "jump": {
       "jump_to": "移動..."
     },
@@ -331,13 +285,10 @@
       "title": "キーボードショートカット",
       "ctrl_number": "アカウントの切り替え",
       "ctrl_k": "タイムラインの移動",
-      "ctrl_n": "トゥートモーダルの表示",
-      "ctrl_enter": "投稿する",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "タイムラインを更新",
       "j": "次の投稿を選択",
       "k": "前の投稿を選択",
-      "h": "右のカラムを選択",
-      "l": "左のカラムを選択",
       "r": "選択した投稿に返信",
       "b": "選択した投稿をブースト",
       "f": "選択した投稿をお気に入り",
@@ -509,12 +460,12 @@
       "require_domain_name": "ドメイン名は必須です",
       "domain_format": "ドメイン名のみを入力してください"
     },
-    "new_toot": {
-      "toot_length": "投稿の長さは {{min}} から {{max}} の間でなければなりません",
-      "attach_length": "添付ファイルは {{max}} つまでです",
-      "attach_length_plural": "添付ファイルは {{max}} つまでです",
-      "attach_image": "画像かビデオしか添付できません",
-      "poll_invalid": "アンケートに不正な選択肢が含まれています"
+    "compose": {
+      "toot_length": "Post length should be between {{min}} and {{max}}",
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "アンケート終了",
       "body": "{{username}} のアンケートが終了しました"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/ko/translation.json b/src/config/locales/ko/translation.json
index 88ec0d7f..26300a09 100644
--- a/src/config/locales/ko/translation.json
+++ b/src/config/locales/ko/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "로컬",
-    "public": "연합",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "검색",
     "lists": "리스트"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "로컬",
-    "public": "연합",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "검색",
     "lists": "리스트",
     "members": "멤버",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "새로고침",
-    "settings": "설정"
+    "reload": "새로고침"
   },
   "settings": {
     "title": "설정",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "타임라인",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "각 타임라인마다 새 알림 표시 여부를 설정합니다.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "여기에 경고 문구를 입력하세요",
-      "status": "What's on your mind?",
-      "cancel": "취소",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "이미지 추가",
-        "poll": "Add a poll",
-        "change_visibility": "공개 범위 변경",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "이동"
     },
@@ -331,13 +285,10 @@
       "title": "키보드 단축키",
       "ctrl_number": "계정 변경",
       "ctrl_k": "다른 타임라인으로 이동",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "왼쪽 칼럼으로 포커스 이동",
-      "l": "오른쪽 칼럼으로 포커스 이동",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,11 +460,11 @@
       "require_domain_name": "도메인 주소가 필요합니다",
       "domain_format": "도메인 주소만 입력해주세요"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
-      "attach_image": "이미지나 비디오만 첨부할 수 있습니다",
+      "attach_image": "You can only attach images or videos",
       "poll_invalid": "Invalid poll choices"
     }
   },
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/no/translation.json b/src/config/locales/no/translation.json
index bfb6a785..ce93fa5c 100644
--- a/src/config/locales/no/translation.json
+++ b/src/config/locales/no/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Lokal tidslinje",
-    "public": "Offentlig tidslinje",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Søk",
     "lists": "Lister"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Lokal tidslinje",
-    "public": "Offentlig tidslinje",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Søk",
     "lists": "Lister",
     "members": "Medlemmer",
-    "option": {
-      "title": "Alternativer",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Vis svar",
-      "apply": "Bruk"
-    },
-    "new_toot": "Publish",
-    "reload": "Last inn på nytt",
-    "settings": "Innstillinger"
+    "reload": "Last inn på nytt"
   },
   "settings": {
     "title": "Innstillinger",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Tidslinje",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Tilpass uleste varsler for hver tidslinje.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/pl/translation.json b/src/config/locales/pl/translation.json
index c0cc7b78..ff6660f2 100644
--- a/src/config/locales/pl/translation.json
+++ b/src/config/locales/pl/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Lokalna oś czasu",
-    "public": "Publiczna oś czasu",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Wyszukiwanie",
     "lists": "Listy"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Lokalna oś czasu",
-    "public": "Publiczna oś czasu",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Wyszukiwanie",
     "lists": "Listy",
     "members": "Użytkownicy",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Pokaż odpowiedzi",
-      "apply": "Zastosuj"
-    },
-    "new_toot": "Publish",
-    "reload": "Przeładować",
-    "settings": "Ustawienia"
+    "reload": "Przeładować"
   },
   "settings": {
     "title": "Ustawienia",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Oś czasu",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Wprowadź zawartość ostrzeżenia tutaj",
-      "status": "What's on your mind?",
-      "cancel": "Anuluj",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Odrzuć",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Dodaj obraz",
-        "poll": "Dodaj ankietę",
-        "change_visibility": "Zmień widoczność",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minut",
-          "30_minutes": "30 minut",
-          "1_hour": "1 godzinę",
-          "6_hours": "6 godzin",
-          "1_day": "1 dzień",
-          "3_days": "3 dni",
-          "7_days": "7 dni"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Przejdź do…"
     },
@@ -331,13 +285,10 @@
       "title": "Skróty klawiszowe",
       "ctrl_number": "Przełącz konta",
       "ctrl_k": "Przejdź do innych osi czasu",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,11 +460,11 @@
       "require_domain_name": "Nazwa domeny jest wymagana",
       "domain_format": "Wprowadź tylko nazwę domeny"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
-      "attach_image": "Możesz załączyć tylko obrazy lub filmy",
+      "attach_image": "You can only attach images or videos",
       "poll_invalid": "Invalid poll choices"
     }
   },
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/pt_pt/translation.json b/src/config/locales/pt_pt/translation.json
index ef520396..7c2933ac 100644
--- a/src/config/locales/pt_pt/translation.json
+++ b/src/config/locales/pt_pt/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/ru/translation.json b/src/config/locales/ru/translation.json
index 2887caf8..22e98b8d 100644
--- a/src/config/locales/ru/translation.json
+++ b/src/config/locales/ru/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Локальная лента времени",
-    "public": "Публичная лента времени",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Поиск",
     "lists": "Списки"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Локальная лента времени",
-    "public": "Публичная лента времени",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Поиск",
     "lists": "Списки",
     "members": "Участники",
-    "option": {
-      "title": "Опция",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Показать отклики",
-      "apply": "Применить"
-    },
-    "new_toot": "Publish",
-    "reload": "Обновить",
-    "settings": "Настройки"
+    "reload": "Обновить"
   },
   "settings": {
     "title": "Настройки",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Лента времени",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Настроить непрочитанные уведомления для каждой ленты времени.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Загрузить ленту времени от последней прочитанной позиции",
         "home": "Главная",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Текст предупреждения",
-      "status": "What's on your mind?",
-      "cancel": "Отменить",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Отклонить",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Добавить изображения",
-        "poll": "Добавить опрос",
-        "change_visibility": "Изменение видимости",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 минут",
-          "30_minutes": "30 минут",
-          "1_hour": "1 час",
-          "6_hours": "6 часов",
-          "1_day": "1 день",
-          "3_days": "3 дня",
-          "7_days": "7 дней"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Перейти к..."
     },
@@ -331,13 +285,10 @@
       "title": "Горячие клавиши",
       "ctrl_number": "Сменить учетную запись",
       "ctrl_k": "Перейти к другим лентам времени",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Переключить фокус на столбец слева",
-      "l": "Переключить фокус на столбец справа",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "Требуется доменное имя",
       "domain_format": "Пожалуйста, введите только доменное имя"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "Вы можете прикрепить изображение вплоть до {{max}}",
-      "attach_length_plural": "Вы можете прикрепить только {{max}} изображений",
-      "attach_image": "Вы можете прикрепить только изображения или видео",
-      "poll_invalid": "Неверные варианты опроса"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/si/translation.json b/src/config/locales/si/translation.json
index a3c63fc1..152f0793 100644
--- a/src/config/locales/si/translation.json
+++ b/src/config/locales/si/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "සොයන්න",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "සොයන්න",
     "lists": "Lists",
     "members": "සාමාජිකයින්",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "යොදන්න"
-    },
-    "new_toot": "Publish",
-    "reload": "නැවත පූරණය",
-    "settings": "සැකසුම්"
+    "reload": "නැවත පූරණය"
   },
   "settings": {
     "title": "සැකසුම්",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "අවලංගු",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "විනාඩි 5",
-          "30_minutes": "විනාඩි 30",
-          "1_hour": "පැය 1",
-          "6_hours": "පැය 6",
-          "1_day": "දවස් 1",
-          "3_days": "දවස් 3",
-          "7_days": "දවස් 7"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "යතුරුපුවරුවේ කෙටිමං",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/sv_se/translation.json b/src/config/locales/sv_se/translation.json
index ef520396..7c2933ac 100644
--- a/src/config/locales/sv_se/translation.json
+++ b/src/config/locales/sv_se/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/tzm/translation.json b/src/config/locales/tzm/translation.json
index 26af6475..047fad05 100644
--- a/src/config/locales/tzm/translation.json
+++ b/src/config/locales/tzm/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Ifili n uzmez adɣran",
-    "public": "Ifili n uzmez agdudan",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Rzu",
     "lists": "Tilgamin"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Ifili n uzmez adɣran",
-    "public": "Ifili n uzmez agdudan",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Rzu",
     "lists": "Tilgamin",
     "members": "Agmamn",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Als",
-    "settings": "Tisɣal"
+    "reload": "Als"
   },
   "settings": {
     "title": "Tisɣal",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Ifili n uzmez",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Ara aɣatal-nnek da",
-      "status": "What's on your mind?",
-      "cancel": "Sser",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Rnu yat n twlafet",
-        "poll": "Rnu yan n idew",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 n tusdidin",
-          "30_minutes": "30 n tusdidin",
-          "1_hour": "1 tsragt",
-          "6_hours": "6 tsragin",
-          "1_day": "1 wass",
-          "3_days": "3 wussan",
-          "7_days": "7 wussan"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Ddu ɣer..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Ddu ɣer ifiliten n uzmez yaḍnin",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,11 +460,11 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
-      "attach_image": "Tzmerd ɣas ad teqqned tiwlafin neɣ ividyuten",
+      "attach_image": "You can only attach images or videos",
       "poll_invalid": "Invalid poll choices"
     }
   },
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/zh_cn/translation.json b/src/config/locales/zh_cn/translation.json
index 44994d53..72d8a44b 100644
--- a/src/config/locales/zh_cn/translation.json
+++ b/src/config/locales/zh_cn/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "本站",
-    "public": "跨站",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "搜索",
     "lists": "列表"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "本站",
-    "public": "跨站",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "搜索",
     "lists": "列表",
     "members": "成员",
-    "option": {
-      "title": "选项",
-      "show_reblogs": "Show boosts",
-      "show_replies": "显示回复",
-      "apply": "应用"
-    },
-    "new_toot": "Publish",
-    "reload": "刷新",
-    "settings": "设置"
+    "reload": "刷新"
   },
   "settings": {
     "title": "设置",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "时间线",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "单独设定各时间线的未读通知。",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "从最后阅读位置加载时间线",
         "home": "主页",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "折叠部分的警告消息",
-      "status": "What's on your mind?",
-      "cancel": "取消",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "丢弃",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "上传图片",
-        "poll": "发起投票",
-        "change_visibility": "设置嘟文可见范围",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 分钟",
-          "30_minutes": "30 分钟",
-          "1_hour": "1 小时",
-          "6_hours": "6 小时",
-          "1_day": "1 天",
-          "3_days": "3 天",
-          "7_days": "7 天"
-        }
-      }
-    },
     "jump": {
       "jump_to": "跳转至..."
     },
@@ -331,13 +285,10 @@
       "title": "快捷键",
       "ctrl_number": "切换账户",
       "ctrl_k": "跳转至其他时间线",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "聚焦至左侧的列",
-      "l": "聚焦至右侧的列",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "需要域名",
       "domain_format": "只能输入域名"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "您只能附加最多 {{max}} 张图片",
-      "attach_length_plural": "您只能添加最多 {{max}} 张图片",
-      "attach_image": "只能上传图片或视频",
-      "poll_invalid": "投票选项无效"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/config/locales/zh_tw/translation.json b/src/config/locales/zh_tw/translation.json
index 5aae05f2..77e60202 100644
--- a/src/config/locales/zh_tw/translation.json
+++ b/src/config/locales/zh_tw/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "本機時間軸",
-    "public": "公開時間軸",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "搜尋",
     "lists": "列表"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "本機時間軸",
-    "public": "公開時間軸",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "搜尋",
     "lists": "列表",
     "members": "成員",
-    "option": {
-      "title": "選項",
-      "show_reblogs": "Show boosts",
-      "show_replies": "顯示回覆",
-      "apply": "套用"
-    },
-    "new_toot": "Publish",
-    "reload": "重新整理",
-    "settings": "設定"
+    "reload": "重新整理"
   },
   "settings": {
     "title": "設定",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "時間軸",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "自訂每一個時間軸之未讀通知",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "從上次閱讀位置讀取時間軸",
         "home": "首頁",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "請在此填入警告訊息",
-      "status": "What's on your mind?",
-      "cancel": "取消",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "捨棄",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "新增圖片",
-        "poll": "新增投票",
-        "change_visibility": "變更可見度",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 分鐘",
-          "30_minutes": "30 分鐘",
-          "1_hour": "1 小時",
-          "6_hours": "6 小時",
-          "1_day": "1 天",
-          "3_days": "3 天",
-          "7_days": "7 天"
-        }
-      }
-    },
     "jump": {
       "jump_to": "跳至..."
     },
@@ -331,13 +285,10 @@
       "title": "鍵盤快速鍵",
       "ctrl_number": "切換帳號",
       "ctrl_k": "跳至其他時間軸",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "切換焦點至左方欄",
-      "l": "切換焦點至右方欄",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,12 +460,12 @@
       "require_domain_name": "請填入網域名稱",
       "domain_format": "請僅輸入網域名稱 (無前綴 https://)"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
-      "attach_length": "您只能附加最多 {{max}} 個圖片。",
-      "attach_length_plural": "您只能附加最多 {{max}} 個圖片。",
-      "attach_image": "只能附加圖片或影片",
-      "poll_invalid": "無效的投票選項"
+      "attach_length": "You can only attach up to {{max}} image",
+      "attach_length_plural": "You can only attach up to {{max}} images",
+      "attach_image": "You can only attach images or videos",
+      "poll_invalid": "Invalid poll choices"
     }
   },
   "notification": {
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }