diff --git a/src/i18n/ca/common.json b/src/i18n/ca/common.json
index 163d8b66..284c68f6 100644
--- a/src/i18n/ca/common.json
+++ b/src/i18n/ca/common.json
@@ -7,7 +7,8 @@
     "continue": "Continua",
     "create": "Crea",
     "delete": "Esborra",
-    "done": "Fet"
+    "done": "Fet",
+    "confirm": "Confirma"
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalitzat {{emoji}}"
diff --git a/src/i18n/ca/components/contextMenu.json b/src/i18n/ca/components/contextMenu.json
index a9cda06e..298a5954 100644
--- a/src/i18n/ca/components/contextMenu.json
+++ b/src/i18n/ca/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Bloqueja l'usuari",
-      "action_true": "Deixa de bloquejar l'usuari"
+      "action_true": "Deixa de bloquejar l'usuari",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Denuncia i bloqueja l'usuari"
+      "action": "Denuncia i bloqueja l'usuari",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -32,11 +38,8 @@
     "block": {
       "action": "Bloquejar la instància {{instance}}",
       "alert": {
-        "title": "Confirma el bloqueig de la instància {{instance}}?",
-        "message": "Pots silenciar o bloquejar a un usuari.\n\nDesprés de bloquejar una instància, tot el seu contingut, amb els seus seguidors, seran esborrats!",
-        "buttons": {
-          "confirm": "Confirma"
-        }
+        "title": "Vols bloquejar la instància {{instance}}?",
+        "message": "Pots silenciar o bloquejar a un usuari.\n\nDesprés de bloquejar una instància, tot el seu contingut, amb els seus seguidors, seran esborrats!"
       }
     }
   },
@@ -56,21 +59,15 @@
     "delete": {
       "action": "Elimina la publicació",
       "alert": {
-        "title": "Confirma l'eliminació?",
-        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes.",
-        "buttons": {
-          "confirm": "Confirma"
-        }
+        "title": "Vols eliminar-ho?",
+        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes."
       }
     },
     "deleteEdit": {
-      "action": "Elimina la publicació i torna a publicar",
+      "action": "Elimina i torna-ho a publicar",
       "alert": {
-        "title": "Confirma l'eliminació i tornar a publicar?",
-        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes.",
-        "buttons": {
-          "confirm": "Confirma"
-        }
+        "title": "Vols eliminar i tornar-ho a publicar?",
+        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes."
       }
     },
     "mute": {
diff --git a/src/i18n/ca/components/instance.json b/src/i18n/ca/components/instance.json
index 97aa1b2b..12844f95 100644
--- a/src/i18n/ca/components/instance.json
+++ b/src/i18n/ca/components/instance.json
@@ -1,8 +1,9 @@
 {
   "server": {
     "textInput": {
-      "placeholder": ""
+      "placeholder": "Domini de la instància"
     },
+    "whitelisted": "Pot ser una instància que estigui a la llista blanca de la qual tooot no pot obtenir les dades abans d'iniciar la sessió.",
     "button": "Inicia la sessió",
     "information": {
       "name": "Nom",
diff --git a/src/i18n/ca/components/mediaSelector.json b/src/i18n/ca/components/mediaSelector.json
index 09013a96..29700ac3 100644
--- a/src/i18n/ca/components/mediaSelector.json
+++ b/src/i18n/ca/components/mediaSelector.json
@@ -1,6 +1,6 @@
 {
   "title": "Selecciona origen multimèdia",
-  "message": "Les dades multimèdia EXIF no s'han penjat",
+  "message": "Les dades multimèdia EXIF no es penjen",
   "options": {
     "image": "Penja fotos",
     "image_max": "Penja fotos (màx. {{max}})",
diff --git a/src/i18n/ca/components/timeline.json b/src/i18n/ca/components/timeline.json
index 5a0145f4..cbdd782d 100644
--- a/src/i18n/ca/components/timeline.json
+++ b/src/i18n/ca/components/timeline.json
@@ -31,7 +31,7 @@
         "notification": "{{name}} ha impulsat la teva publicació"
       },
       "update": "L'impuls ha sigut editat",
-      "admin.sign_up": "",
+      "admin.sign_up": "{{name}} s'ha unit a la instància",
       "admin.report": ""
     },
     "actions": {
@@ -55,7 +55,7 @@
         "accessibilityLabel": "Afegeix aquesta publicació a marcadors",
         "function": "Afegeix la publicació a marcadors"
       },
-      "openReport": ""
+      "openReport": "Obre la denúncia"
     },
     "actionsUsers": {
       "reblogged_by": {
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Contingut ocult"
     },
-    "filtered": "Filtrat: {{phrase}}.",
+    "filtered": {
+      "reveal": "Mostra-ho de totes maneres",
+      "match_v1": "Filtrat: {{phrase}}.",
+      "match_v2_one": "Filtrat per {{filters}}.",
+      "match_v2_other": "Filtrat per {{count}} filtres, {{filters}}."
+    },
     "fullConversation": "Llegeix conversacions",
     "translate": {
       "default": "Tradueix",
diff --git a/src/i18n/ca/screens.json b/src/i18n/ca/screens.json
index 9f753430..d5fde52a 100644
--- a/src/i18n/ca/screens.json
+++ b/src/i18n/ca/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Protecció de la privacitat",
-    "message": "Si us plau, no revelis la identitat d'altres usuaris, així com el nom d'usuari, avatar, etc. Gràcies!",
-    "button": "Confirma"
+    "message": "Si us plau, no revelis la identitat d'altres usuaris, així com el nom d'usuari, avatar, etc. Gràcies!"
   },
   "localCorrupt": {
     "message": "La sessió ha sigut expirada. Si us plau, torna a iniciar la sessió"
diff --git a/src/i18n/ca/screens/compose.json b/src/i18n/ca/screens/compose.json
index 5f3220e0..c1c86ac3 100644
--- a/src/i18n/ca/screens/compose.json
+++ b/src/i18n/ca/screens/compose.json
@@ -11,11 +11,11 @@
     },
     "right": {
       "button": {
-        "default": "Publicació",
+        "default": "Publica",
         "conversation": "Envia un missatge directe",
-        "reply": "Resposta de la publicació",
+        "reply": "Publica la resposta",
         "deleteEdit": "Publicació",
-        "edit": "Publicació",
+        "edit": "Publica l'edició",
         "share": "Publicació"
       },
       "alert": {
diff --git a/src/i18n/ca/screens/tabs.json b/src/i18n/ca/screens/tabs.json
index 3b136f86..f247af79 100644
--- a/src/i18n/ca/screens/tabs.json
+++ b/src/i18n/ca/screens/tabs.json
@@ -3,15 +3,15 @@
     "local": {
       "name": "Seguint",
       "options": {
-        "showBoosts": "",
-        "showReplies": ""
+        "showBoosts": "Mostra les publicacions",
+        "showReplies": "Mostra les respostes"
       }
     },
     "public": {
       "segments": {
         "federated": "Federat",
         "local": "Local",
-        "trending": "En tendència"
+        "trending": "Tendència"
       }
     },
     "notifications": {
@@ -31,13 +31,13 @@
       "title": "Mostra les notificacions",
       "options": {
         "follow": "$t(screenTabs:me.push.follow.heading)",
-        "follow_request": "Sol·licitud de seguiment",
+        "follow_request": "Sol·licituds de seguiment",
         "favourite": "$t(screenTabs:me.push.favourite.heading)",
         "reblog": "$t(screenTabs:me.push.reblog.heading)",
         "mention": "$t(screenTabs:me.push.mention.heading)",
         "poll": "$t(screenTabs:me.push.poll.heading)",
-        "status": "Publicació d'usuaris subscrits",
-        "update": "L'impuls ha sigut editat",
+        "status": "Publicacions d'usuaris subscrits",
+        "update": "Edicions d'impulsos",
         "admin.sign_up": "$t(screenTabs:me.push.admin.sign_up.heading)",
         "admin.report": "$t(screenTabs:me.push.admin.report.heading)"
       }
@@ -163,7 +163,7 @@
           "total_other": "{{count}} camps"
         },
         "visibility": {
-          "title": "Visibilitat de la publicació",
+          "title": "Visibilitat",
           "options": {
             "public": "Públic",
             "unlisted": "Sense llistar",
@@ -171,7 +171,7 @@
           }
         },
         "sensitive": {
-          "title": "Publica contingut multimèdia sensible"
+          "title": "Continguts multimèdia sensibles"
         },
         "lock": {
           "title": "Fes el compte privat",
@@ -211,28 +211,28 @@
         "heading": "Per defecte"
       },
       "follow": {
-        "heading": "Nou seguidor"
+        "heading": "Seguidors nous"
       },
       "follow_request": {
-        "heading": "Sol·licitud de seguiment"
+        "heading": "Sol·licituds de seguiment"
       },
       "favourite": {
         "heading": "Favorits"
       },
       "reblog": {
-        "heading": "Impulsat"
+        "heading": "Impulsos"
       },
       "mention": {
-        "heading": "T'ha mencionat"
+        "heading": "Mencions"
       },
       "poll": {
-        "heading": "Actualització d'una votació"
+        "heading": "Actualitzacions d'una votació"
       },
       "status": {
-        "heading": "Publicació d'usuaris subscrits"
+        "heading": "Publicacions d'usuaris subscrits"
       },
       "update": {
-        "heading": "L'impuls ha sigut editat"
+        "heading": "Edicions d'impulsos"
       },
       "admin.sign_up": {
         "heading": "Administració: Registra"
@@ -399,7 +399,7 @@
         "reblogged_by": "{{count}} impulsats",
         "favourited_by": "{{count}} favorits"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "Els resultats d'una instància remota són incomplets"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/cs/common.json b/src/i18n/cs/common.json
index b08510a6..be1ba7cd 100644
--- a/src/i18n/cs/common.json
+++ b/src/i18n/cs/common.json
@@ -7,7 +7,8 @@
     "continue": "",
     "create": "",
     "delete": "",
-    "done": ""
+    "done": "",
+    "confirm": ""
   },
   "customEmoji": {
     "accessibilityLabel": ""
diff --git a/src/i18n/cs/components/contextMenu.json b/src/i18n/cs/components/contextMenu.json
index 89d1e76e..af54f593 100644
--- a/src/i18n/cs/components/contextMenu.json
+++ b/src/i18n/cs/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "",
-      "action_true": ""
+      "action_true": "",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": ""
+      "action": "",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "",
       "alert": {
         "title": "",
-        "message": "",
-        "buttons": {
-          "confirm": ""
-        }
+        "message": ""
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "",
       "alert": {
         "title": "",
-        "message": "",
-        "buttons": {
-          "confirm": ""
-        }
+        "message": ""
       }
     },
     "deleteEdit": {
       "action": "",
       "alert": {
         "title": "",
-        "message": "",
-        "buttons": {
-          "confirm": ""
-        }
+        "message": ""
       }
     },
     "mute": {
diff --git a/src/i18n/cs/components/instance.json b/src/i18n/cs/components/instance.json
index 9ab20d42..6de39ff0 100644
--- a/src/i18n/cs/components/instance.json
+++ b/src/i18n/cs/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": ""
     },
+    "whitelisted": "",
     "button": "",
     "information": {
       "name": "",
diff --git a/src/i18n/cs/components/timeline.json b/src/i18n/cs/components/timeline.json
index 43556ccc..c18b9d6b 100644
--- a/src/i18n/cs/components/timeline.json
+++ b/src/i18n/cs/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": ""
     },
-    "filtered": "",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "",
     "translate": {
       "default": "",
diff --git a/src/i18n/cs/screens.json b/src/i18n/cs/screens.json
index 59b67261..35d8636e 100644
--- a/src/i18n/cs/screens.json
+++ b/src/i18n/cs/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "",
-    "message": "",
-    "button": ""
+    "message": ""
   },
   "localCorrupt": {
     "message": ""
diff --git a/src/i18n/de/common.json b/src/i18n/de/common.json
index 904f2597..bdd76d80 100644
--- a/src/i18n/de/common.json
+++ b/src/i18n/de/common.json
@@ -7,7 +7,8 @@
     "continue": "Weiter",
     "create": "Erstellen",
     "delete": "Löschen",
-    "done": "Fertig"
+    "done": "Fertig",
+    "confirm": "Bestätigen"
   },
   "customEmoji": {
     "accessibilityLabel": "Eigenes Emoji {{emoji}}"
diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json
index 881c2913..5b322c1d 100644
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Nutzer blockieren",
-      "action_true": "User entblocken"
+      "action_true": "User entblocken",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Nutzer melden und blockieren"
+      "action": "Nutzer melden und blockieren",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Instanz {{instance}} blockieren",
       "alert": {
         "title": "{{instance}} wirklich blockieren?",
-        "message": "Üblicherweise kannst du einen User stummschalten oder blockieren.\nBlockierst du hingegegen eine Instanz, wird deren gesamter Inhalt samt Usern, die dir von dieser Instanz folgen, entfernt!",
-        "buttons": {
-          "confirm": "Bestätigen"
-        }
+        "message": "Üblicherweise kannst du einen User stummschalten oder blockieren.\nBlockierst du hingegegen eine Instanz, wird deren gesamter Inhalt samt Usern, die dir von dieser Instanz folgen, entfernt!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Tröt löschen",
       "alert": {
         "title": "Löschen bestätigen?",
-        "message": "Alle Boosts, Sterne und Antworten werden entfernt.",
-        "buttons": {
-          "confirm": "Bestätigen"
-        }
+        "message": "Alle Boosts, Sterne und Antworten werden entfernt."
       }
     },
     "deleteEdit": {
       "action": "Tröt neu entwerfen",
       "alert": {
         "title": "Beitrag wirklich entfernen?",
-        "message": "Alle Boosts und Likes inklusive der Antworten werden gelöscht.",
-        "buttons": {
-          "confirm": "Bestätigen"
-        }
+        "message": "Alle Boosts und Likes inklusive der Antworten werden gelöscht."
       }
     },
     "mute": {
diff --git a/src/i18n/de/components/instance.json b/src/i18n/de/components/instance.json
index 3901a0dd..e5c3627b 100644
--- a/src/i18n/de/components/instance.json
+++ b/src/i18n/de/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "Domain der Instanz"
     },
+    "whitelisted": "",
     "button": "Login",
     "information": {
       "name": "Name",
diff --git a/src/i18n/de/components/timeline.json b/src/i18n/de/components/timeline.json
index ed401308..9b906c1e 100644
--- a/src/i18n/de/components/timeline.json
+++ b/src/i18n/de/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Ausgeblendeter Inhalt"
     },
-    "filtered": "Gefiltert: {{phrase}}.",
+    "filtered": {
+      "reveal": "Trotzdem anzeigen",
+      "match_v1": "Gefiltert: {{phrase}}.",
+      "match_v2_one": "Gefiltert durch {{filters}}.",
+      "match_v2_other": "Gefiltert durch {{count}} Filter, {{filters}}."
+    },
     "fullConversation": "Unterhaltung anzeigen",
     "translate": {
       "default": "Übersetzen",
diff --git a/src/i18n/de/screens.json b/src/i18n/de/screens.json
index b3f1320b..d7bea4ea 100644
--- a/src/i18n/de/screens.json
+++ b/src/i18n/de/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Datenschutz",
-    "message": "Bitte geben Sie nicht die Identität anderer Nutzer preis, wie z. B. Benutzername, Avatar, etc. Vielen Dank!",
-    "button": "Bestätigen"
+    "message": "Bitte geben Sie nicht die Identität anderer Nutzer preis, wie z. B. Benutzername, Avatar, etc. Vielen Dank!"
   },
   "localCorrupt": {
     "message": "Login abgelaufen, bitte erneut anmelden"
diff --git a/src/i18n/es/common.json b/src/i18n/es/common.json
index db90f304..bf65854e 100644
--- a/src/i18n/es/common.json
+++ b/src/i18n/es/common.json
@@ -7,7 +7,8 @@
     "continue": "Continuar",
     "create": "Crear",
     "delete": "Borrar",
-    "done": "Hecho"
+    "done": "Hecho",
+    "confirm": "Confirmar"
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizado {{emoji}}"
diff --git a/src/i18n/es/components/contextMenu.json b/src/i18n/es/components/contextMenu.json
index 149a2687..fea2de9f 100644
--- a/src/i18n/es/components/contextMenu.json
+++ b/src/i18n/es/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Bloquear usuario",
-      "action_true": "Desbloquear usuario"
+      "action_true": "Desbloquear usuario",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Reportar y bloquear usuario"
+      "action": "Reportar y bloquear usuario",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Bloquear instancia {{instance}}",
       "alert": {
         "title": "¿Confirmar bloqueo de la instancia {{instance}}?",
-        "message": "Puedes silenciar o bloquear a un usuario.\n\nTras bloquear una instancia, todo su contenido junto con sus seguidores se eliminarán.",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Puedes silenciar o bloquear a un usuario.\n\nTras bloquear una instancia, todo su contenido junto con sus seguidores se eliminarán."
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Eliminar toot",
       "alert": {
         "title": "¿Confirmar eliminación?",
-        "message": "Todos los boosts y favoritos se eliminarán, incluidas todas las respuestas.",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Todos los boosts y favoritos se eliminarán, incluidas todas las respuestas."
       }
     },
     "deleteEdit": {
       "action": "Eliminar toot y volver a publicar",
       "alert": {
         "title": "¿Confirmar eliminación y volver a publicar?",
-        "message": "Todos los boosts y favoritos se eliminarán, incluidas todas las respuestas.",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Todos los boosts y favoritos se eliminarán, incluidas todas las respuestas."
       }
     },
     "mute": {
diff --git a/src/i18n/es/components/instance.json b/src/i18n/es/components/instance.json
index aa81a637..22b60353 100644
--- a/src/i18n/es/components/instance.json
+++ b/src/i18n/es/components/instance.json
@@ -1,8 +1,9 @@
 {
   "server": {
     "textInput": {
-      "placeholder": ""
+      "placeholder": "Dominio de la instancia"
     },
+    "whitelisted": "Puede ser que la instancia esté en una lista blanca por la que tooot no pueda obtener los datos antes de iniciar la sesión.",
     "button": "Iniciar sesión",
     "information": {
       "name": "Nombre",
diff --git a/src/i18n/es/components/timeline.json b/src/i18n/es/components/timeline.json
index 9c8607c9..86b9ce1c 100644
--- a/src/i18n/es/components/timeline.json
+++ b/src/i18n/es/components/timeline.json
@@ -31,7 +31,7 @@
         "notification": "{{name}} ha impulsado tu toot"
       },
       "update": "El impulso ha sido editado",
-      "admin.sign_up": "",
+      "admin.sign_up": "{{name}} se unió a la instancia",
       "admin.report": ""
     },
     "actions": {
@@ -55,7 +55,7 @@
         "accessibilityLabel": "Añadir este toot en marcadores",
         "function": "Añadir toot a marcadores"
       },
-      "openReport": ""
+      "openReport": "Abrir denuncia"
     },
     "actionsUsers": {
       "reblogged_by": {
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Contenido oculto"
     },
-    "filtered": "Filtrado: {{phrase}}.",
+    "filtered": {
+      "reveal": "Mostrar de todos modos",
+      "match_v1": "Filtrado: {{phrase}}.",
+      "match_v2_one": "Filtrado por {{filters}}.",
+      "match_v2_other": "Filtrado por {{count}} filtros, {{filters}}."
+    },
     "fullConversation": "Leer conversaciones",
     "translate": {
       "default": "Traducir",
diff --git a/src/i18n/es/screens.json b/src/i18n/es/screens.json
index c6843011..31d25049 100644
--- a/src/i18n/es/screens.json
+++ b/src/i18n/es/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Protección de la privacidad",
-    "message": "Por favor, no revele la identidad de otros usuarios, como el nombre de usuario, avatar, etc. ¡Gracias!",
-    "button": "Confirmar"
+    "message": "Por favor, no revele la identidad de otros usuarios, como el nombre de usuario, avatar, etc. ¡Gracias!"
   },
   "localCorrupt": {
     "message": "La sesión se ha expirado. Por favor, vuelve a iniciar sesión"
diff --git a/src/i18n/es/screens/compose.json b/src/i18n/es/screens/compose.json
index 02e7f647..b46e89d3 100644
--- a/src/i18n/es/screens/compose.json
+++ b/src/i18n/es/screens/compose.json
@@ -15,7 +15,7 @@
         "conversation": "Mensaje privado",
         "reply": "Respuesta al toot",
         "deleteEdit": "Toot",
-        "edit": "Toot",
+        "edit": "Edita el toot",
         "share": "Toot"
       },
       "alert": {
diff --git a/src/i18n/es/screens/tabs.json b/src/i18n/es/screens/tabs.json
index 7022aa6d..163cbb73 100644
--- a/src/i18n/es/screens/tabs.json
+++ b/src/i18n/es/screens/tabs.json
@@ -399,7 +399,7 @@
         "reblogged_by": "{{count}} impulsados",
         "favourited_by": "{{count}} favoritos"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "Los resultados de una instancia remota están incompletos"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/common.json b/src/i18n/fr/common.json
index af8479b8..2e5d1ef5 100644
--- a/src/i18n/fr/common.json
+++ b/src/i18n/fr/common.json
@@ -3,11 +3,12 @@
     "OK": "Ok",
     "apply": "Confirmer",
     "cancel": "Annuler",
-    "discard": "Ne pas tenir compte",
+    "discard": "Abandonner",
     "continue": "Continuer",
-    "create": "",
-    "delete": "",
-    "done": ""
+    "create": "Créer",
+    "delete": "Supprimer",
+    "done": "Fait",
+    "confirm": "Confirmer"
   },
   "customEmoji": {
     "accessibilityLabel": "Émoji personnalisé {{emoji}}"
@@ -20,12 +21,12 @@
       "message": ""
     },
     "error": {
-      "message": "Échec de la connexion, veuillez réessayer"
+      "message": "{{function}} a échoué, veuillez réessayer"
     }
   },
   "separator": ", ",
   "discard": {
     "title": "Modifications non sauvegardées",
-    "message": "Votre modification n'a pas été enregistrée. Voulez-vous annuler l'enregistrement des modifications ?"
+    "message": "Votre modification n'a pas été enregistrée. Voulez-vous renoncer à enregistrer les modifications ?"
   }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/components/contextMenu.json b/src/i18n/fr/components/contextMenu.json
index 426a9834..9dd2df53 100644
--- a/src/i18n/fr/components/contextMenu.json
+++ b/src/i18n/fr/components/contextMenu.json
@@ -4,24 +4,30 @@
     "title": "Actions de l'utilisateur",
     "following": {
       "action_false": "Suivre l'utilisateur",
-      "action_true": ""
+      "action_true": "Ne plus suivre l'utilisateur"
     },
-    "inLists": "",
+    "inLists": "Gérer l'utilisateur des listes",
     "mute": {
       "action_false": "Rendre muet l'utilisateur",
       "action_true": "Rendre la parole"
     },
     "block": {
       "action_false": "Bloquer l'utilisateur",
-      "action_true": "Débloquer l'utilisateur"
+      "action_true": "Débloquer l'utilisateur",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": ""
+      "action": "Signaler et bloquer un utilisateur",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
     "direct": "Message direct",
-    "public": ""
+    "public": "Message public"
   },
   "copy": {
     "action": "Copier le Pouet",
@@ -33,10 +39,7 @@
       "action": "Bloquer l'instance {{instance}}",
       "alert": {
         "title": "Confirmer le blocage de l'instance {{instance}}?",
-        "message": "Vous pouvez masquer ou bloquer certains utilisateurs.\n\nAprès avoir bloqué l'instance, tout son contenu, y compris les followers de cette instance, sera supprimé !",
-        "buttons": {
-          "confirm": "Confirmer"
-        }
+        "message": "Vous pouvez masquer ou bloquer certains utilisateurs.\n\nAprès avoir bloqué l'instance, tout son contenu, y compris les followers de cette instance, sera supprimé !"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Supprimer le pouet",
       "alert": {
         "title": "Confirmer la suppression ?",
-        "message": "Tous les boosts et favoris seront effacés, y compris toutes les réponses.",
-        "buttons": {
-          "confirm": "Confirmer"
-        }
+        "message": "Tous les boosts et favoris seront effacés, y compris toutes les réponses."
       }
     },
     "deleteEdit": {
       "action": "Supprimer le pouet et le republié",
       "alert": {
         "title": "Confirmer la suppression et le repost ?",
-        "message": "Tous les boosts et favoris seront effacés, y compris toutes les réponses.",
-        "buttons": {
-          "confirm": "Confirmer"
-        }
+        "message": "Tous les boosts et favoris seront effacés, y compris toutes les réponses."
       }
     },
     "mute": {
diff --git a/src/i18n/fr/components/instance.json b/src/i18n/fr/components/instance.json
index a0300b8f..85499c17 100644
--- a/src/i18n/fr/components/instance.json
+++ b/src/i18n/fr/components/instance.json
@@ -1,8 +1,9 @@
 {
   "server": {
     "textInput": {
-      "placeholder": ""
+      "placeholder": "URL de l’instance"
     },
+    "whitelisted": "Il peut s’agir d’une instance sur liste blanche à partir de laquelle tooot ne peut pas récupérer de données avant de se connecter.",
     "button": "Connexion",
     "information": {
       "name": "Nom",
@@ -20,7 +21,7 @@
   "update": {
     "alert": {
       "title": "Connecté à cette instance",
-      "message": "Vous pouvez vous connecter à un autre compte, en maintenant un compte connecté existant"
+      "message": "Vous pouvez vous connecter à un autre compte, en conservant le compte connecté existant"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/components/parse.json b/src/i18n/fr/components/parse.json
index c0f025ec..59e014b7 100644
--- a/src/i18n/fr/components/parse.json
+++ b/src/i18n/fr/components/parse.json
@@ -1,6 +1,6 @@
 {
   "HTML": {
-    "accessibilityHint": "Appuyez pour agrandir ou réduire le contenu",
+    "accessibilityHint": "Touchez pour développer ou réduire le contenu",
     "expanded": "{{hint}}{{moreLines}}",
     "moreLines": " ({{count}} lignes en plus)",
     "defaultHint": "Pouet long"
diff --git a/src/i18n/fr/components/timeline.json b/src/i18n/fr/components/timeline.json
index 27665adc..88d1d336 100644
--- a/src/i18n/fr/components/timeline.json
+++ b/src/i18n/fr/components/timeline.json
@@ -5,7 +5,7 @@
       "button": "Réessayer"
     },
     "success": {
-      "message": "La chronologie est vide"
+      "message": "Le fil est vide"
     }
   },
   "end": {
@@ -31,8 +31,8 @@
         "notification": "{{name}} a partagé votre message"
       },
       "update": "Le reblog a été modifié",
-      "admin.sign_up": "",
-      "admin.report": ""
+      "admin.sign_up": "{{name}} a rejoint l'instance",
+      "admin.report": "{{name}} a signalé:"
     },
     "actions": {
       "reply": {
@@ -40,7 +40,7 @@
       },
       "reblogged": {
         "accessibilityLabel": "Partager ce pouet",
-        "function": "Pouet de Boost",
+        "function": "Pouet de boost",
         "options": {
           "title": "Choisir la visibilité du boost",
           "public": "Boost public",
@@ -49,13 +49,13 @@
       },
       "favourited": {
         "accessibilityLabel": "Ajouter ce pouet aux favoris",
-        "function": "Mettre le pouet en favori"
+        "function": "Pouet en favoris"
       },
       "bookmarked": {
-        "accessibilityLabel": "Ajouter ce pouet aux signets",
-        "function": "Pouet de signet"
+        "accessibilityLabel": "Ajouter ce pouet aux marque-pages",
+        "function": "Pouet en marque-pages"
       },
-      "openReport": ""
+      "openReport": "Ouvrir un rapport"
     },
     "actionsUsers": {
       "reblogged_by": {
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Contenu masqué"
     },
-    "filtered": "Filtré: {{phrase}}.",
+    "filtered": {
+      "reveal": "Montrer quand même",
+      "match_v1": "Filtré : {{phrase}}.",
+      "match_v2_one": "Filtré par {{filters}}.",
+      "match_v2_other": "Filtré par {{count}} filtres, {{filters}}."
+    },
     "fullConversation": "Conversations lues",
     "translate": {
       "default": "Traduire",
@@ -104,7 +109,7 @@
       "shared": {
         "account": {
           "name": {
-            "accessibilityHint": "Nom de l'utilisateur"
+            "accessibilityHint": "Nom d'affichage de l'utilisateur"
           },
           "account": {
             "accessibilityHint": "Compte de l'utilisateur"
@@ -119,7 +124,7 @@
         },
         "visibility": {
           "direct": {
-            "accessibilityLabel": "Envoyer un message direct"
+            "accessibilityLabel": "Envoyer un message privé"
           },
           "private": {
             "accessibilityLabel": "Visible uniquement pour les abonné·e·s"
diff --git a/src/i18n/fr/screens.json b/src/i18n/fr/screens.json
index eaf2f5cf..8d3237db 100644
--- a/src/i18n/fr/screens.json
+++ b/src/i18n/fr/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Protection de la confidentialité",
-    "message": "Veuillez ne pas divulguer l'identité d'un autre utilisateur, tel que le nom d'utilisateur, l'avatar, etc. Merci!",
-    "button": "Confirmer"
+    "message": "Veuillez ne pas divulguer l'identité d'un autre utilisateur, tel que le nom d'utilisateur, l'avatar, etc. Merci!"
   },
   "localCorrupt": {
     "message": "Session expirée, veuillez ré-essayer"
diff --git a/src/i18n/fr/screens/compose.json b/src/i18n/fr/screens/compose.json
index de0fbf17..ea31d181 100644
--- a/src/i18n/fr/screens/compose.json
+++ b/src/i18n/fr/screens/compose.json
@@ -2,7 +2,7 @@
   "heading": {
     "left": {
       "alert": {
-        "title": "Annuler l’édition?",
+        "title": "Annuler l’édition ?",
         "buttons": {
           "save": "Enregistrer comme brouillon",
           "delete": "Supprimer le brouillon"
@@ -12,7 +12,7 @@
     "right": {
       "button": {
         "default": "Pouet",
-        "conversation": "Pouet DM",
+        "conversation": "Pouet MP",
         "reply": "Réponse de pouet",
         "deleteEdit": "Pouet",
         "edit": "Pouet",
@@ -24,8 +24,8 @@
           "button": "Réessayer"
         },
         "removeReply": {
-          "title": "Le pouet répondu est introuvable",
-          "description": "Le pouet répondu a peut-être été supprimé. Voulez-vous le supprimer de votre référence ?",
+          "title": "Le pouet réponse est introuvable",
+          "description": "Le pouet réponse a peut-être été supprimé. Voulez-vous le supprimer de votre référence ?",
           "confirm": "Supprimer la référence"
         }
       }
@@ -62,7 +62,7 @@
           }
         },
         "emojis": {
-          "accessibilityHint": "Tapotez pour ajouter des émojis au pouet"
+          "accessibilityHint": "Appuyez pour ajouter des émojis au pouet"
         },
         "poll": {
           "option": {
@@ -90,7 +90,7 @@
             }
           },
           "expiration": {
-            "heading": "Validité",
+            "heading": "Durée",
             "options": {
               "300": "5 minutes",
               "1800": "30 minutes",
@@ -106,7 +106,7 @@
       "actions": {
         "attachment": {
           "accessibilityLabel": "Téléchargez une pièce-jointe",
-          "accessibilityHint": "La fonction de sondage sera désactivée lorsqu'il y a une pièce jointe",
+          "accessibilityHint": "La fonction de sondage sera désactivée s'il y a une pièce jointe",
           "failed": {
             "alert": {
               "title": "Le téléchargement a échoué",
diff --git a/src/i18n/fr/screens/tabs.json b/src/i18n/fr/screens/tabs.json
index 5a207b26..14504196 100644
--- a/src/i18n/fr/screens/tabs.json
+++ b/src/i18n/fr/screens/tabs.json
@@ -3,15 +3,15 @@
     "local": {
       "name": "Suit",
       "options": {
-        "showBoosts": "",
-        "showReplies": ""
+        "showBoosts": "Afficher les boosts",
+        "showReplies": "Afficher les réponses"
       }
     },
     "public": {
       "segments": {
         "federated": "Fédéré",
         "local": "Local",
-        "trending": ""
+        "trending": "Tendance"
       }
     },
     "notifications": {
@@ -28,7 +28,7 @@
     "filters": {
       "accessibilityLabel": "Filtrer",
       "accessibilityHint": "Filtrer les types de notifications affichés",
-      "title": "",
+      "title": "Afficher les notifications",
       "options": {
         "follow": "$t(screenTabs:me.push.follow.heading)",
         "follow_request": "Demande d'abonnement",
@@ -55,7 +55,7 @@
         "name": "Favoris"
       },
       "followedTags": {
-        "name": ""
+        "name": "Hashtags suivis"
       },
       "fontSize": {
         "name": "Taille de la police de Pouet"
@@ -67,25 +67,25 @@
         "name": "Liste : {{list}}"
       },
       "listAccounts": {
-        "name": ""
+        "name": "Utilisateurs dans la liste : {{list}}"
       },
       "listAdd": {
-        "name": ""
+        "name": "Créer une liste"
       },
       "listEdit": {
-        "name": ""
+        "name": "Modifier les détails de la liste"
       },
       "lists": {
         "name": "Listes"
       },
       "push": {
-        "name": "Push de Notification"
+        "name": "Push de notification"
       },
       "profile": {
         "name": "Modifier le profil"
       },
       "profileName": {
-        "name": "Editer le nom d'affichage"
+        "name": "Éditer le nom d'affichage"
       },
       "profileNote": {
         "name": "Éditer la description"
@@ -114,33 +114,33 @@
       }
     },
     "listAccounts": {
-      "heading": "",
-      "error": "",
-      "empty": ""
+      "heading": "Gérer les utilisateurs",
+      "error": "Supprimer l'utilisateur de la liste",
+      "empty": "Aucun utilisateur ajouté dans cette liste"
     },
     "listEdit": {
-      "heading": "",
-      "title": "",
+      "heading": "Modifier les détails de la liste",
+      "title": "Titre",
       "repliesPolicy": {
-        "heading": "",
+        "heading": "Montrer les réponses à :",
         "options": {
-          "none": "",
-          "list": "",
-          "followed": ""
+          "none": "Personne",
+          "list": "Un membre de la liste",
+          "followed": "N'importe quel utilisateur suivi"
         }
       }
     },
     "listDelete": {
-      "heading": "",
+      "heading": "Supprimer la liste",
       "confirm": {
-        "title": "",
-        "message": ""
+        "title": "Supprimer la liste \"{{list}}\" ?",
+        "message": "Cette action ne peut être annulé."
       }
     },
     "profile": {
       "feedback": {
         "succeed": "{{type}} mis à jour",
-        "failed": "{{type}} Échec de la mise à jour, veuillez ré-essayer"
+        "failed": "La mise à jour de {{type}} a échoué, veuillez réessayer"
       },
       "root": {
         "name": {
@@ -178,13 +178,13 @@
           "description": "Nécessite que vous approuviez manuellement chaque abonné·e"
         },
         "bot": {
-          "title": "Compte Bot",
+          "title": "Compte bot",
           "description": "Ce compte effectue principalement des actions automatisées et peut ne pas être surveillé"
         }
       },
       "fields": {
         "group": "Groupe {{index}}",
-        "label": "Étiquette",
+        "label": "Libellé",
         "content": "Contenu"
       },
       "mediaSelectionFailed": "Le traitement de l'image a échoué. Veuillez réessayer."
@@ -196,8 +196,8 @@
         "settings": "Activer dans les paramètres"
       },
       "missingServerKey": {
-        "message": "",
-        "description": ""
+        "message": "Le serveur n'est pas configuré pour le push",
+        "description": "Veuillez contacter l'administrateur de votre serveur pour configurer le support push"
       },
       "global": {
         "heading": "Activer pour {{acct}}",
@@ -205,13 +205,13 @@
       },
       "decode": {
         "heading": "Détails du message",
-        "description": "Les messages acheminés par le serveur de tooot sont chiffrés, mais vous pouvez choisir de décoder le message sur le serveur. Le code source de notre serveur est open source et aucune politique de log."
+        "description": "Les messages acheminés par le serveur de tooot sont chiffrés, mais vous pouvez choisir de décoder le message sur le serveur. Le code source de notre serveur est open source et il n'y a aucune politique de log."
       },
       "default": {
         "heading": "Par défaut"
       },
       "follow": {
-        "heading": "Nouvel abonné"
+        "heading": "Nouveau⋅elle abonné⋅e"
       },
       "follow_request": {
         "heading": "Demande d'abonnement"
@@ -229,16 +229,16 @@
         "heading": "Mise à jour du sondage"
       },
       "status": {
-        "heading": "Pouet des utilisateurs inscrits"
+        "heading": "Pouet des utilisateurs auxquels vous êtes abonnés"
       },
       "update": {
-        "heading": ""
+        "heading": "Le reblog a été édité"
       },
       "admin.sign_up": {
-        "heading": ""
+        "heading": "Admin : s'inscrire"
       },
       "admin.report": {
-        "heading": ""
+        "heading": "Admin : signalement"
       },
       "howitworks": "Apprenez comment cela fonctionne"
     },
@@ -261,7 +261,7 @@
         "button": "Se déconnecter",
         "alert": {
           "title": "Déconnexion?",
-          "message": "Après vous être déconnecté, vous devez vous reconnecter",
+          "message": "Après vous être déconnecté, vous devrez vous reconnecter",
           "buttons": {
             "logout": "Déconnexion"
           }
@@ -317,7 +317,7 @@
       "contact": {
         "heading": "Contacter tooot"
       },
-      "version": "Version {{version}}",
+      "version": "Version v{{version}}",
       "instanceVersion": "Version de Mastodon v{{version}}"
     },
     "switch": {
@@ -346,12 +346,12 @@
       "suspended": "Compte suspendu par les modérateurs de votre serveur"
     },
     "accountInLists": {
-      "name": "",
-      "inLists": "",
-      "notInLists": ""
+      "name": "Listes de @{{username}}",
+      "inLists": "Dans les listes",
+      "notInLists": "Autres listes"
     },
     "attachments": {
-      "name": ""
+      "name": "Média de <0 /><1></1>"
     },
     "hashtag": {
       "follow": "Suivre",
@@ -377,7 +377,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "Tags tendance"
         }
       },
       "sections": {
@@ -399,7 +399,7 @@
         "reblogged_by": "{{count}} boosté",
         "favourited_by": "{{count}} mis en favori"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "Les résultats d'une instance distante sont incomplets"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/it/common.json b/src/i18n/it/common.json
index 32526501..50ebf7be 100644
--- a/src/i18n/it/common.json
+++ b/src/i18n/it/common.json
@@ -7,7 +7,8 @@
     "continue": "Continua",
     "create": "",
     "delete": "",
-    "done": ""
+    "done": "",
+    "confirm": "Ho capito"
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizzata {{emoji}}"
diff --git a/src/i18n/it/components/contextMenu.json b/src/i18n/it/components/contextMenu.json
index d3777054..94e357be 100644
--- a/src/i18n/it/components/contextMenu.json
+++ b/src/i18n/it/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Blocca utente",
-      "action_true": "Sblocca utente"
+      "action_true": "Sblocca utente",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": ""
+      "action": "",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Blocca istanza {{instance}}",
       "alert": {
         "title": "Confermi di voler bloccare l'istanza {{instance}}?",
-        "message": "Sarebbe meglio mutare o bloccare singoli utenti.\n\nSe blocchi un'istanza, tutti i suoi contenuti a te relativi, inclusi tutti i tuoi seguaci da questa, saranno rimossi.",
-        "buttons": {
-          "confirm": "Ho capito"
-        }
+        "message": "Sarebbe meglio mutare o bloccare singoli utenti.\n\nSe blocchi un'istanza, tutti i suoi contenuti a te relativi, inclusi tutti i tuoi seguaci da questa, saranno rimossi."
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Cancella toot",
       "alert": {
         "title": "Conferma?",
-        "message": "Tutti i retoot, gli apprezzamenti, e le risposte, saranno cancellati.",
-        "buttons": {
-          "confirm": "Ho capito"
-        }
+        "message": "Tutti i retoot, gli apprezzamenti, e le risposte, saranno cancellati."
       }
     },
     "deleteEdit": {
       "action": "Cancella e ripubblica toot",
       "alert": {
         "title": "Confermi cancellazione e ripubblicazione?",
-        "message": "Tutti i retoot, gli apprezzamenti, e le risposte, saranno cancellati.",
-        "buttons": {
-          "confirm": "Ho capito"
-        }
+        "message": "Tutti i retoot, gli apprezzamenti, e le risposte, saranno cancellati."
       }
     },
     "mute": {
diff --git a/src/i18n/it/components/instance.json b/src/i18n/it/components/instance.json
index b69f1f9f..ccafd963 100644
--- a/src/i18n/it/components/instance.json
+++ b/src/i18n/it/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": ""
     },
+    "whitelisted": "",
     "button": "Accedi",
     "information": {
       "name": "Nome",
diff --git a/src/i18n/it/components/timeline.json b/src/i18n/it/components/timeline.json
index ae7895be..8171c496 100644
--- a/src/i18n/it/components/timeline.json
+++ b/src/i18n/it/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Contenuto nascosto"
     },
-    "filtered": "Filtrato: {{phrase}}.",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "Leggi la conversazione",
     "translate": {
       "default": "Traduci",
diff --git a/src/i18n/it/screens.json b/src/i18n/it/screens.json
index a06decd7..4f896108 100644
--- a/src/i18n/it/screens.json
+++ b/src/i18n/it/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Tutela della privacy",
-    "message": "Per favore, non rivelare l'identità degli altri utenti (nome, foto profilo, ecc..). Grazie!",
-    "button": "Ho capito"
+    "message": "Per favore, non rivelare l'identità degli altri utenti (nome, foto profilo, ecc..). Grazie!"
   },
   "localCorrupt": {
     "message": "La sessione è scaduta, devi riaccedere"
diff --git a/src/i18n/ja/common.json b/src/i18n/ja/common.json
index f774e735..7d5733d7 100644
--- a/src/i18n/ja/common.json
+++ b/src/i18n/ja/common.json
@@ -5,9 +5,10 @@
     "cancel": "キャンセル",
     "discard": "変更を破棄",
     "continue": "続ける",
-    "create": "",
+    "create": "作成",
     "delete": "削除",
-    "done": "完了"
+    "done": "完了",
+    "confirm": "確認"
   },
   "customEmoji": {
     "accessibilityLabel": "カスタム絵文字 {{emoji}}"
diff --git a/src/i18n/ja/components/contextMenu.json b/src/i18n/ja/components/contextMenu.json
index 861a4043..10399e65 100644
--- a/src/i18n/ja/components/contextMenu.json
+++ b/src/i18n/ja/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "ユーザーをブロック",
-      "action_true": "ユーザーのブロックを解除"
+      "action_true": "ユーザーのブロックを解除",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "ユーザーの報告とブロック"
+      "action": "ユーザーの報告とブロック",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "インスタンスをブロック {{instance}}",
       "alert": {
         "title": "インスタンス {{instance}} をブロックしますか？",
-        "message": "ほとんどの場合、特定のユーザーをミュートまたはブロックすることができます。\n\nインスタンスをブロックすると、このインスタンスからフォロワーを含むすべてのコンテンツが削除されます！",
-        "buttons": {
-          "confirm": "確定"
-        }
+        "message": "ほとんどの場合、特定のユーザーをミュートまたはブロックすることができます。\n\nインスタンスをブロックすると、このインスタンスからフォロワーを含むすべてのコンテンツが削除されます！"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "トゥートを削除",
       "alert": {
         "title": "削除しますか？",
-        "message": "この投稿へのすべてのお気に入り登録やブーストは消去され、すべての返信は孤立することになります。",
-        "buttons": {
-          "confirm": "確定"
-        }
+        "message": "この投稿へのすべてのお気に入り登録やブーストは消去され、すべての返信は孤立することになります。"
       }
     },
     "deleteEdit": {
       "action": "トゥートを削除し、再投稿する",
       "alert": {
         "title": "削除して再投稿しますか？",
-        "message": "この投稿へのすべてのお気に入り登録やブーストは消去され、すべての返信は孤立することになります。",
-        "buttons": {
-          "confirm": "確定"
-        }
+        "message": "この投稿へのすべてのお気に入り登録やブーストは消去され、すべての返信は孤立することになります。"
       }
     },
     "mute": {
diff --git a/src/i18n/ja/components/instance.json b/src/i18n/ja/components/instance.json
index 6f6e662d..08468322 100644
--- a/src/i18n/ja/components/instance.json
+++ b/src/i18n/ja/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "インスタンスのドメイン"
     },
+    "whitelisted": "",
     "button": "ログイン",
     "information": {
       "name": "名前",
diff --git a/src/i18n/ja/components/timeline.json b/src/i18n/ja/components/timeline.json
index 519101c3..20171987 100644
--- a/src/i18n/ja/components/timeline.json
+++ b/src/i18n/ja/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "内容を非表示にする"
     },
-    "filtered": "フィルター: {{phrase}}.",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "スレッドを読む",
     "translate": {
       "default": "翻訳",
diff --git a/src/i18n/ja/screens.json b/src/i18n/ja/screens.json
index bf9acc39..0bf7cfed 100644
--- a/src/i18n/ja/screens.json
+++ b/src/i18n/ja/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "プライバシー保護",
-    "message": "ユーザー名やアバターなど、他のユーザーを特定する情報は公開しないでください。",
-    "button": "確認"
+    "message": "ユーザー名やアバターなど、他のユーザーを特定する情報は公開しないでください。"
   },
   "localCorrupt": {
     "message": "ログインの有効期限が切れました。もう一度ログインしてください。"
diff --git a/src/i18n/ko/common.json b/src/i18n/ko/common.json
index ce49034d..3c597c60 100644
--- a/src/i18n/ko/common.json
+++ b/src/i18n/ko/common.json
@@ -5,9 +5,10 @@
     "cancel": "취소",
     "discard": "취소",
     "continue": "계속",
-    "create": "",
+    "create": "생성",
     "delete": "삭제",
-    "done": "완료"
+    "done": "완료",
+    "confirm": "확인"
   },
   "customEmoji": {
     "accessibilityLabel": "커스텀 에모지 {{emoji}}"
diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json
index 5033a27a..d9c71ce0 100644
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "사용자 차단",
-      "action_true": "사용자 차단 해제"
+      "action_true": "사용자 차단 해제",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "사용자 신고 및 차단"
+      "action": "사용자 신고 및 차단",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "{{instance}} 인스턴스 차단",
       "alert": {
         "title": "정말 {{instance}} 인스턴스를 차단할까요?",
-        "message": "보통은 사용자 뮤트나 차단으로 충분해요.\n\n인스턴스를 차단하면, 팔로워를 포함한 인스턴스의 모든 콘텐츠가 삭제됩니다!",
-        "buttons": {
-          "confirm": "확인"
-        }
+        "message": "보통은 사용자 뮤트나 차단으로 충분해요.\n\n인스턴스를 차단하면, 팔로워를 포함한 인스턴스의 모든 콘텐츠가 삭제됩니다!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "툿 삭제",
       "alert": {
         "title": "정말 삭제할까요?",
-        "message": "답장을 포함한 모든 부스트와 즐겨찾기가 지워져요.",
-        "buttons": {
-          "confirm": "확인"
-        }
+        "message": "답장을 포함한 모든 부스트와 즐겨찾기가 지워져요."
       }
     },
     "deleteEdit": {
       "action": "툿 삭제 후 다시 게시",
       "alert": {
         "title": "툿을 정말 삭제하고 다시 게시할까요?",
-        "message": "답장을 포함한 모든 부스트와 즐겨찾기가 지워져요.",
-        "buttons": {
-          "confirm": "확인"
-        }
+        "message": "답장을 포함한 모든 부스트와 즐겨찾기가 지워져요."
       }
     },
     "mute": {
diff --git a/src/i18n/ko/components/instance.json b/src/i18n/ko/components/instance.json
index 6b717955..e97405e9 100644
--- a/src/i18n/ko/components/instance.json
+++ b/src/i18n/ko/components/instance.json
@@ -1,8 +1,9 @@
 {
   "server": {
     "textInput": {
-      "placeholder": ""
+      "placeholder": "인스턴스 도메인"
     },
+    "whitelisted": "화이트리스트 등록이 필요한 인스턴스에서 tooot이 정보를 읽어올 수 없는 문제일 수 있습니다.",
     "button": "로그인",
     "information": {
       "name": "이름",
diff --git a/src/i18n/ko/components/timeline.json b/src/i18n/ko/components/timeline.json
index 1da04abd..b1f0074a 100644
--- a/src/i18n/ko/components/timeline.json
+++ b/src/i18n/ko/components/timeline.json
@@ -31,8 +31,8 @@
         "notification": "{{name}} 님이 내 툿을 부스트했어요"
       },
       "update": "부스트한 툿이 수정됨",
-      "admin.sign_up": "",
-      "admin.report": ""
+      "admin.sign_up": "{{name}} 님이 인스턴스에 가입함",
+      "admin.report": "{{name}} 님의 신고:"
     },
     "actions": {
       "reply": {
@@ -55,7 +55,7 @@
         "accessibilityLabel": "툿 북마크에 추가",
         "function": "툿 북마크"
       },
-      "openReport": ""
+      "openReport": "신고 열기"
     },
     "actionsUsers": {
       "reblogged_by": {
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "숨겨진 콘텐츠"
     },
-    "filtered": "필터: {{phrase}}.",
+    "filtered": {
+      "reveal": "무시하고 보기",
+      "match_v1": "필터됨: {{phrase}}.",
+      "match_v2_one": "{{filters}}에 의해 필터됨.",
+      "match_v2_other": "{{count}}개의 필터 {{filters}}에 의해 필터됨."
+    },
     "fullConversation": "대화 보기",
     "translate": {
       "default": "번역",
diff --git a/src/i18n/ko/screens.json b/src/i18n/ko/screens.json
index e3390238..69f94007 100644
--- a/src/i18n/ko/screens.json
+++ b/src/i18n/ko/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "개인정보 보호",
-    "message": "다른 사용자의 이름이나, 프로필 사진 등의 정보를 유출하지 말아주세요. 고마워요!",
-    "button": "확인"
+    "message": "다른 사용자의 이름이나, 프로필 사진 등의 정보를 유출하지 말아주세요. 고마워요!"
   },
   "localCorrupt": {
     "message": "로그인이 만료되었어요. 다시 로그인해주세요"
diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json
index 6132afc7..292eef98 100644
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -3,15 +3,15 @@
     "local": {
       "name": "팔로우 중",
       "options": {
-        "showBoosts": "",
-        "showReplies": ""
+        "showBoosts": "부스트 표시",
+        "showReplies": "답글 표시"
       }
     },
     "public": {
       "segments": {
         "federated": "연합",
         "local": "로컬",
-        "trending": ""
+        "trending": "유행"
       }
     },
     "notifications": {
@@ -28,7 +28,7 @@
     "filters": {
       "accessibilityLabel": "필터",
       "accessibilityHint": "받는 알림 종류 선택",
-      "title": "",
+      "title": "알림 표시",
       "options": {
         "follow": "$t(screenTabs:me.push.follow.heading)",
         "follow_request": "팔로우 요청",
@@ -55,7 +55,7 @@
         "name": "즐겨찾기"
       },
       "followedTags": {
-        "name": ""
+        "name": "팔로우 중인 해시태그"
       },
       "fontSize": {
         "name": "툿 폰트 크기"
@@ -235,10 +235,10 @@
         "heading": "부스트한 툿이 수정됨"
       },
       "admin.sign_up": {
-        "heading": ""
+        "heading": "관리자: 신규 가입"
       },
       "admin.report": {
-        "heading": ""
+        "heading": "관리자: 신고 요청"
       },
       "howitworks": "메시지 라우팅 방식 더 알아보기"
     },
@@ -399,7 +399,7 @@
         "reblogged_by": "{{count}} 부스트",
         "favourited_by": "{{count}} 즐겨찾기"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "원격 인스턴스의 응답 형태가 올바르지 않아요"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/nl/common.json b/src/i18n/nl/common.json
index e9a502bd..7c066c85 100644
--- a/src/i18n/nl/common.json
+++ b/src/i18n/nl/common.json
@@ -7,7 +7,8 @@
     "continue": "Ga verder",
     "create": "Maak",
     "delete": "Verwijder",
-    "done": "Gereed"
+    "done": "Gereed",
+    "confirm": "Bevestig"
   },
   "customEmoji": {
     "accessibilityLabel": "Aangepaste emoji {{emoji}}"
diff --git a/src/i18n/nl/components/contextMenu.json b/src/i18n/nl/components/contextMenu.json
index 52c73fe9..99679a84 100644
--- a/src/i18n/nl/components/contextMenu.json
+++ b/src/i18n/nl/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Gebruiker blokkeren",
-      "action_true": "Gebruiker deblokkeren"
+      "action_true": "Gebruiker deblokkeren",
+      "alert": {
+        "title": "Bevestig blokkeren van @{{username}} ?"
+      }
     },
     "reports": {
-      "action": "Rapporteren en blokkeren"
+      "action": "Rapporteren en blokkeren",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Blokkeer instantie {{instance}}",
       "alert": {
         "title": "Bevestig blokkeren van {{instance}} ?",
-        "message": "Meestal kunt u bepaalde gebruiker dempen of blokkeren.\n\nNa het blokkeren van de instantie, wordt alle inhoud inclusief volgers van deze instantie verwijderd!",
-        "buttons": {
-          "confirm": "Bevestig"
-        }
+        "message": "Meestal kunt u bepaalde gebruiker dempen of blokkeren.\n\nNa het blokkeren van de instantie, wordt alle inhoud inclusief volgers van deze instantie verwijderd!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Toot verwijderen",
       "alert": {
         "title": "Verwijderen bevestigen?",
-        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden.",
-        "buttons": {
-          "confirm": "Bevestig"
-        }
+        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden."
       }
     },
     "deleteEdit": {
       "action": "Toot verwijderen en opnieuw plaatsen",
       "alert": {
         "title": "Bevestig verwijderen en opnieuw plaatsen?",
-        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden.",
-        "buttons": {
-          "confirm": "Bevestig"
-        }
+        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden."
       }
     },
     "mute": {
diff --git a/src/i18n/nl/components/instance.json b/src/i18n/nl/components/instance.json
index 3f6bbf6a..7a4f4392 100644
--- a/src/i18n/nl/components/instance.json
+++ b/src/i18n/nl/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "Domeinnaam van instantie"
     },
+    "whitelisted": "",
     "button": "Inloggen",
     "information": {
       "name": "Naam",
diff --git a/src/i18n/nl/components/timeline.json b/src/i18n/nl/components/timeline.json
index 6fe4786b..c3368cd1 100644
--- a/src/i18n/nl/components/timeline.json
+++ b/src/i18n/nl/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Verborgen inhoud"
     },
-    "filtered": "Gefilterd: {{phrase}}.",
+    "filtered": {
+      "reveal": "Toch weergeven",
+      "match_v1": "Gefilterd: {{phrase}}.",
+      "match_v2_one": "Gefilterd door {{filters}}.",
+      "match_v2_other": "Gefilterd door {{count}} filters, {{filters}}."
+    },
     "fullConversation": "Gesprekken lezen",
     "translate": {
       "default": "Vertaal",
diff --git a/src/i18n/nl/screens.json b/src/i18n/nl/screens.json
index 264a63ba..4adfdc92 100644
--- a/src/i18n/nl/screens.json
+++ b/src/i18n/nl/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Privacy Bescherming",
-    "message": "Gelieve de identiteit van een andere gebruiker niet openbaar te maken, zoals gebruikersnaam of avatar en meer. Bedankt!",
-    "button": "Bevestig"
+    "message": "Gelieve de identiteit van een andere gebruiker niet openbaar te maken, zoals gebruikersnaam of avatar en meer. Bedankt!"
   },
   "localCorrupt": {
     "message": "Sessie verlopen. Log opnieuw in"
diff --git a/src/i18n/pl/common.json b/src/i18n/pl/common.json
index fe4bfc45..0228f7cc 100644
--- a/src/i18n/pl/common.json
+++ b/src/i18n/pl/common.json
@@ -7,7 +7,8 @@
     "continue": "Dalej",
     "create": "",
     "delete": "Usuń",
-    "done": ""
+    "done": "",
+    "confirm": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Własne emoji {{emoji}}"
diff --git a/src/i18n/pl/components/contextMenu.json b/src/i18n/pl/components/contextMenu.json
index 69478c88..6988f875 100644
--- a/src/i18n/pl/components/contextMenu.json
+++ b/src/i18n/pl/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Zablokuj użytkownika",
-      "action_true": "Odblokuj użytkownika"
+      "action_true": "Odblokuj użytkownika",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Zgłoś i zablokuj"
+      "action": "Zgłoś i zablokuj",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Zablokuj instancję {{instance}}",
       "alert": {
         "title": "Na pewno zablokować {{instance}}?",
-        "message": "Zazwyczaj wycisza się (albo blokuje) konkretnych użytkowników. \n\nGdy zablokujesz instancję, cała jej zawartość (włączając np. obserwujące Cię osoby, które do niej należą) zostanie usunięta!",
-        "buttons": {
-          "confirm": "Na pewno?"
-        }
+        "message": "Zazwyczaj wycisza się (albo blokuje) konkretnych użytkowników. \n\nGdy zablokujesz instancję, cała jej zawartość (włączając np. obserwujące Cię osoby, które do niej należą) zostanie usunięta!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Usuń wpis",
       "alert": {
         "title": "Na pewno usunąć?",
-        "message": "Wszystkie podbite i polubione wpisy zostaną wyczyszczone - wraz z odpowiedziami.",
-        "buttons": {
-          "confirm": "Na pewno?"
-        }
+        "message": "Wszystkie podbite i polubione wpisy zostaną wyczyszczone - wraz z odpowiedziami."
       }
     },
     "deleteEdit": {
       "action": "",
       "alert": {
         "title": "",
-        "message": "",
-        "buttons": {
-          "confirm": ""
-        }
+        "message": ""
       }
     },
     "mute": {
diff --git a/src/i18n/pl/components/instance.json b/src/i18n/pl/components/instance.json
index 9ab20d42..6de39ff0 100644
--- a/src/i18n/pl/components/instance.json
+++ b/src/i18n/pl/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": ""
     },
+    "whitelisted": "",
     "button": "",
     "information": {
       "name": "",
diff --git a/src/i18n/pl/components/timeline.json b/src/i18n/pl/components/timeline.json
index d823a1d1..5b8535cc 100644
--- a/src/i18n/pl/components/timeline.json
+++ b/src/i18n/pl/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": ""
     },
-    "filtered": "",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "",
     "translate": {
       "default": "",
diff --git a/src/i18n/pl/screens.json b/src/i18n/pl/screens.json
index 59b67261..35d8636e 100644
--- a/src/i18n/pl/screens.json
+++ b/src/i18n/pl/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "",
-    "message": "",
-    "button": ""
+    "message": ""
   },
   "localCorrupt": {
     "message": ""
diff --git a/src/i18n/pt_BR/common.json b/src/i18n/pt_BR/common.json
index 64a8c15e..2982cba1 100644
--- a/src/i18n/pt_BR/common.json
+++ b/src/i18n/pt_BR/common.json
@@ -7,7 +7,8 @@
     "continue": "Continuar",
     "create": "",
     "delete": "",
-    "done": ""
+    "done": "",
+    "confirm": "Confirmar"
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizado {{emoji}}"
diff --git a/src/i18n/pt_BR/components/contextMenu.json b/src/i18n/pt_BR/components/contextMenu.json
index 16215c48..44af8e51 100644
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Bloquear usuário",
-      "action_true": "Desbloquear usuário"
+      "action_true": "Desbloquear usuário",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": ""
+      "action": "",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Bloquear a instância {{instance}}",
       "alert": {
         "title": "Confirmar o bloqueio da instância {{instance}}?",
-        "message": "Na maioria das vezes, você pode silenciar ou bloquear determinado usuário.\n\nDepois de bloquear a instância, todo seu conteúdo, incluindo seguidores, será removido!",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Na maioria das vezes, você pode silenciar ou bloquear determinado usuário.\n\nDepois de bloquear a instância, todo seu conteúdo, incluindo seguidores, será removido!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Remover toot",
       "alert": {
         "title": "Confirme a exclusão?",
-        "message": "Todos os boosts e favoritos serão limpos, incluindo todas as respostas.",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Todos os boosts e favoritos serão limpos, incluindo todas as respostas."
       }
     },
     "deleteEdit": {
       "action": "Excluir toot e repostar",
       "alert": {
         "title": "Confirmar exclusão e repostagem?",
-        "message": "Todos os boosts e favoritos serão limpos, incluindo todas as respostas.",
-        "buttons": {
-          "confirm": "Confirmar"
-        }
+        "message": "Todos os boosts e favoritos serão limpos, incluindo todas as respostas."
       }
     },
     "mute": {
diff --git a/src/i18n/pt_BR/components/instance.json b/src/i18n/pt_BR/components/instance.json
index 22e4347c..7392bbbd 100644
--- a/src/i18n/pt_BR/components/instance.json
+++ b/src/i18n/pt_BR/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": ""
     },
+    "whitelisted": "",
     "button": "Entrar",
     "information": {
       "name": "Nome",
diff --git a/src/i18n/pt_BR/components/timeline.json b/src/i18n/pt_BR/components/timeline.json
index edb698f3..c5557beb 100644
--- a/src/i18n/pt_BR/components/timeline.json
+++ b/src/i18n/pt_BR/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Conteúdo oculto"
     },
-    "filtered": "",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "Ler conversas",
     "translate": {
       "default": "Traduzir",
diff --git a/src/i18n/pt_BR/screens.json b/src/i18n/pt_BR/screens.json
index 3adf992a..c88b0f81 100644
--- a/src/i18n/pt_BR/screens.json
+++ b/src/i18n/pt_BR/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Proteção de privacidade",
-    "message": "Por favor, não divulgue a identidade de outros usuários, como nome de usuário, avatar, etc. Obrigado!",
-    "button": "Confirmar"
+    "message": "Por favor, não divulgue a identidade de outros usuários, como nome de usuário, avatar, etc. Obrigado!"
   },
   "localCorrupt": {
     "message": "Sua sessão expirou. Por favor, faça o login novamente"
diff --git a/src/i18n/ru/common.json b/src/i18n/ru/common.json
new file mode 100644
index 00000000..be1ba7cd
--- /dev/null
+++ b/src/i18n/ru/common.json
@@ -0,0 +1,32 @@
+{
+  "buttons": {
+    "OK": "",
+    "apply": "",
+    "cancel": "",
+    "discard": "",
+    "continue": "",
+    "create": "",
+    "delete": "",
+    "done": "",
+    "confirm": ""
+  },
+  "customEmoji": {
+    "accessibilityLabel": ""
+  },
+  "message": {
+    "success": {
+      "message": ""
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": ""
+    }
+  },
+  "separator": "",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/contextMenu.json b/src/i18n/ru/components/contextMenu.json
new file mode 100644
index 00000000..af54f593
--- /dev/null
+++ b/src/i18n/ru/components/contextMenu.json
@@ -0,0 +1,82 @@
+{
+  "accessibilityHint": "",
+  "account": {
+    "title": "",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "block": {
+      "action_false": "",
+      "action_true": "",
+      "alert": {
+        "title": ""
+      }
+    },
+    "reports": {
+      "action": "",
+      "alert": {
+        "title": ""
+      }
+    }
+  },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
+  "copy": {
+    "action": "",
+    "succeed": ""
+  },
+  "instance": {
+    "title": "",
+    "block": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    }
+  },
+  "share": {
+    "status": {
+      "action": ""
+    },
+    "account": {
+      "action": ""
+    }
+  },
+  "status": {
+    "title": "",
+    "edit": {
+      "action": ""
+    },
+    "delete": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "deleteEdit": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "pin": {
+      "action_false": "",
+      "action_true": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/emojis.json b/src/i18n/ru/components/emojis.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/ru/components/emojis.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/i18n/ru/components/instance.json b/src/i18n/ru/components/instance.json
new file mode 100644
index 00000000..6de39ff0
--- /dev/null
+++ b/src/i18n/ru/components/instance.json
@@ -0,0 +1,27 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": ""
+    },
+    "whitelisted": "",
+    "button": "",
+    "information": {
+      "name": "",
+      "accounts": "",
+      "statuses": "",
+      "domains": ""
+    },
+    "disclaimer": {
+      "base": ""
+    },
+    "terms": {
+      "base": ""
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "",
+      "message": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/mediaSelector.json b/src/i18n/ru/components/mediaSelector.json
new file mode 100644
index 00000000..afd894e4
--- /dev/null
+++ b/src/i18n/ru/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "",
+  "message": "",
+  "options": {
+    "image": "",
+    "image_max": "",
+    "video": "",
+    "video_max": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/parse.json b/src/i18n/ru/components/parse.json
new file mode 100644
index 00000000..c2dc48a6
--- /dev/null
+++ b/src/i18n/ru/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "",
+    "expanded": "",
+    "moreLines": "",
+    "defaultHint": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/relationship.json b/src/i18n/ru/components/relationship.json
new file mode 100644
index 00000000..ccf2aa7b
--- /dev/null
+++ b/src/i18n/ru/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": ""
+  },
+  "block": {
+    "function": ""
+  },
+  "button": {
+    "error": "",
+    "blocked_by": "",
+    "blocking": "",
+    "following": "",
+    "requested": "",
+    "default": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/components/timeline.json b/src/i18n/ru/components/timeline.json
new file mode 100644
index 00000000..c18b9d6b
--- /dev/null
+++ b/src/i18n/ru/components/timeline.json
@@ -0,0 +1,160 @@
+{
+  "empty": {
+    "error": {
+      "message": "",
+      "button": ""
+    },
+    "success": {
+      "message": ""
+    }
+  },
+  "end": {
+    "message": ""
+  },
+  "lookback": {
+    "message": ""
+  },
+  "refresh": {
+    "fetchPreviousPage": "",
+    "refetch": ""
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "",
+      "favourite": "",
+      "status": "",
+      "follow": "",
+      "follow_request": "",
+      "poll": "",
+      "reblog": {
+        "default": "",
+        "notification": ""
+      },
+      "update": "",
+      "admin.sign_up": "",
+      "admin.report": ""
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": ""
+      },
+      "reblogged": {
+        "accessibilityLabel": "",
+        "function": "",
+        "options": {
+          "title": "",
+          "public": "",
+          "unlisted": ""
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "",
+        "function": ""
+      },
+      "bookmarked": {
+        "accessibilityLabel": "",
+        "function": ""
+      },
+      "openReport": ""
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "favourited_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "history": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text_one": "",
+        "text_other": ""
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": ""
+      },
+      "unsupported": {
+        "text": "",
+        "button": ""
+      }
+    },
+    "avatar": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "content": {
+      "expandHint": ""
+    },
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
+    "fullConversation": "",
+    "translate": {
+      "default": "",
+      "succeed": "",
+      "failed": "",
+      "source_not_supported": "",
+      "target_not_supported": ""
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": ""
+          },
+          "account": {
+            "accessibilityHint": ""
+          }
+        },
+        "application": "",
+        "edited": {
+          "accessibilityLabel": ""
+        },
+        "muted": {
+          "accessibilityLabel": ""
+        },
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": ""
+          },
+          "private": {
+            "accessibilityLabel": ""
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "",
+        "delete": {
+          "function": ""
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "",
+          "refresh": ""
+        },
+        "count": {
+          "voters_one": "",
+          "voters_other": "",
+          "votes_one": "",
+          "votes_other": ""
+        },
+        "expiration": {
+          "expired": "",
+          "until": ""
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens.json b/src/i18n/ru/screens.json
new file mode 100644
index 00000000..35d8636e
--- /dev/null
+++ b/src/i18n/ru/screens.json
@@ -0,0 +1,17 @@
+{
+  "screenshot": {
+    "title": "",
+    "message": ""
+  },
+  "localCorrupt": {
+    "message": ""
+  },
+  "pushError": {
+    "message": "",
+    "description": ""
+  },
+  "shareError": {
+    "imageNotSupported": "",
+    "videoNotSupported": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/accountSelection.json b/src/i18n/ru/screens/accountSelection.json
new file mode 100644
index 00000000..b16795a6
--- /dev/null
+++ b/src/i18n/ru/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "",
+  "content": {
+    "select_account": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/actions.json b/src/i18n/ru/screens/actions.json
new file mode 100644
index 00000000..96dce3a8
--- /dev/null
+++ b/src/i18n/ru/screens/actions.json
@@ -0,0 +1,7 @@
+{
+  "content": {
+    "altText": {
+      "heading": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/announcements.json b/src/i18n/ru/screens/announcements.json
new file mode 100644
index 00000000..95737a45
--- /dev/null
+++ b/src/i18n/ru/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "",
+  "content": {
+    "published": "",
+    "button": {
+      "read": "",
+      "unread": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/compose.json b/src/i18n/ru/screens/compose.json
new file mode 100644
index 00000000..2a078c68
--- /dev/null
+++ b/src/i18n/ru/screens/compose.json
@@ -0,0 +1,173 @@
+{
+  "heading": {
+    "left": {
+      "alert": {
+        "title": "",
+        "buttons": {
+          "save": "",
+          "delete": ""
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "",
+        "conversation": "",
+        "reply": "",
+        "deleteEdit": "",
+        "edit": "",
+        "share": ""
+      },
+      "alert": {
+        "default": {
+          "title": "",
+          "button": ""
+        },
+        "removeReply": {
+          "title": "",
+          "description": "",
+          "confirm": ""
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "",
+        "spoilerInput": {
+          "placeholder": ""
+        },
+        "textInput": {
+          "placeholder": "",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "",
+              "OK": ""
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "",
+          "remove": {
+            "accessibilityLabel": ""
+          },
+          "edit": {
+            "accessibilityLabel": ""
+          },
+          "upload": {
+            "accessibilityLabel": ""
+          }
+        },
+        "emojis": {
+          "accessibilityHint": ""
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "",
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            },
+            "increase": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            }
+          },
+          "multiple": {
+            "heading": "",
+            "options": {
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "expiration": {
+            "heading": "",
+            "options": {
+              "300": "",
+              "1800": "",
+              "3600": "",
+              "21600": "",
+              "86400": "",
+              "259200": "",
+              "604800": ""
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "",
+          "accessibilityHint": "",
+          "failed": {
+            "alert": {
+              "title": "",
+              "button": ""
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        },
+        "visibility": {
+          "accessibilityLabel": "",
+          "title": "",
+          "options": {
+            "public": "",
+            "unlisted": "",
+            "private": "",
+            "direct": ""
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": ""
+        },
+        "emoji": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        }
+      },
+      "drafts_one": "",
+      "drafts_other": ""
+    },
+    "editAttachment": {
+      "header": {
+        "title": "",
+        "right": {
+          "accessibilityLabel": "",
+          "failed": {
+            "title": "",
+            "button": ""
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "",
+          "placeholder": ""
+        },
+        "imageFocus": ""
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": ""
+      },
+      "warning": "",
+      "content": {
+        "accessibilityHint": "",
+        "textEmpty": ""
+      },
+      "checkAttachment": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/imageViewer.json b/src/i18n/ru/screens/imageViewer.json
new file mode 100644
index 00000000..17bba91e
--- /dev/null
+++ b/src/i18n/ru/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "options": {
+      "save": "",
+      "share": ""
+    },
+    "save": {
+      "succeed": "",
+      "failed": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ru/screens/tabs.json b/src/i18n/ru/screens/tabs.json
new file mode 100644
index 00000000..0decff11
--- /dev/null
+++ b/src/i18n/ru/screens/tabs.json
@@ -0,0 +1,405 @@
+{
+  "tabs": {
+    "local": {
+      "name": "",
+      "options": {
+        "showBoosts": "",
+        "showReplies": ""
+      }
+    },
+    "public": {
+      "segments": {
+        "federated": "",
+        "local": "",
+        "trending": ""
+      }
+    },
+    "notifications": {
+      "name": ""
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    }
+  },
+  "notifications": {
+    "filters": {
+      "accessibilityLabel": "",
+      "accessibilityHint": "",
+      "title": "",
+      "options": {
+        "follow": "",
+        "follow_request": "",
+        "favourite": "",
+        "reblog": "",
+        "mention": "",
+        "poll": "",
+        "status": "",
+        "update": "",
+        "admin.sign_up": "",
+        "admin.report": ""
+      }
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": ""
+      },
+      "conversations": {
+        "name": ""
+      },
+      "favourites": {
+        "name": ""
+      },
+      "followedTags": {
+        "name": ""
+      },
+      "fontSize": {
+        "name": ""
+      },
+      "language": {
+        "name": ""
+      },
+      "list": {
+        "name": ""
+      },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": ""
+      },
+      "push": {
+        "name": ""
+      },
+      "profile": {
+        "name": ""
+      },
+      "profileName": {
+        "name": ""
+      },
+      "profileNote": {
+        "name": ""
+      },
+      "profileFields": {
+        "name": ""
+      },
+      "settings": {
+        "name": ""
+      },
+      "webSettings": {
+        "name": ""
+      },
+      "switch": {
+        "name": ""
+      }
+    },
+    "fontSize": {
+      "demo": "",
+      "sizes": {
+        "S": "",
+        "M": "",
+        "L": "",
+        "XL": "",
+        "XXL": ""
+      }
+    },
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "",
+        "failed": ""
+      },
+      "root": {
+        "name": {
+          "title": ""
+        },
+        "avatar": {
+          "title": "",
+          "description": ""
+        },
+        "header": {
+          "title": "",
+          "description": ""
+        },
+        "note": {
+          "title": ""
+        },
+        "fields": {
+          "title": "",
+          "total_one": "",
+          "total_other": ""
+        },
+        "visibility": {
+          "title": "",
+          "options": {
+            "public": "",
+            "unlisted": "",
+            "private": ""
+          }
+        },
+        "sensitive": {
+          "title": ""
+        },
+        "lock": {
+          "title": "",
+          "description": ""
+        },
+        "bot": {
+          "title": "",
+          "description": ""
+        }
+      },
+      "fields": {
+        "group": "",
+        "label": "",
+        "content": ""
+      },
+      "mediaSelectionFailed": ""
+    },
+    "push": {
+      "notAvailable": "",
+      "enable": {
+        "direct": "",
+        "settings": ""
+      },
+      "missingServerKey": {
+        "message": "",
+        "description": ""
+      },
+      "global": {
+        "heading": "",
+        "description": ""
+      },
+      "decode": {
+        "heading": "",
+        "description": ""
+      },
+      "default": {
+        "heading": ""
+      },
+      "follow": {
+        "heading": ""
+      },
+      "follow_request": {
+        "heading": ""
+      },
+      "favourite": {
+        "heading": ""
+      },
+      "reblog": {
+        "heading": ""
+      },
+      "mention": {
+        "heading": ""
+      },
+      "poll": {
+        "heading": ""
+      },
+      "status": {
+        "heading": ""
+      },
+      "update": {
+        "heading": ""
+      },
+      "admin.sign_up": {
+        "heading": ""
+      },
+      "admin.report": {
+        "heading": ""
+      },
+      "howitworks": ""
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "",
+          "read": "",
+          "empty": ""
+        }
+      },
+      "push": {
+        "content_true": "",
+        "content_false": ""
+      },
+      "update": {
+        "title": ""
+      },
+      "logout": {
+        "button": "",
+        "alert": {
+          "title": "",
+          "message": "",
+          "buttons": {
+            "logout": ""
+          }
+        }
+      }
+    },
+    "settings": {
+      "fontsize": {
+        "heading": "",
+        "content": {
+          "S": "",
+          "M": "",
+          "L": "",
+          "XL": "",
+          "XXL": ""
+        }
+      },
+      "language": {
+        "heading": ""
+      },
+      "theme": {
+        "heading": "",
+        "options": {
+          "auto": "",
+          "light": "",
+          "dark": ""
+        }
+      },
+      "darkTheme": {
+        "heading": "",
+        "options": {
+          "lighter": "",
+          "darker": ""
+        }
+      },
+      "browser": {
+        "heading": "",
+        "options": {
+          "internal": "",
+          "external": ""
+        }
+      },
+      "staticEmoji": {
+        "heading": "",
+        "description": ""
+      },
+      "feedback": {
+        "heading": ""
+      },
+      "support": {
+        "heading": ""
+      },
+      "contact": {
+        "heading": ""
+      },
+      "version": "",
+      "instanceVersion": ""
+    },
+    "switch": {
+      "existing": "",
+      "new": ""
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "",
+        "accessibilityHint": ""
+      },
+      "followed_by": "",
+      "moved": "",
+      "created_at": "",
+      "summary": {
+        "statuses_count": "",
+        "following_count": "",
+        "followers_count": ""
+      },
+      "toots": {
+        "default": "",
+        "all": ""
+      },
+      "suspended": ""
+    },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
+    "attachments": {
+      "name": ""
+    },
+    "hashtag": {
+      "follow": "",
+      "unfollow": ""
+    },
+    "history": {
+      "name": ""
+    },
+    "search": {
+      "header": {
+        "prefix": "",
+        "placeholder": ""
+      },
+      "empty": {
+        "general": "",
+        "advanced": {
+          "header": "",
+          "example": {
+            "account": "",
+            "hashtag": "",
+            "statusLink": "",
+            "accountLink": ""
+          }
+        },
+        "trending": {
+          "tags": ""
+        }
+      },
+      "sections": {
+        "accounts": "",
+        "hashtags": "",
+        "statuses": ""
+      },
+      "notFound": ""
+    },
+    "toot": {
+      "name": ""
+    },
+    "users": {
+      "accounts": {
+        "following": "",
+        "followers": ""
+      },
+      "statuses": {
+        "reblogged_by": "",
+        "favourited_by": ""
+      },
+      "resultIncomplete": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/sv/common.json b/src/i18n/sv/common.json
index f1695c0c..072d9305 100644
--- a/src/i18n/sv/common.json
+++ b/src/i18n/sv/common.json
@@ -7,7 +7,8 @@
     "continue": "Fortsätt",
     "create": "Skapa",
     "delete": "Radera",
-    "done": "Klar"
+    "done": "Klar",
+    "confirm": "Bekräfta"
   },
   "customEmoji": {
     "accessibilityLabel": "Anpassad emoji {{emoji}}"
diff --git a/src/i18n/sv/components/contextMenu.json b/src/i18n/sv/components/contextMenu.json
index 94fa5534..7c1ee4d0 100644
--- a/src/i18n/sv/components/contextMenu.json
+++ b/src/i18n/sv/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Blockera användare",
-      "action_true": "Avblockera användare"
+      "action_true": "Avblockera användare",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Rapportera och blockera användare"
+      "action": "Rapportera och blockera användare",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Blockera instansen {{instance}}",
       "alert": {
         "title": "Bekräfta blockering av instansen {{instance}}?",
-        "message": "Oftast kan du tysta eller blockera vissa användare.\n\nEfter blockering av en instans kommer allt innehåll inklusive följare från denna instans att tas bort!",
-        "buttons": {
-          "confirm": "Bekräfta"
-        }
+        "message": "Oftast kan du tysta eller blockera vissa användare.\n\nEfter blockering av en instans kommer allt innehåll inklusive följare från denna instans att tas bort!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Radera inlägg",
       "alert": {
         "title": "Bekräfta radering?",
-        "message": "Alla boostar och favoritmarkeringar kommer tas bort, inklusive alla svar.",
-        "buttons": {
-          "confirm": "Bekräfta"
-        }
+        "message": "Alla boostar och favoritmarkeringar kommer tas bort, inklusive alla svar."
       }
     },
     "deleteEdit": {
       "action": "Radera inlägg och posta på nytt",
       "alert": {
         "title": "Bekräfta radera inlägg och posta på nytt?",
-        "message": "Alla boostar och favoritmarkeringar kommer tas bort, inklusive alla svar.",
-        "buttons": {
-          "confirm": "Bekräfta"
-        }
+        "message": "Alla boostar och favoritmarkeringar kommer tas bort, inklusive alla svar."
       }
     },
     "mute": {
diff --git a/src/i18n/sv/components/instance.json b/src/i18n/sv/components/instance.json
index b770b56f..bdb2d03f 100644
--- a/src/i18n/sv/components/instance.json
+++ b/src/i18n/sv/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "Domän för instansen"
     },
+    "whitelisted": "Detta kan vara en vitlistad server som tooot inte kan hämta data från innan du loggat in.",
     "button": "Logga in",
     "information": {
       "name": "Namn",
diff --git a/src/i18n/sv/components/timeline.json b/src/i18n/sv/components/timeline.json
index 9f9bf022..1513ca77 100644
--- a/src/i18n/sv/components/timeline.json
+++ b/src/i18n/sv/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Dolt innehåll"
     },
-    "filtered": "Filtrerat: {{phrase}}.",
+    "filtered": {
+      "reveal": "Visa ändå",
+      "match_v1": "Filtrerat: {{phrase}}.",
+      "match_v2_one": "Filtrerat av {{filters}}.",
+      "match_v2_other": "Filtrerat av {{count}} filter, {{filters}}."
+    },
     "fullConversation": "Läs konversationer",
     "translate": {
       "default": "Översätt",
diff --git a/src/i18n/sv/screens.json b/src/i18n/sv/screens.json
index 0e1578f3..01169fd3 100644
--- a/src/i18n/sv/screens.json
+++ b/src/i18n/sv/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Integritetsskydd",
-    "message": "Vänligen avslöja inte någon annan användares identitet, såsom användarnamn, profilbild etc. Tack!",
-    "button": "Bekräfta"
+    "message": "Vänligen avslöja inte någon annan användares identitet, såsom användarnamn, profilbild etc. Tack!"
   },
   "localCorrupt": {
     "message": "Inloggningen har gått ut. Försök att logga in igen"
diff --git a/src/i18n/uk/common.json b/src/i18n/uk/common.json
index af3dbb7b..d0063198 100644
--- a/src/i18n/uk/common.json
+++ b/src/i18n/uk/common.json
@@ -7,7 +7,8 @@
     "continue": "Продовжити",
     "create": "Створити",
     "delete": "Видалити",
-    "done": "Готово"
+    "done": "Готово",
+    "confirm": "Підтвердити"
   },
   "customEmoji": {
     "accessibilityLabel": "Власні емодзі {{emoji}}"
diff --git a/src/i18n/uk/components/contextMenu.json b/src/i18n/uk/components/contextMenu.json
index ff210275..36f88b09 100644
--- a/src/i18n/uk/components/contextMenu.json
+++ b/src/i18n/uk/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Заблокувати користувача",
-      "action_true": "Розблокувати користувача"
+      "action_true": "Розблокувати користувача",
+      "alert": {
+        "title": "Підтверджуєте блокування користувача @{{username}}?"
+      }
     },
     "reports": {
-      "action": "Повідомити та заблокувати користувача"
+      "action": "Повідомити та заблокувати користувача",
+      "alert": {
+        "title": "Підтвердити надсилання звіту та блокування користувача @{{username}}?"
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Заблокувати інстанс {{instance}}",
       "alert": {
         "title": "Підтверджуєте блокування інстанса {{instance}}?",
-        "message": "Здебільшого ви можете вимкнути звук або заблокувати певного користувача.\n\nПісля блокування інстансу весь її контент, включаючи підписників, буде видалено!",
-        "buttons": {
-          "confirm": "Підтвердити"
-        }
+        "message": "Здебільшого ви можете вимкнути звук або заблокувати певного користувача.\n\nПісля блокування інстансу весь її контент, включаючи підписників, буде видалено!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Видалити дмух",
       "alert": {
         "title": "Видалити?",
-        "message": "Всі передмухи і уподобання будуть очищені, включаючи всі відповіді.",
-        "buttons": {
-          "confirm": "Підтвердити"
-        }
+        "message": "Всі передмухи і уподобання будуть очищені, включаючи всі відповіді."
       }
     },
     "deleteEdit": {
       "action": "Видалити дмух та репост",
       "alert": {
         "title": "Підтвердьте видалення та повторне розміщення?",
-        "message": "Всі передмухи і уподобання будуть очищені, включаючи всі відповіді.",
-        "buttons": {
-          "confirm": "Підтвердити"
-        }
+        "message": "Всі передмухи і уподобання будуть очищені, включаючи всі відповіді."
       }
     },
     "mute": {
diff --git a/src/i18n/uk/components/instance.json b/src/i18n/uk/components/instance.json
index da19b90a..6f1da7c2 100644
--- a/src/i18n/uk/components/instance.json
+++ b/src/i18n/uk/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "Домен інстансу"
     },
+    "whitelisted": "Це може бути інстанс з білого списку, з якого tooot не може отримати дані до входу в систему.",
     "button": "Увійти",
     "information": {
       "name": "Назва",
diff --git a/src/i18n/uk/components/timeline.json b/src/i18n/uk/components/timeline.json
index b35a9fb9..2e11eef2 100644
--- a/src/i18n/uk/components/timeline.json
+++ b/src/i18n/uk/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Прихований вміст"
     },
-    "filtered": "Відфільтровано: {{phrase}}.",
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
     "fullConversation": "Читати розмови",
     "translate": {
       "default": "Переклад",
diff --git a/src/i18n/uk/screens.json b/src/i18n/uk/screens.json
index 943e9da9..edcc5a5d 100644
--- a/src/i18n/uk/screens.json
+++ b/src/i18n/uk/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Захист конфіденційності",
-    "message": "Будь ласка, не розкривайте особи інших користувачів, наприклад ім'я користувача, аватар і т.д. Дякуємо!",
-    "button": "Підтвердити"
+    "message": "Будь ласка, не розкривайте особи інших користувачів, наприклад ім'я користувача, аватар і т.д. Дякуємо!"
   },
   "localCorrupt": {
     "message": "Вхід вичерпано. Будь ласка, увійдіть знову"
diff --git a/src/i18n/vi/common.json b/src/i18n/vi/common.json
index 517903aa..c0a5373d 100644
--- a/src/i18n/vi/common.json
+++ b/src/i18n/vi/common.json
@@ -7,7 +7,8 @@
     "continue": "Tiếp tục",
     "create": "Tạo",
     "delete": "Xóa",
-    "done": "Xong"
+    "done": "Xong",
+    "confirm": "Xác nhận"
   },
   "customEmoji": {
     "accessibilityLabel": "Tùy chỉnh emoji {{emoji}}"
diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json
index fab9fb7d..448a1e88 100644
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "Chặn người này",
-      "action_true": "Bỏ chặn người dùng"
+      "action_true": "Bỏ chặn người dùng",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "Báo cáo và chặn"
+      "action": "Báo cáo và chặn",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "Chặn {{instance}}",
       "alert": {
         "title": "Xác nhận chặn {{instance}} ?",
-        "message": "Bạn có thể ẩn hoặc chặn bất kỳ người nào.\n\nĐối với máy chủ, toàn bộ nội dung bao gồm người theo dõi bạn từ máy chủ đó cũng sẽ bị chặn!",
-        "buttons": {
-          "confirm": "Xác nhận"
-        }
+        "message": "Bạn có thể ẩn hoặc chặn bất kỳ người nào.\n\nĐối với máy chủ, toàn bộ nội dung bao gồm người theo dõi bạn từ máy chủ đó cũng sẽ bị chặn!"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "Xóa tút",
       "alert": {
         "title": "Tiếp tục xóa?",
-        "message": "Tất cả lượt thích và đăng lại sẽ bị mất, bao gồm cả những trả lời.",
-        "buttons": {
-          "confirm": "Xác nhận"
-        }
+        "message": "Tất cả lượt thích và đăng lại sẽ bị mất, bao gồm cả những trả lời."
       }
     },
     "deleteEdit": {
       "action": "Xóa và đăng lại",
       "alert": {
         "title": "Tiếp tục xóa và đăng lại?",
-        "message": "Tất cả lượt thích và đăng lại sẽ bị mất, bao gồm cả những trả lời.",
-        "buttons": {
-          "confirm": "Xác nhận"
-        }
+        "message": "Tất cả lượt thích và đăng lại sẽ bị mất, bao gồm cả những trả lời."
       }
     },
     "mute": {
diff --git a/src/i18n/vi/components/instance.json b/src/i18n/vi/components/instance.json
index acca9aa1..25572338 100644
--- a/src/i18n/vi/components/instance.json
+++ b/src/i18n/vi/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "Địa chỉ máy chủ"
     },
+    "whitelisted": "",
     "button": "Đăng nhập",
     "information": {
       "name": "Tên máy chủ",
diff --git a/src/i18n/vi/components/timeline.json b/src/i18n/vi/components/timeline.json
index dc0be9f4..8a4979f9 100644
--- a/src/i18n/vi/components/timeline.json
+++ b/src/i18n/vi/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "Nội dung ẩn"
     },
-    "filtered": "Đã lọc: {{phrase}}.",
+    "filtered": {
+      "reveal": "Vẫn cứ xem",
+      "match_v1": "Đã lọc: {{phrase}}.",
+      "match_v2_one": "Đã lọc bởi: {{filters}}.",
+      "match_v2_other": "Đã lọc bởi {{count}} bộ lọc, {{filters}}."
+    },
     "fullConversation": "Xem thêm",
     "translate": {
       "default": "Dịch",
diff --git a/src/i18n/vi/screens.json b/src/i18n/vi/screens.json
index 6f773165..f0ecb534 100644
--- a/src/i18n/vi/screens.json
+++ b/src/i18n/vi/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "Bảo vệ quyền riêng tư",
-    "message": "Hãy tôn trọng thông tin cá nhân của người khác như tên tài khoản, ảnh đại diện, nhắn riêng etc. Cám ơn!",
-    "button": "Xác nhận"
+    "message": "Hãy tôn trọng thông tin cá nhân của người khác như tên tài khoản, ảnh đại diện, nhắn riêng etc. Cám ơn!"
   },
   "localCorrupt": {
     "message": "Phiên đăng nhập hết hạn, hãy đăng nhập lại!"
diff --git a/src/i18n/zh-Hans/common.json b/src/i18n/zh-Hans/common.json
index 7e8894a1..c403f6d1 100644
--- a/src/i18n/zh-Hans/common.json
+++ b/src/i18n/zh-Hans/common.json
@@ -7,7 +7,8 @@
     "continue": "继续",
     "create": "创建",
     "delete": "删除",
-    "done": "完成"
+    "done": "完成",
+    "confirm": "确认"
   },
   "customEmoji": {
     "accessibilityLabel": "自定义表情{{emoji}}"
diff --git a/src/i18n/zh-Hans/components/contextMenu.json b/src/i18n/zh-Hans/components/contextMenu.json
index 908bae62..7340a249 100644
--- a/src/i18n/zh-Hans/components/contextMenu.json
+++ b/src/i18n/zh-Hans/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "屏蔽用户",
-      "action_true": "取消屏蔽用户"
+      "action_true": "取消屏蔽用户",
+      "alert": {
+        "title": "确认屏蔽用户 @{{username}} ？"
+      }
     },
     "reports": {
-      "action": "举报并屏蔽用户"
+      "action": "举报并屏蔽用户",
+      "alert": {
+        "title": "确认举报并屏蔽用户 @{{username}} ？"
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "屏蔽实例 {{instance}}",
       "alert": {
         "title": "确认屏蔽实例 {{instance}}？",
-        "message": "多数情况下，隐藏或屏蔽特定用户即可。\n\n屏蔽之后，来自此实例的所有内容将被移除。",
-        "buttons": {
-          "confirm": "确认"
-        }
+        "message": "多数情况下，隐藏或屏蔽特定用户即可。\n\n屏蔽之后，来自此实例的所有内容将被移除。"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "删除嘟文",
       "alert": {
         "title": "确认删除？",
-        "message": "所有转发及收藏将被清除，包括所有回复。",
-        "buttons": {
-          "confirm": "确认"
-        }
+        "message": "所有转发及收藏将被清除，包括所有回复。"
       }
     },
     "deleteEdit": {
       "action": "删除嘟文并重新发布",
       "alert": {
         "title": "确认删除并重新发布？",
-        "message": "所有转发及收藏将被清除，包括所有回复。",
-        "buttons": {
-          "confirm": "确认"
-        }
+        "message": "所有转发及收藏将被清除，包括所有回复。"
       }
     },
     "mute": {
diff --git a/src/i18n/zh-Hans/components/instance.json b/src/i18n/zh-Hans/components/instance.json
index 4fdc13f7..389ad61b 100644
--- a/src/i18n/zh-Hans/components/instance.json
+++ b/src/i18n/zh-Hans/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "实例域名"
     },
+    "whitelisted": "这可能是一个白名单实例，在登录前无法获取数据。",
     "button": "登录",
     "information": {
       "name": "社区名称",
diff --git a/src/i18n/zh-Hans/components/timeline.json b/src/i18n/zh-Hans/components/timeline.json
index 404ad280..985826e9 100644
--- a/src/i18n/zh-Hans/components/timeline.json
+++ b/src/i18n/zh-Hans/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "隐藏内容"
     },
-    "filtered": "已过滤：{{phrase}}。",
+    "filtered": {
+      "reveal": "继续显示",
+      "match_v1": "已过滤：{{phrase}}。",
+      "match_v2_one": "由 {{filters}} 过滤。",
+      "match_v2_other": "由 {{count}} 个过滤器 {{filters}} 过滤。"
+    },
     "fullConversation": "阅读全部对话",
     "translate": {
       "default": "翻译",
diff --git a/src/i18n/zh-Hans/screens.json b/src/i18n/zh-Hans/screens.json
index f43beb7f..393c058f 100644
--- a/src/i18n/zh-Hans/screens.json
+++ b/src/i18n/zh-Hans/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "隐私保护",
-    "message": "请确保不要泄露其它用户的敏感信息，例如用户名、头像等，谢谢！",
-    "button": "确认"
+    "message": "请确保不要泄露其它用户的敏感信息，例如用户名、头像等，谢谢！"
   },
   "localCorrupt": {
     "message": "登录已过期，请重新登录"
diff --git a/src/i18n/zh-Hant/common.json b/src/i18n/zh-Hant/common.json
index 12e5bc66..0172f579 100644
--- a/src/i18n/zh-Hant/common.json
+++ b/src/i18n/zh-Hant/common.json
@@ -7,7 +7,8 @@
     "continue": "繼續",
     "create": "建立",
     "delete": "刪除",
-    "done": "完成"
+    "done": "完成",
+    "confirm": "確認"
   },
   "customEmoji": {
     "accessibilityLabel": "自定的表情符號 {{emoji}}"
diff --git a/src/i18n/zh-Hant/components/contextMenu.json b/src/i18n/zh-Hant/components/contextMenu.json
index 296bbeb1..5c1bc9ae 100644
--- a/src/i18n/zh-Hant/components/contextMenu.json
+++ b/src/i18n/zh-Hant/components/contextMenu.json
@@ -13,10 +13,16 @@
     },
     "block": {
       "action_false": "封鎖使用者",
-      "action_true": "解除封鎖使用者"
+      "action_true": "解除封鎖使用者",
+      "alert": {
+        "title": ""
+      }
     },
     "reports": {
-      "action": "檢舉並封鎖使用者"
+      "action": "檢舉並封鎖使用者",
+      "alert": {
+        "title": ""
+      }
     }
   },
   "at": {
@@ -33,10 +39,7 @@
       "action": "封鎖站點 {{instance}}",
       "alert": {
         "title": "確認封鎖站點 {{instance}}？",
-        "message": "多數情況下，靜音或封鎖特定使用者即可。\n\n封鎖之後，來自此站點的所有內容將被移除。",
-        "buttons": {
-          "confirm": "確認"
-        }
+        "message": "多數情況下，靜音或封鎖特定使用者即可。\n\n封鎖之後，來自此站點的所有內容將被移除。"
       }
     }
   },
@@ -57,20 +60,14 @@
       "action": "刪除嘟文",
       "alert": {
         "title": "確認刪除？",
-        "message": "所有轉嘟及最愛將被清除，也包含所有回覆。",
-        "buttons": {
-          "confirm": "確認"
-        }
+        "message": "所有轉嘟及最愛將被清除，也包含所有回覆。"
       }
     },
     "deleteEdit": {
       "action": "刪除嘟文並重新發佈",
       "alert": {
         "title": "確認刪除並重新發佈？",
-        "message": "所有轉嘟及最愛將被清除，也包含所有回覆。",
-        "buttons": {
-          "confirm": "確認"
-        }
+        "message": "所有轉嘟及最愛將被清除，也包含所有回覆。"
       }
     },
     "mute": {
diff --git a/src/i18n/zh-Hant/components/instance.json b/src/i18n/zh-Hant/components/instance.json
index 26dec890..57d7cbdd 100644
--- a/src/i18n/zh-Hant/components/instance.json
+++ b/src/i18n/zh-Hant/components/instance.json
@@ -3,6 +3,7 @@
     "textInput": {
       "placeholder": "站點的網域"
     },
+    "whitelisted": "這可能是一個白名單站點，在登入前無法檢索資料。",
     "button": "登入",
     "information": {
       "name": "名稱",
diff --git a/src/i18n/zh-Hant/components/timeline.json b/src/i18n/zh-Hant/components/timeline.json
index fd803d67..44a9b3b9 100644
--- a/src/i18n/zh-Hant/components/timeline.json
+++ b/src/i18n/zh-Hant/components/timeline.json
@@ -91,7 +91,12 @@
     "content": {
       "expandHint": "隱藏內容"
     },
-    "filtered": "已過濾：{{phrase}}。",
+    "filtered": {
+      "reveal": "仍要顯示",
+      "match_v1": "已過濾：{{phrase}}。",
+      "match_v2_one": "由 {{filters}} 過濾。",
+      "match_v2_other": "由 {{filters}} 等 {{count}} 組過濾器過濾。"
+    },
     "fullConversation": "閱讀全部對話",
     "translate": {
       "default": "翻譯",
diff --git a/src/i18n/zh-Hant/screens.json b/src/i18n/zh-Hant/screens.json
index 7730656a..5f72106f 100644
--- a/src/i18n/zh-Hant/screens.json
+++ b/src/i18n/zh-Hant/screens.json
@@ -1,8 +1,7 @@
 {
   "screenshot": {
     "title": "隱私權保護",
-    "message": "請不要散佈使用者的身份，像是使用者名稱、大頭照等，謝謝你！",
-    "button": "確認"
+    "message": "請不要散佈使用者的身份，像是使用者名稱、大頭照等，謝謝你！"
   },
   "localCorrupt": {
     "message": "登入狀態已過期，請重新登入"
diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json
index 418f3268..0e66884b 100644
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -255,7 +255,7 @@
         "content_false": "關閉"
       },
       "update": {
-        "title": "已更新到最新版本"
+        "title": "更新到最新版本"
       },
       "logout": {
         "button": "登出",