diff --git a/Gemfile.lock b/Gemfile.lock
index ec7ac0f5a9..44b8589471 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -430,7 +430,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.30.0)
       parallel
-    parser (2.6.5.0)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.3)
@@ -462,7 +462,7 @@ GEM
     pundit (2.1.0)
       activesupport (>= 3.0.0)
     raabro (1.1.6)
-    rack (2.0.8)
+    rack (2.1.1)
     rack-attack (6.2.2)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
@@ -572,7 +572,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.4.1)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 1557d84602..ceb5c39e45 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grup",
   "account.block": "Bloqueja @{name}",
   "account.block_domain": "Amaga-ho tot de {domain}",
   "account.blocked": "Bloquejat",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.option_placeholder": "Opció {number}",
   "compose_form.poll.remove_option": "Elimina aquesta opció",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Canvía l’enquesta per a permetre diverses opcions",
+  "compose_form.poll.switch_to_single": "Canvía l’enquesta per a permetre una sola opció",
   "compose_form.publish": "Tut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marcar mèdia com a sensible",
@@ -110,7 +110,7 @@
   "confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen però encara els permetrà veure les teves i seguir-te.",
   "confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
   "confirmations.redraft.confirm": "Esborrar i refer",
-  "confirmations.redraft.message": "Estàs segur que vols esborrar aquest tut i tornar a redactar-lo? Perdràs totes els impulsos i favorits, i les respostes al tut original es quedaran orfes.",
+  "confirmations.redraft.message": "Estàs segur que vols esborrar aquest tut i tornar a redactar-lo? Perdràs tots els impulsos i favorits, i les respostes al tut original es quedaran orfes.",
   "confirmations.reply.confirm": "Respon",
   "confirmations.reply.message": "Responen ara es sobreescriurà el missatge que estàs editant. Estàs segur que vols continuar?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
@@ -147,7 +147,7 @@
   "empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
   "empty_column.domain_blocks": "Encara no hi ha dominis ocults.",
   "empty_column.favourited_statuses": "Encara no has marcat com a favorit cap tut. Quan en facis, apareixerà aquí.",
-  "empty_column.favourites": "Ningú no ha marcat aquesta barritada com a preferit encara. Quan algú ho faci, apareixerà aquí.",
+  "empty_column.favourites": "Ningú no ha marcat aquest tut com a preferit encara. Quan algú ho faci, apareixerà aquí.",
   "empty_column.follow_requests": "Encara no tens cap petició de seguiment. Quan rebis una, apareixerà aquí.",
   "empty_column.hashtag": "Encara no hi ha res en aquesta etiqueta.",
   "empty_column.home": "Encara no segueixes ningú. Visita {public} o fes cerca per començar i conèixer altres usuaris.",
@@ -181,8 +181,8 @@
   "hashtag.column_settings.tag_mode.none": "Cap d’aquests",
   "hashtag.column_settings.tag_toggle": "Inclou etiquetes addicionals per a aquesta columna",
   "home.column_settings.basic": "Bàsic",
-  "home.column_settings.show_reblogs": "Mostrar impulsos",
-  "home.column_settings.show_replies": "Mostrar respostes",
+  "home.column_settings.show_reblogs": "Mostra els impulsos",
+  "home.column_settings.show_replies": "Mostra les respostes",
   "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
@@ -211,7 +211,7 @@
   "keyboard_shortcuts.description": "Descripció",
   "keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
   "keyboard_shortcuts.down": "per baixar en la llista",
-  "keyboard_shortcuts.enter": "ampliar el tut",
+  "keyboard_shortcuts.enter": "per a obrir el tut",
   "keyboard_shortcuts.favourite": "afavorir",
   "keyboard_shortcuts.favourites": "per obrir la llista de favorits",
   "keyboard_shortcuts.federated": "per obrir la línia de temps federada",
@@ -231,8 +231,8 @@
   "keyboard_shortcuts.requests": "per a obrir la llista de sol·licituds de seguiment",
   "keyboard_shortcuts.search": "per a centrar la cerca",
   "keyboard_shortcuts.start": "per a obrir la columna \"Començar\"",
-  "keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
-  "keyboard_shortcuts.toggle_sensitivity": "per a mostrar/amagar mèdia",
+  "keyboard_shortcuts.toggle_hidden": "per a mostrar o amagar text sota CW",
+  "keyboard_shortcuts.toggle_sensitivity": "per a mostrar o amagar contingut multimèdia",
   "keyboard_shortcuts.toot": "per a començar un tut nou de trinca",
   "keyboard_shortcuts.unfocus": "descentrar l'àrea de composició de text/cerca",
   "keyboard_shortcuts.up": "moure amunt en la llista",
@@ -298,7 +298,7 @@
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",
   "notifications.column_settings.reblog": "Impulsos:",
-  "notifications.column_settings.show": "Mostrar en la columna",
+  "notifications.column_settings.show": "Mostra en la columna",
   "notifications.column_settings.sound": "Reproduir so",
   "notifications.filter.all": "Tots",
   "notifications.filter.boosts": "Impulsos",
@@ -348,7 +348,7 @@
   "search_popout.tips.user": "usuari",
   "search_results.accounts": "Gent",
   "search_results.hashtags": "Etiquetes",
-  "search_results.statuses": "Barritades",
+  "search_results.statuses": "Tuts",
   "search_results.statuses_fts_disabled": "La cerca de tuts pel seu contingut no està habilitada en aquest servidor Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "status.admin_account": "Obre l'interfície de moderació per a @{name}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9ec566d549..2afd0f1fa9 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Gruppu",
   "account.block": "Bluccà @{name}",
   "account.block_domain": "Piattà tuttu da {domain}",
   "account.blocked": "Bluccatu",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Durata di u scandagliu",
   "compose_form.poll.option_placeholder": "Scelta {number}",
   "compose_form.poll.remove_option": "Toglie sta scelta",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
+  "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Indicà u media cum'è sensibile",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 82c17efe73..8b9b5a86b2 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
   "account.badges.bot": "Robot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Skupina",
   "account.block": "Zablokovat uživatele @{name}",
   "account.block_domain": "Skrýt vše ze serveru {domain}",
   "account.blocked": "Blokováno",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Doba trvání ankety",
   "compose_form.poll.option_placeholder": "Volba {number}",
   "compose_form.poll.remove_option": "Odstranit tuto volbu",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Povolit u ankety více možností",
+  "compose_form.poll.switch_to_single": "Povolit u ankety jedinou možnost",
   "compose_form.publish": "Tootnout",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Označit média jako citlivá",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6891155c6d..fea31633a2 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1550,6 +1550,23 @@
     ],
     "path": "app/javascript/mastodon/features/following/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      },
+      {
+        "defaultMessage": "Previous",
+        "id": "lightbox.previous"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "lightbox.next"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/getting_started/components/announcements.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 20d4e7935e..f921b263ca 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloki @{name}",
   "account.block_domain": "Kaŝi ĉion de {domain}",
   "account.blocked": "Blokita",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Balotenketa daŭro",
   "compose_form.poll.option_placeholder": "Elekteblo {number}",
   "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
+  "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
   "compose_form.publish": "Hup",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marki la aŭdovidaĵojn kiel tiklaj",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 1de5ec8ce5..ee46e24dd3 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
   "account.block_domain": "Ocultar todo de {domain}",
   "account.blocked": "Bloqueado",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Duración de la encuesta",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Quitá esta opción",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
+  "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
   "compose_form.publish": "Tootear",
   "compose_form.publish_loud": "¡{publish}!",
   "compose_form.sensitive.hide": "Marcar medio como sensible",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 825956d254..d056a843cf 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Agregar o eliminar de listas",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
   "account.block_domain": "Ocultar todo de {domain}",
   "account.blocked": "Bloqueado",
@@ -16,7 +16,7 @@
   "account.follows": "Sigue",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.follows_you": "Te sigue",
-  "account.hide_reblogs": "Ocultar rebarritadas de @{name}",
+  "account.hide_reblogs": "Ocultar retoots de @{name}",
   "account.last_status": "Última actividad",
   "account.link_verified_on": "El proprietario de este link fue comprobado el {date}",
   "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
@@ -27,12 +27,12 @@
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
   "account.never_active": "Nunca",
-  "account.posts": "Bramidos",
-  "account.posts_with_replies": "Bramidos con respuestas",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots con respuestas",
   "account.report": "Reportar a @{name}",
   "account.requested": "Esperando aprobación",
   "account.share": "Compartir el perfil de @{name}",
-  "account.show_reblogs": "Mostrar rebramidos de @{name}",
+  "account.show_reblogs": "Mostrar retoots de @{name}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
   "account.unendorse": "No mostrar en el perfil",
@@ -57,13 +57,13 @@
   "column.direct": "Mensajes directos",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
-  "column.favourites": "Favoritos",
+  "column.favourites": "Levantar la trompa",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
-  "column.pins": "Bramidos fijados",
+  "column.pins": "Toots fijados",
   "column.public": "Cronología federada",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Ocultar configuración",
@@ -74,19 +74,19 @@
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.settings": "Ajustes",
   "community.column_settings.media_only": "Solo media",
-  "compose_form.direct_message_warning": "Este bramido solo será enviado a las usuarias mencionadas.",
+  "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprender mas",
-  "compose_form.hashtag_warning": "Este bramido no se mostrará bajo etiquetas porque no es público. Sólo los bramidos públicos se pueden buscar por etiqueta.",
-  "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todas pueden seguirte para ver tus barritadas para solo seguidoras.",
+  "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
+  "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
   "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
   "compose_form.poll.option_placeholder": "Elección {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Barritar",
+  "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
+  "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.publish": "Ipoxta",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marcar multimedia como sensible",
   "compose_form.sensitive.marked": "Material marcado como sensible",
@@ -99,7 +99,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
   "confirmations.delete.confirm": "Eliminar",
-  "confirmations.delete.message": "¿Estás seguro de que quieres borrar este estado?",
+  "confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.domain_block.confirm": "Ocultar dominio entero",
@@ -123,7 +123,7 @@
   "directory.local": "Sólo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
-  "embed.instructions": "Añade este estado a tu sitio web con el siguiente código.",
+  "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
   "emoji_button.custom": "Personalizado",
@@ -139,15 +139,15 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_timeline": "¡No hay barritadas aquí!",
+  "empty_column.account_timeline": "¡No hay toots aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna barritada guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La cronología local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
-  "empty_column.favourited_statuses": "Aún no tienes barritadas preferidas. Cuando marques una como favorita, aparecerá aquí.",
-  "empty_column.favourites": "Nadie ha marcado esta barritada como preferida. Cuando alguien lo haga, aparecerá aquí.",
+  "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
+  "empty_column.favourites": "Nadie ha marcado este toot como preferido. Cuando alguien lo haga, aparecerá aquí.",
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
   "empty_column.hashtag": "No hay nada en esta etiqueta aún.",
   "empty_column.home": "No estás siguiendo a nadie aún. Visita {public} o haz búsquedas para empezar y conocer gente nueva.",
@@ -181,7 +181,7 @@
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
   "hashtag.column_settings.tag_toggle": "Incluya etiquetas adicionales para esta columna",
   "home.column_settings.basic": "Básico",
-  "home.column_settings.show_reblogs": "Mostrar rebarritadas",
+  "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -195,17 +195,17 @@
   "introduction.federation.local.text": "Los mensajes públicos de personas en el mismo servidor que aparecerán en la cronología local.",
   "introduction.interactions.action": "¡Terminar tutorial!",
   "introduction.interactions.favourite.headline": "Favorito",
-  "introduction.interactions.favourite.text": "Puedes guardar una barritada para más tarde, y hacer saber a la persona autora que te gustó, dándole a favorita.",
-  "introduction.interactions.reblog.headline": "Rebarritar",
-  "introduction.interactions.reblog.text": "Puedes compartir las barritadas de otras personas con tus seguidoras rebarritando las mismas.",
+  "introduction.interactions.favourite.text": "Puedes guardar un toot para más tarde, y hacer saber al autor que te gustó, dándole a favorito.",
+  "introduction.interactions.reblog.headline": "Retootear",
+  "introduction.interactions.reblog.text": "Puedes compartir los toots de otras personas con tus seguidores retooteando los mismos.",
   "introduction.interactions.reply.headline": "Responder",
-  "introduction.interactions.reply.text": "Puedes responder a tus propias barritadas y los de otras personas, que se encadenarán juntos en una conversación.",
+  "introduction.interactions.reply.text": "Puedes responder a tus propios toots y los de otras personas, que se encadenarán juntos en una conversación.",
   "introduction.welcome.action": "¡Vamos!",
   "introduction.welcome.headline": "Primeros pasos",
   "introduction.welcome.text": "¡Bienvenido al fediverso! En unos momentos, podrás transmitir mensajes y hablar con tus amigos a través de una amplia variedad de servidores. Pero este servidor, {domain}, es especial, alberga tu perfil, así que recuerda su nombre.",
   "keyboard_shortcuts.back": "volver atrás",
   "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados",
-  "keyboard_shortcuts.boost": "rebarritar",
+  "keyboard_shortcuts.boost": "reipoxta",
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
@@ -225,7 +225,7 @@
   "keyboard_shortcuts.my_profile": "abrir tu perfil",
   "keyboard_shortcuts.notifications": "abrir la columna de notificaciones",
   "keyboard_shortcuts.open_media": "para abrir archivos multimedia",
-  "keyboard_shortcuts.pinned": "abrir la lista de barritadas destacadas",
+  "keyboard_shortcuts.pinned": "abrir la lista de toots destacados",
   "keyboard_shortcuts.profile": "abrir el perfil del autor",
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores",
@@ -233,7 +233,7 @@
   "keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
   "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
   "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar medios",
-  "keyboard_shortcuts.toot": "para comenzar un nuevo bramido",
+  "keyboard_shortcuts.toot": "para comenzar un nuevo toot",
   "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda",
   "keyboard_shortcuts.up": "para ir hacia arriba en la lista",
   "lightbox.close": "Cerrar",
@@ -259,7 +259,7 @@
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronología local",
-  "navigation_bar.compose": "Barrita",
+  "navigation_bar.compose": "Escribir un nuevo toot",
   "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
@@ -274,7 +274,7 @@
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Barritadas fijadas",
+  "navigation_bar.pins": "Toots fijados",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Cronología federada",
   "navigation_bar.security": "Seguridad",
@@ -284,7 +284,7 @@
   "notification.mention": "{name} te ha mencionado",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
-  "notification.reblog": "{name} ha rebarritado tu estado",
+  "notification.reblog": "{name} ha retooteado tu estado",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
@@ -297,11 +297,11 @@
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",
-  "notifications.column_settings.reblog": "Rebarritadas:",
+  "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
   "notifications.filter.all": "Todos",
-  "notifications.filter.boosts": "Rebarritadas",
+  "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
@@ -341,14 +341,14 @@
   "report.target": "Reportando",
   "search.placeholder": "Buscar",
   "search_popout.search_format": "Formato de búsqueda avanzada",
-  "search_popout.tips.full_text": "Búsquedas de texto recuperan entradas que has escrito, marcado como favoritas, rebarritado o en los que has sido mencionada, así como usuarias, nombres y etiquetas.",
+  "search_popout.tips.full_text": "Búsquedas de texto recuperan posts que has escrito, marcado como favoritos, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
   "search_popout.tips.status": "estado",
   "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, persona usuaria y etiqueta",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
   "search_results.hashtags": "Etiquetas",
-  "search_results.statuses": "Barritadas",
+  "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Buscar bramidos por su contenido no está disponible en este servidor de Mastodonte.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
@@ -372,12 +372,12 @@
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
-  "status.pinned": "Barritada fijada",
+  "status.pinned": "Toot fijado",
   "status.read_more": "Leer más",
-  "status.reblog": "Rebarritar",
+  "status.reblog": "ReIpoxta",
   "status.reblog_private": "Implusar a la audiencia original",
-  "status.reblogged_by": "Rebarritado por {name}",
-  "status.reblogs.empty": "Nadie impulsó esta barritada todavía. Cuando alguien lo haga, aparecerá aqui.",
+  "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogs.empty": "Nadie impulsó este toot todavía. Cuando alguien lo haga, aparecerá aqui.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
   "status.reply": "Responder",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index c5bc1f214d..94e73ae3d0 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
   "account.badges.bot": "Robot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupp",
   "account.block": "Blokeeri @{name}",
   "account.block_domain": "Peida kõik domeenist {domain}",
   "account.blocked": "Blokeeritud",
@@ -15,7 +15,7 @@
   "account.followers.empty": "Keegi ei jälgi seda kasutajat veel.",
   "account.follows": "Jälgib",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
-  "account.follows_you": "Jälgib sind",
+  "account.follows_you": "Jälgib Teid",
   "account.hide_reblogs": "Peida upitused kasutajalt @{name}",
   "account.last_status": "Viimati aktiivne",
   "account.link_verified_on": "Selle lingi autorsust kontrolliti {date}",
@@ -44,8 +44,8 @@
   "alert.unexpected.message": "Tekkis ootamatu viga.",
   "alert.unexpected.title": "Oih!",
   "autosuggest_hashtag.per_week": "{count} nädalas",
-  "boost_modal.combo": "Saad vajutada {combo}, et see järgmine kord vahele jätta",
-  "bundle_column_error.body": "Mindagi läks valesti selle komponendi laadimisel.",
+  "boost_modal.combo": "Võite vajutada {combo}, et see järgmine kord vahele jätta",
+  "bundle_column_error.body": "Midagi läks valesti selle komponendi laadimisel.",
   "bundle_column_error.retry": "Proovi uuesti",
   "bundle_column_error.title": "Võrgu viga",
   "bundle_modal_error.close": "Sulge",
@@ -63,7 +63,7 @@
   "column.lists": "Nimekirjad",
   "column.mutes": "Vaigistatud kasutajad",
   "column.notifications": "Teated",
-  "column.pins": "Kinnitatud upitused",
+  "column.pins": "Kinnitatud tuututused",
   "column.public": "Föderatiivne ajajoon",
   "column_back_button.label": "Tagasi",
   "column_header.hide_settings": "Peida sätted",
@@ -77,15 +77,15 @@
   "compose_form.direct_message_warning": "See tuut saadetakse ainult mainitud kasutajatele.",
   "compose_form.direct_message_warning_learn_more": "Vaata veel",
   "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
-  "compose_form.lock_disclaimer": "Sinu konto ei ole {locked}. Igaüks saab sind jälgida ja näha su ainult-jälgijatele postitusi.",
+  "compose_form.lock_disclaimer": "Teie konto ei ole {locked}. Igaüks saab Teid jälgida ja näha Teie ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
-  "compose_form.placeholder": "Millest mõtled?",
+  "compose_form.placeholder": "Millest mõtlete?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.remove_option": "Eemalda see valik",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Muuda küsitlust lubamaks mitut valikut",
+  "compose_form.poll.switch_to_single": "Muuda küsitlust lubamaks ainult ühte valikut",
   "compose_form.publish": "Tuut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Märgista meedia tundlikuks",
@@ -93,28 +93,28 @@
   "compose_form.sensitive.unmarked": "Meedia ei ole sensitiivseks märgitud",
   "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
   "compose_form.spoiler.unmarked": "Tekst ei ole peidetud",
-  "compose_form.spoiler_placeholder": "Kirjuta oma hoiatus siia",
+  "compose_form.spoiler_placeholder": "Kirjutage oma hoiatus siia",
   "confirmation_modal.cancel": "Katkesta",
   "confirmations.block.block_and_report": "Blokeeri & Teata",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Oled kindel, et soovid blokkida {name}?",
+  "confirmations.block.message": "Olete kindel, et soovite blokeerida {name}?",
   "confirmations.delete.confirm": "Kustuta",
-  "confirmations.delete.message": "Oled kindel, et soovid selle staatuse kustutada?",
+  "confirmations.delete.message": "Olete kindel, et soovite selle staatuse kustutada?",
   "confirmations.delete_list.confirm": "Kustuta",
-  "confirmations.delete_list.message": "Oled kindel, et soovid selle nimekirja püsivalt kustutada?",
+  "confirmations.delete_list.message": "Olete kindel, et soovite selle nimekirja püsivalt kustutada?",
   "confirmations.domain_block.confirm": "Peida terve domeen",
-  "confirmations.domain_block.message": "Oled ikka päris kindel, et soovid blokeerida terve  {domain}? Enamikul juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatav. Sa ei näe selle domeeni sisu üheski avalikus ajajoones või teadetes. Sinu jälgijad sellest domeenist eemaldatakse.",
+  "confirmations.domain_block.message": "Olete ikka päris kindel, et soovite blokeerida terve {domain}? Enamikul juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatav. Te ei näe selle domeeni sisu üheski avalikus ajajoones või teadetes. Teie jälgijad sellest domeenist eemaldatakse.",
   "confirmations.logout.confirm": "Välju",
-  "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
+  "confirmations.logout.message": "Kas olete kindel, et soovite välja logida?",
   "confirmations.mute.confirm": "Vaigista",
   "confirmations.mute.explanation": "See peidab postitusi temalt ning postitusi, kus mainitakse neid, kuid see lubab neil ikka näha Teie postitusi ning Teid jälgida.",
-  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
+  "confirmations.mute.message": "Olete kindel, et soovite {name} vaigistada?",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
-  "confirmations.redraft.message": "Oled kindel, et soovid selle staatuse kustutada ja alustada uuesti? Lemmikud ja upitused lähevad kaotsi ja vastused originaaalpostitusele jäävad orvuks.",
+  "confirmations.redraft.message": "Olete kindel, et soovite selle staatuse kustutada ja alustada uuesti? Lemmikud ja upitused lähevad kaotsi ja vastused originaaalpostitusele jäävad orvuks.",
   "confirmations.reply.confirm": "Vasta",
-  "confirmations.reply.message": "Kohene vastamine kirjutab üle sõnumi, mida hetkel koostad. Oled kindel, et soovid jätkata?",
+  "confirmations.reply.message": "Praegu vastamine kirjutab üle sõnumi, mida hetkel koostate. Olete kindel, et soovite jätkata?",
   "confirmations.unfollow.confirm": "Ära jälgi",
-  "confirmations.unfollow.message": "Oled kindel, et ei soovi jälgida {name}?",
+  "confirmations.unfollow.message": "Olete kindel, et ei soovi rohkem jälgida kasutajat {name}?",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
@@ -142,20 +142,20 @@
   "empty_column.account_timeline": "Siin tuute ei ole!",
   "empty_column.account_unavailable": "Profiil pole saadaval",
   "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
-  "empty_column.bookmarked_statuses": "Sul pole veel järjehoidjatesse lisatud tuututusi. Kui lisad mõne, näed neid siin.",
-  "empty_column.community": "Kohalik ajajoon on tühi. Kirjuta midagi avalikult, et pall veerema saada!",
-  "empty_column.direct": "Sul ei veel otsesõnumeid. Kui saadad või võtad mõne vastu, ilmuvad nad siia.",
+  "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud tuututusi. Kui lisate mõne, näete neid siin.",
+  "empty_column.community": "Kohalik ajajoon on tühi. Kirjutage midagi avalikult, et pall veerema ajada!",
+  "empty_column.direct": "Teil ei ole veel otsesõnumeid. Kui saadate või võtate mõne vastu, ilmuvad nad siia.",
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
-  "empty_column.favourited_statuses": "Sul pole veel lemmikuid tuute. Kui märgid mõne, näed neid siin.",
+  "empty_column.favourited_statuses": "Teil pole veel lemmikuid tuute. Kui märgite mõne, näete neid siin.",
   "empty_column.favourites": "Keegi pole veel seda tuuti lemmikuks märkinud. Kui seegi seda teeb, näed seda siin.",
-  "empty_column.follow_requests": "Sul pole veel ühtegi jälgimise taotlust. Kui saad mõne, näed seda siin.",
+  "empty_column.follow_requests": "Teil pole veel ühtegi jälgimise taotlust. Kui saate mõne, näete neid siin.",
   "empty_column.hashtag": "Selle sildiga pole veel midagi.",
-  "empty_column.home": "Sinu kodu ajajoon on tühi! Külasta {public} või kasuta otsingut alustamaks ja kohtamaks teisi kasutajaid.",
+  "empty_column.home": "Teie kodu ajajoon on tühi! Külastage {public} või kasutage otsingut alustamaks ja kohtamaks teisi kasutajaid.",
   "empty_column.home.public_timeline": "avalik ajajoon",
   "empty_column.list": "Siin nimstus pole veel midagi. Kui selle nimistu liikmed postitavad uusi staatusi, näed neid siin.",
-  "empty_column.lists": "Sul ei ole veel ühtegi nimekirja. Kui lood mõne, näed seda siin.",
-  "empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
-  "empty_column.notifications": "Sul ei ole veel teateid. Suhtle teistega alustamaks vestlust.",
+  "empty_column.lists": "Teil ei ole veel ühtegi nimekirja. Kui loote mõne, näete neid siin.",
+  "empty_column.mutes": "Te pole veel ühtegi kasutajat vaigistanud.",
+  "empty_column.notifications": "Teil ei ole veel teateid. Suhelge teistega alustamaks vestlust.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikut või jälgi ise kasutajaid täitmaks seda ruumi",
   "error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvus probleemi tõttu ei suutnud me Teile seda lehekülge korrektselt näidata.",
   "error.unexpected_crash.next_steps": "Proovige lehekülge uuesti avada. Kui see ei aita, võite proovida kasutada Mastodoni mõne muu veebilehitseja või äppi kaudu.",
@@ -168,7 +168,7 @@
   "getting_started.documentation": "Dokumentatsioon",
   "getting_started.heading": "Alustamine",
   "getting_started.invite": "Kutsu inimesi",
-  "getting_started.open_source_notice": "Mastodon on avatud lähtekoodiga tarkvara. Saad panustada või teatada probleemidest GitHubis {github}.",
+  "getting_started.open_source_notice": "Mastodon on avatud lähtekoodiga tarkvara. Saate panustada või teatada probleemidest GitHubis {github}.",
   "getting_started.security": "Turvalisus",
   "getting_started.terms": "Kasutustingimused",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
@@ -190,19 +190,19 @@
   "introduction.federation.federated.headline": "Föderatiivne",
   "introduction.federation.federated.text": "Avalikud postitused teistest föderatsiooni serveritest kuvatakse föderatiivsel ajajoonel.",
   "introduction.federation.home.headline": "Kodu",
-  "introduction.federation.home.text": "Inimest postitused keda jälgid kuvatakse sinu koduajajoonel. Saad jälgida igaüht igas serveris!",
+  "introduction.federation.home.text": "Inimeste, keda jälgite, postitused kuvatakse Teie koduajajoonel. Saate jälgida igaüht igas serveris!",
   "introduction.federation.local.headline": "Kohalik",
   "introduction.federation.local.text": "Samas serveris olevate inimeste postitused kuvatakse kohalikul ajajoonel.",
   "introduction.interactions.action": "Välju õpetusest!",
   "introduction.interactions.favourite.headline": "Lemmik",
-  "introduction.interactions.favourite.text": "Saad tuuti salvestada ja anda autorile teada, et meeldis märkides selle lemmikuks.",
+  "introduction.interactions.favourite.text": "Saate tuuti salvestada ja anda autorile teada, et see meeldis Teile, märkides selle lemmikuks.",
   "introduction.interactions.reblog.headline": "Upita",
-  "introduction.interactions.reblog.text": "Saad jagada teiste inimeste tuute oma jälgijatega upitades neid.",
+  "introduction.interactions.reblog.text": "Saate jagada teiste inimeste tuute oma jälgijatega neid upitades.",
   "introduction.interactions.reply.headline": "Vasta",
-  "introduction.interactions.reply.text": "Saad vastata teiste ja enda tuutidele, mis ühendab nad kokku aruteluks.",
+  "introduction.interactions.reply.text": "Saate vastata teiste ja enda tuutidele, mis ühendab nad kokku aruteluks.",
   "introduction.welcome.action": "Lähme!",
   "introduction.welcome.headline": "Esimesed sammud",
-  "introduction.welcome.text": "Teretulemast fediversumisse! Mõne aja pärast saad avaldada sõnumeid ja rääkida oma sõpradega läbi laia valiku serverite. Aga see server, {domain}, on eriline—ta majutab sinu profiili. Seega jäta ta nimi meelde.",
+  "introduction.welcome.text": "Teretulemast fediversumisse! Mõne aja pärast saate avaldada sõnumeid ja rääkida oma sõpradega läbi laia valiku serverite. Aga see server, {domain}, on eriline—see majutab sinu profiili. Seega jäta selle nimi meelde.",
   "keyboard_shortcuts.back": "tagasiminekuks",
   "keyboard_shortcuts.blocked": "avamaks blokeeritud kasutajate nimistut",
   "keyboard_shortcuts.boost": "upitamiseks",
@@ -247,8 +247,8 @@
   "lists.edit.submit": "Muuda pealkiri",
   "lists.new.create": "Lisa nimistu",
   "lists.new.title_placeholder": "Uus nimistu pealkiri",
-  "lists.search": "Otsi sinu poolt jälgitavate inimese hulgast",
-  "lists.subheading": "Sinu nimistud",
+  "lists.search": "Otsi Teie poolt jälgitavate inimese hulgast",
+  "lists.subheading": "Teie nimistud",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laeb..",
   "media_gallery.toggle_visible": "Lülita nähtavus",
@@ -278,15 +278,15 @@
   "navigation_bar.preferences": "Eelistused",
   "navigation_bar.public_timeline": "Föderatiivne ajajoon",
   "navigation_bar.security": "Turvalisus",
-  "notification.favourite": "{name} märkis su staatuse lemmikuks",
-  "notification.follow": "{name} jälgib sind",
+  "notification.favourite": "{name} märkis Teie staatuse lemmikuks",
+  "notification.follow": "{name} jälgib nüüd Teid",
   "notification.follow_request": "{name} soovib Teid jälgida",
-  "notification.mention": "{name} mainis sind",
+  "notification.mention": "{name} mainis Teid",
   "notification.own_poll": "Teie küsitlus on lõppenud",
-  "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
-  "notification.reblog": "{name} upitas su staatust",
+  "notification.poll": "Küsitlus, milles osalesite, on lõppenud",
+  "notification.reblog": "{name} upitas Teie staatust",
   "notifications.clear": "Puhasta teated",
-  "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated puhastada?",
+  "notifications.clear_confirmation": "Olete kindel, et soovite püsivalt kõik oma teated eemaldada?",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
   "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
@@ -326,7 +326,7 @@
   "privacy.unlisted.short": "Määramata",
   "refresh": "Värskenda",
   "regeneration_indicator.label": "Laeb…",
-  "regeneration_indicator.sublabel": "Sinu kodu voog on ettevalmistamisel!",
+  "regeneration_indicator.sublabel": "Teie kodu voog on ettevalmistamisel!",
   "relative_time.days": "{number}p",
   "relative_time.hours": "{number}t",
   "relative_time.just_now": "nüüd",
@@ -335,7 +335,7 @@
   "reply_indicator.cancel": "Tühista",
   "report.forward": "Edasta kasutajale {target}",
   "report.forward_hint": "See kasutaja on teisest serverist. Kas saadan anonümiseeritud koopia sellest teatest sinna ka?",
-  "report.hint": "See teade saadetakse sinu serveri moderaatoritele. Te saate lisada selgituse selle kohta, miks selle kasutaja kohta teate esitasite, siin:",
+  "report.hint": "See teade saadetakse Teie serveri moderaatoritele. Te saate lisada selgituse selle kohta, miks selle kasutaja kohta teate esitasite, siin:",
   "report.placeholder": "Lisaks kommentaarid",
   "report.submit": "Saada",
   "report.target": "Teatamine {target} kohta",
@@ -394,7 +394,7 @@
   "status.unmute_conversation": "Ära vaigista vestlust",
   "status.unpin": "Kinnita profiililt lahti",
   "suggestions.dismiss": "Eira soovitust",
-  "suggestions.header": "Sind võib huvitada…",
+  "suggestions.header": "Teid võib huvitada…",
   "tabs_bar.federated_timeline": "Föderatiivne",
   "tabs_bar.home": "Kodu",
   "tabs_bar.local_timeline": "Kohalik",
@@ -407,7 +407,7 @@
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekundit}} left",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {inimene} other {inimesed}} talking",
   "trends.trending_now": "Praegu populaarne",
-  "ui.beforeunload": "Sinu mustand läheb kaotsi, kui lahkud Mastodonist.",
+  "ui.beforeunload": "Teie mustand läheb kaotsi, kui lahkute Mastodonist.",
   "upload_area.title": "Lohista & aseta üleslaadimiseks",
   "upload_button.label": "Lisa meedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Faili üleslaadimise limiit ületatud.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 6d2da8569c..ffb77d9f68 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.bot": "Robot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Tout masquer venant de {domain}",
   "account.blocked": "Bloqué·e",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Durée du sondage",
   "compose_form.poll.option_placeholder": "Choix {number}",
   "compose_form.poll.remove_option": "Supprimer ce choix",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
+  "compose_form.poll.switch_to_single": "Changer le sondage pour autoriser qu'un seul choix",
   "compose_form.publish": "Pouet",
   "compose_form.publish_loud": "{publish} !",
   "compose_form.sensitive.hide": "Marquer le média comme sensible",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 4bfb6b5c86..695017b0ef 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Agochar todo de {domain}",
   "account.blocked": "Bloqueado",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Duración da enquisa",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
+  "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa escolla",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marcar coma contido multimedia sensíbel",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index aa4c9bc84a..8e7b492feb 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grup",
   "account.block": "Blokir @{name}",
   "account.block_domain": "Sembunyikan segalanya dari {domain}",
   "account.blocked": "Terblokir",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Durasi jajak pendapat",
   "compose_form.poll.option_placeholder": "Pilihan {number}",
   "compose_form.poll.remove_option": "Hapus opsi ini",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
+  "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Tandai sebagai media sensitif",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 0fd5be2ac7..c1f1b37200 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Bæta á eða fjarlægja af listum",
   "account.badges.bot": "Róbót",
-  "account.badges.group": "Group",
+  "account.badges.group": "Hópur",
   "account.block": "Útiloka @{name}",
   "account.block_domain": "Fela allt frá {domain}",
   "account.blocked": "Útilokaður",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Tímalengd könnunar",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
   "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
+  "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
   "compose_form.publish": "Tíst",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Merkja myndir sem viðkvæmar",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index d4980d51c1..3d5353f2a6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Durata del sondaggio",
   "compose_form.poll.option_placeholder": "Scelta {number}",
   "compose_form.poll.remove_option": "Rimuovi questa scelta",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Modifica sondaggio per consentire scelte multiple",
+  "compose_form.poll.switch_to_single": "Modifica sondaggio per consentire una singola scelta",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Segna media come sensibile",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7ed3346c1a..76ad78012b 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -88,8 +88,8 @@
   "compose_form.poll.duration": "アンケート期間",
   "compose_form.poll.option_placeholder": "項目 {number}",
   "compose_form.poll.remove_option": "この項目を削除",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "複数選択用に変更",
+  "compose_form.poll.switch_to_single": "単一選択用に変更",
   "compose_form.publish": "トゥート",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive.hide": "メディアを閲覧注意にする",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 66d899b2fd..635a6c8bde 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
   "account.badges.bot": "봇",
-  "account.badges.group": "Group",
+  "account.badges.group": "그룹",
   "account.block": "@{name}을 차단",
   "account.block_domain": "{domain} 전체를 숨김",
   "account.blocked": "차단됨",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "투표 기간",
   "compose_form.poll.option_placeholder": "{number}번 항목",
   "compose_form.poll.remove_option": "이 항목 삭제",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
+  "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
   "compose_form.publish": "툿",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 0708c83abd..7dedbe2cc8 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
   "account.badges.bot": "Robô",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Bloquear {domain}",
   "account.blocked": "Bloqueado",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Duração da enquete",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.remove_option": "Remover opção",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Alterar para múltiplos votos",
+  "compose_form.poll.switch_to_single": "Alterar para voto único",
   "compose_form.publish": "TOOT",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marcar mídia como sensível",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index dfcb63fd8f..72eebaa1fb 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
   "account.badges.bot": "Robô",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Esconder tudo do domínio {domain}",
   "account.blocked": "Bloqueado",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Duração da votação",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.remove_option": "Eliminar esta opção",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Alterar a votação para permitir múltiplas escolhas",
+  "compose_form.poll.switch_to_single": "Alterar a votação para permitir uma única escolha",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Marcar multimédia como sensível",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 72c85169a2..89f3649474 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Управление списками",
   "account.badges.bot": "Бот",
-  "account.badges.group": "Group",
+  "account.badges.group": "Группа",
   "account.block": "Заблокировать @{name}",
   "account.block_domain": "Заблокировать {domain}",
   "account.blocked": "Заблокирован(а)",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Продолжительность опроса",
   "compose_form.poll.option_placeholder": "Вариант {number}",
   "compose_form.poll.remove_option": "Убрать этот вариант",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Переключить в режим выбора нескольких ответов",
+  "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
   "compose_form.publish": "Запостить",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Отметить медиафайл как деликатный",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 0c42944ee1..56e383da79 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
   "account.badges.bot": "บอต",
-  "account.badges.group": "Group",
+  "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
   "account.block_domain": "ซ่อนทุกอย่างจาก {domain}",
   "account.blocked": "ปิดกั้นอยู่",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6920d10dad..514e7b956c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Listelere ekle veya kaldır",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Grup",
   "account.block": "@{name} adlı kişiyi engelle",
   "account.block_domain": "{domain} alanından her şeyi gizle",
   "account.blocked": "Engellenmiş",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Anket süresi",
   "compose_form.poll.option_placeholder": "Seçim {number}",
   "compose_form.poll.remove_option": "Bu seçimi kaldır",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
+  "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
   "compose_form.publish": "Tootla",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Medyayı hassas olarak işaretle",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 2d972cf046..d94be9f5bb 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Thêm hoặc Xóa khỏi danh sách",
   "account.badges.bot": "Robot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Nhóm",
   "account.block": "Chặn @{name}",
   "account.block_domain": "Ẩn mọi thứ từ {domain}",
   "account.blocked": "Đã chặn",
@@ -84,8 +84,8 @@
   "compose_form.poll.duration": "Thời hạn",
   "compose_form.poll.option_placeholder": "Lựa chọn {number}",
   "compose_form.poll.remove_option": "Xóa lựa chọn này",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Sửa thăm dò để cho phép nhiều lựa chọn",
+  "compose_form.poll.switch_to_single": "Sửa thăm dò để cho phép một lựa chọn",
   "compose_form.publish": "Tút",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Đánh dấu hình ảnh nhạy cảm",
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 1e8c4806f6..43ff8ac12e 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -74,7 +74,7 @@ module Attachmentable
     self.class.attachment_definitions.each_key do |attachment_name|
       attachment = send(attachment_name)
 
-      next if attachment.blank?
+      next if attachment.blank? || attachment.queued_for_write[:original].blank?
 
       attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name))
     end
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index b8e55776de..e25172d6b2 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -25,7 +25,7 @@ ca:
       Aquest compte és un actor virtual utilitzat per a representar al propi servidor i no cap usuari individual.
       S'utilitza per a propòsits de federació i no ha de ser bloquejat si no voleu bloquejar tota la instància, en aquest cas hauríeu d'utilitzar un bloqueig de domini.
     learn_more: Més informació
-    privacy_policy: Política de privacitat
+    privacy_policy: Política de privadesa
     see_whats_happening: Mira què està passant
     server_stats: 'Estadístiques del servidor:'
     source_code: Codi font
@@ -71,9 +71,9 @@ ca:
       following: Has d'estar seguint la persona que vulguis avalar
     posts:
       one: Barrita
-      other: Barritadas
-    posts_tab_heading: Barritadas
-    posts_with_replies: Barritades i respostes
+      other: Tuts
+    posts_tab_heading: Tuts
+    posts_with_replies: Tuts i respostes
     reserved_username: El nom d'usuari està reservat
     roles:
       admin: Administrador
@@ -98,12 +98,12 @@ ca:
       avatar: Avatar
       by_domain: Domini
       change_email:
-        changed_msg: El correu electrònic del compte s'ha canviat correctament!
-        current_email: Correu electrònic actual
-        label: Canviar l'adreça de correu
-        new_email: Nova adreça de correu
-        submit: Canviar adreça de correu
-        title: Canviar adreça de correu de %{username}
+        changed_msg: L'adreça electrònica del compte s'ha canviat correctament!
+        current_email: Adreça electrònica actual
+        label: Canvia l'adreça electrònica
+        new_email: Adreça electrònica nova
+        submit: Canvia l'adreça electrònica
+        title: Canvia l'adreça electrònica de %{username}
       confirm: Confirma
       confirmed: Confirmat
       confirming: Confirmant
@@ -112,11 +112,11 @@ ca:
       disable: Inhabilita
       disable_two_factor_authentication: Desactiva 2FA
       disabled: Inhabilitat
-      display_name: Nom de visualització
+      display_name: Nom visible
       domain: Domini
       edit: Edita
-      email: Correu electrònic
-      email_status: Estat del correu electrònic
+      email: Adreça electrònica
+      email_status: Estat de l'adreça electrònica
       enable: Habilita
       enabled: Habilitat
       followers: Seguidors
@@ -345,7 +345,7 @@ ca:
         title: Nova adreça de correu en la llista negra
       title: Llista negra de correus electrònics
     followers:
-      back_to_account: Tornar al compte
+      back_to_account: Torna al compte
       title: Seguidors de %{acct}
     instances:
       by_domain: Domini
@@ -411,14 +411,14 @@ ca:
         none: Cap
       created_at: Reportat
       mark_as_resolved: Marca com a resolt
-      mark_as_unresolved: Marcar sense resoldre
+      mark_as_unresolved: Marcar com a sense resoldre
       notes:
-        create: Afegir nota
-        create_and_resolve: Resoldre amb nota
-        create_and_unresolve: Reobrir amb nota
-        delete: Esborrar
+        create: Afegeix una nota
+        create_and_resolve: Resol amb una nota
+        create_and_unresolve: Reobre amb una nota
+        delete: Esborra
         placeholder: Descriu les accions que s'han pres o qualsevol altra actualització relacionada…
-      reopen: Reobrir informe
+      reopen: Reobre l'informe
       report: 'Informe #%{id}'
       reported_account: Compte reportat
       reported_by: Reportat per
@@ -426,25 +426,25 @@ ca:
       resolved_msg: Informe resolt amb èxit!
       status: Estat
       title: Informes
-      unassign: Treure assignació
+      unassign: Treu l'assignació
       unresolved: No resolt
       updated_at: Actualitzat
     settings:
       activity_api_enabled:
-        desc_html: Compte d'estatus publicats localment, usuaris actius i registres nous en períodes setmanals
+        desc_html: Nombre d'estats publicats localment, usuaris actius i registres nous en períodes setmanals
         title: Publica estadístiques agregades sobre l'activitat de l'usuari
       bootstrap_timeline_accounts:
         desc_html: Separa diversos noms d'usuari amb comes. Només funcionaran els comptes locals i desblocats. El valor predeterminat quan està buit és tots els administradors locals.
         title: El seguiment per defecte per als usuaris nous
       contact_information:
-        email: Introdueix una adreça de correu electrònic pública
+        email: Adreça electrònica d'empresa
         username: Nom d'usuari del contacte
       custom_css:
         desc_html: Modifica l'aspecte amb CSS carregat a cada pàgina
         title: CSS personalitzat
       default_noindex:
         desc_html: Afecta a tots els usuaris que no han canviat aquest ajustament ells mateixos
-        title: Configurar per defecte als usuaris fora de l'indexació dels motor de cerca
+        title: Configura per defecte als usuaris fora de la indexació del motor de cerca
       domain_blocks:
         all: Per a tothom
         disabled: Per a ningú
@@ -554,7 +554,7 @@ ca:
       updated_msg: Ajustaments d'etiquetes actualitzats amb èxit
     title: Administració
     warning_presets:
-      add_new: Afegir nou
+      add_new: Afegeix-ne un de nou
       delete: Esborra
       edit: Edita
       edit_preset: Edita l'avís predeterminat
@@ -571,11 +571,11 @@ ca:
       body: 'La etiqueta #%{name} està actualment en tendència però no s''ha revisat prèviament. No es mostrarà públicament tret que ho permetis o guardis el formulari tal com està per a no tornar a escoltar res al respecte.'
       subject: Nova etiqueta pendent de revisió a %{instance} (#%{name})
   aliases:
-    add_new: Crear àlies
+    add_new: Crea un àlies
     created_msg: Nou àlies creat amb èxit. Ara pots iniciar el moviment des de'l compte vell.
     deleted_msg: Àlies eliminat amb èxit. Moure't des d'aquell compte a aquests ja no serà possible.
     hint_html: Si et vols moure des d'un altre compte a aquest, aquí pots crear un àlies, el qual és requerit abans que puguis procedir a moure els seguidors del compte vell a aquest. Aquesta acció és per si mateixa <strong>inofensiva i reversible</strong>. <strong>La migració del compte és iniciada des de'l compte vell</strong>.
-    remove: Desvincular l'àlies
+    remove: Desvincula l'àlies
   appearance:
     advanced_web_interface: Interfície web avançada
     advanced_web_interface_hint: 'Si vols fer ús de tota l''amplada de la teva pantalla, l''interfície web avançada et permet configurar diverses columnes per a veure molta més informació al mateix temps: Inici, notificacions, cronología federada i qualsevol número de llistes i etiquetes.'
@@ -587,7 +587,7 @@ ca:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Tothom hi pot contribuir.
     sensitive_content: Contingut sensible
-    toot_layout: Disseny de la barritada
+    toot_layout: Disseny del tut
   application_mailer:
     notification_preferences: Canvia les preferències de correu
     salutation: "%{name},"
@@ -618,7 +618,7 @@ ca:
     forgot_password: Has oblidat la contrasenya?
     invalid_reset_password_token: L'enllaç de restabliment de la contrasenya no és vàlid o ha caducat. Torna-ho a provar.
     login: Inicia sessió
-    logout: Tanca sessió
+    logout: Surt
     migrate_account: Mou a un compte diferent
     migrate_account_html: Si vols redirigir aquest compte a un altre diferent, el pots <a href="%{path}">configurar aquí</a>.
     or_log_in_with: O inicia sessió amb
@@ -720,7 +720,7 @@ ca:
       hint_html: Pots sol·licitar un arxiu de les teves <strong>barritades i dels fitxers multimèdia pujats</strong>. Les dades exportades tindran el format ActivityPub, llegible per qualsevol programari compatible. Pots sol·licitar un arxiu cada 7 dies.
       in_progress: S'està compilant el teu arxiu...
       request: Sol·licita el teu arxiu
-      size: Tamany
+      size: Mida
     blocks: Persones que has blocat
     csv: CSV
     domain_blocks: Bloquejos de dominis
@@ -748,7 +748,7 @@ ca:
       empty: No hi tens cap filtre.
       title: Filtres
     new:
-      title: Afegir nou filtre
+      title: Afegeix un filtre
   footer:
     developers: Desenvolupadors
     more: Més…
@@ -862,7 +862,7 @@ ca:
     title: Moderació
   notification_mailer:
     digest:
-      action: Veure totes les notificacions
+      action: Mostra totes les notificacions
       body: Un resum del que et vas perdre desde la darrera visita el %{since}
       mention: "%{name} t'ha mencionat en:"
       new_followers_summary:
@@ -921,6 +921,7 @@ ca:
       duration_too_long: està massa lluny en el futur
       duration_too_short: és massa aviat
       expired: L'enquesta ja ha finalitzat
+      invalid_choice: L’opció de vot escollida no existeix
       over_character_limit: no pot ser superior a %{max} caràcters cadascun
       too_few_options: ha de tenir més d'una opció
       too_many_options: no pot contenir més de %{max} opcions
@@ -1009,12 +1010,12 @@ ca:
     account: Compte
     account_settings: Ajustos del compte
     aliases: Àlies de compte
-    appearance: Aparènça
+    appearance: Aparença
     authorized_apps: Aplicacions autoritzades
     back: Torna a Mastodont
     delete: Eliminació del compte
     development: Desenvolupament
-    edit_profile: Editar perfil
+    edit_profile: Edita el perfil
     export: Exportació de dades
     featured_tags: Etiquetes destacades
     identity_proofs: Proves d'identitat
@@ -1058,7 +1059,7 @@ ca:
         one: "%{count} vot"
         other: "%{count} vots"
       vote: Vota
-    show_more: Mostrar més
+    show_more: Mostra'n més
     sign_in_to_participate: Inicia la sessió per participar a la conversa
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1069,7 +1070,7 @@ ca:
       unlisted: No llistat
       unlisted_long: Tothom ho pot veure, però no es mostra en la cronología federada
   stream_entries:
-    pinned: Barritada fixada
+    pinned: Tut fixat
     reblogged: ha impulsat
     sensitive_content: Contingut sensible
   tags:
@@ -1158,9 +1159,9 @@ ca:
       <p>Originalment adaptat des del <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} Condicions del servei i política de privadesa"
   themes:
-    contrast: Mastodont (Alt contrast)
-    default: Mastodont (Fosc)
-    mastodon-light: Mastodont (Clar)
+    contrast: Mastodon (alt contrast)
+    default: Mastodon (fosc)
+    mastodon-light: Mastodon (clar)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1205,7 +1206,7 @@ ca:
         silence: Compte limitat
         suspend: Compte suspès
     welcome:
-      edit_profile_action: Configurar perfil
+      edit_profile_action: Configura el perfil
       edit_profile_step: Pots personalitzar el teu perfil penjant un avatar, un encapçalament, canviant el teu nom de visualització i molt més. Si prefereixes revisar els seguidors nous abans de que et puguin seguir, pots blocar el teu compte.
       explanation: Aquests són alguns consells per a començar
       final_action: Comença a publicar
@@ -1214,7 +1215,7 @@ ca:
       full_handle_hint: Això és el que has de dir als teus amics perquè puguin enviar-te missatges o seguir-te des d'un altre servidor.
       review_preferences_action: Canviar preferències
       review_preferences_step: Assegura't d'establir les teves preferències, com ara els correus electrònics que vols rebre o el nivell de privadesa per defecte que t'agradaria que tinguin les teves entrades. Si no tens malaltia de moviment, pots optar per habilitar la reproducció automàtica de GIF.
-      subject: Benvingut/da a Mastodont
+      subject: Et donem la benvinguda a Mastodont
       tip_federated_timeline: La cronología federada és el cabal principal de la xarxa Mastodont. Però només inclou les persones a les quals els teus veïns estan subscrits, de manera que no està complet.
       tip_following: Per defecte segueixes als administradors del servidor. Per trobar més persones interessants, consulta les línies de temps local i federada.
       tip_local_timeline: La línia de temps local és la vista del flux de publicacions dels usuaris de %{instance}. Aquests usuaris són els teus veïns més propers!
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 0d6a23a45d..4cc1ed5fb2 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -921,6 +921,7 @@ co:
       duration_too_long: hè troppu luntanu indè u futuru
       duration_too_short: hè troppu prossimu
       expired: U scandagliu hè digià finitu
+      invalid_choice: L'uzzione di votu scelta ùn esista micca
       over_character_limit: ùn ponu micca esse più longhi chè %{max} caratteri
       too_few_options: deve avè più d'un'uzzione
       too_many_options: ùn pò micca avè più di %{max} uzzione
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 678aac7ee4..a9b101758a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -945,6 +945,7 @@ cs:
       duration_too_long: je příliš daleko v budoucnosti
       duration_too_short: je příliš brzy
       expired: Anketa již skončila
+      invalid_choice: Zvolená možnost hlasování neexistuje
       over_character_limit: nesmí být žádná delší než %{max} znaků
       too_few_options: musí mít více než jednu položku
       too_many_options: nesmí obsahovat více než %{max} položek
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 637edc2cd8..573d055def 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -40,7 +40,7 @@ ca:
       reconfirmation_instructions:
         explanation: Confirma la nova adreça per canviar el teu correu electrònic.
         extra: Si no has iniciat aquest canvi, ignora aquest correu electrònic. L'adreça electrònica del compte de Mastodon no canviarà fins que accedeixis a l'enllaç de dalt.
-        subject: 'Mastodon: Confirma el correu electrònic per a %{instance}'
+        subject: 'Mastodon: confirma l''adreça electrònica per a %{instance}'
         title: Verifica l'adreça de correu electrònic
       reset_password_instructions:
         action: Canviar contrasenya
@@ -76,8 +76,8 @@ ca:
       signed_up: Benvingut! T'has registrat amb èxit.
       signed_up_but_inactive: T´has registrat amb èxit. No obstant, no podem identificar-te perquè el compte encara no s'ha activat.
       signed_up_but_locked: T´has registrat amb èxit. No obstant, no podem identificar-te perquè el compte està blocat.
-      signed_up_but_pending: S'ha enviat un missatge amb un enllaç de confirmació a la teva adreça de correu electrònic. Després de que hagis fet clic a l'enllaç, revisarem la teva sol·licitud. Se't notificarà si s'aprova.
-      signed_up_but_unconfirmed: Un missatge amb un enllaç de confirmació ha estat enviat per correu electrònic. Si us plau segueixi l'enllaç per activar el seu compte.
+      signed_up_but_pending: S'ha enviat un missatge amb un enllaç de confirmació a la teva adreça de correu electrònic. Després que hagis fet clic a l'enllaç, revisarem la sol·licitud. Se't notificarà si s'aprova.
+      signed_up_but_unconfirmed: S'ha enviat per correu electrònic un missatge amb un enllaç de confirmació. Fes clic a l'enllaç per a activar el compte.
       update_needs_confirmation: Ha actualitzat el seu compte amb èxit, però necessitem verificar la nova adreça de correu. Si us plau comprovi el correu i segueixi l'enllaç per confirmar la nova adreça de correu.
       updated: El seu compte ha estat actualitzat amb èxit.
     sessions:
@@ -86,8 +86,8 @@ ca:
       signed_out: Has tancat la sessió amb èxit.
     unlocks:
       send_instructions: En pocs minuts rebràs un correu electrònic amb instruccions sobre com desbloquejar el teu compte. Si us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu.
-      send_paranoid_instructions: Si el compte existeix, rebràs en pocs minuts un correu electrònic amb instruccions sobre com desbloquejar-lo. Si us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu.
-      unlocked: El compte s'ha blocat correctament. Inicia sessió per a continuar.
+      send_paranoid_instructions: Si el compte existeix, rebràs en pocs minuts un correu electrònic amb instruccions sobre com desbloquejar-lo. Verifica la carpeta de correu brossa si no has rebut aquest correu.
+      unlocked: El compte s'ha desblocat correctament. Inicia sessió per a continuar.
   errors:
     messages:
       already_confirmed: ja està confirmat. Intenta d'iniciar sessió
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index cc5ef38671..6772443b0c 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -2,7 +2,7 @@
 et:
   devise:
     confirmations:
-      confirmed: Sinu e-postiaadress on edukalt kinnitatud.
+      confirmed: Teie e-postiaadress on edukalt kinnitatud.
       send_instructions: Te saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
       send_paranoid_instructions: Kui Teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
     failure:
@@ -10,7 +10,7 @@ et:
       inactive: Teie konto pole veel aktiveeritud.
       invalid: Valed %{authentication_keys} või parool.
       last_attempt: Teil on veel üks katse kuni teie konto on lukustatud.
-      locked: Sinu konto on lukustatud.
+      locked: Teie konto on lukustatud.
       not_found_in_database: Valed %{authentication_keys} või parool.
       pending: Teie konto on siiani läbivaatlusel.
       timeout: Teie sessioon on aegunud. Jätkamiseks palun sisenege uuesti.
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 49c7cade97..204ac429bf 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -38,7 +38,6 @@ ar:
         application: تطبيق
         callback_url: رابط رد النداء
         delete: حذف
-        empty: ليس لديك أية تطبيقات.
         name: التسمية
         new: تطبيق جديد
         scopes: المجالات
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 728780406f..3c69cf8e7e 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -38,7 +38,6 @@ ca:
         application: Aplicació
         callback_url: URL de retorn
         delete: Suprimeix
-        empty: No tens cap aplicació.
         name: Nom
         new: Aplicació nova
         scopes: Àmbits
@@ -69,13 +68,13 @@ ca:
       buttons:
         revoke: Revoca
       confirmations:
-        revoke: Estàs segur?
+        revoke: N'estàs segur?
       index:
         application: Aplicació
         created_at: Creat el
         date_format: "%A-%m-%d %H:%M:%S"
         scopes: Àmbits
-        title: Les teves aplicacions autoritzades
+        title: Les aplicacions autoritzades
     errors:
       messages:
         access_denied: El propietari del recurs o servidor d'autorizació ha denegat la petició.
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 4f03c0c323..a64a079318 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -38,7 +38,6 @@ co:
         application: Applicazione
         callback_url: URL di richjama
         delete: Toglie
-        empty: Ùn avete micca d'applicazione.
         name: Nome
         new: Applicazione nova
         scopes: Scopi
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 00345db76c..8c5c175f5d 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -38,7 +38,6 @@ cs:
         application: Aplikace
         callback_url: Zpáteční URL
         delete: Smazat
-        empty: Nemáte žádné aplikace.
         name: Název
         new: Nová aplikace
         scopes: Rozsahy
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 8b850b56a6..65fb2de88a 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -38,7 +38,6 @@ de:
         application: Anwendung
         callback_url: Callback-URL
         delete: Löschen
-        empty: Du hast keine Anwendungen.
         name: Name
         new: Neue Anwendung
         scopes: Befugnisse
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 7423606d4c..d4bf0ae775 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -38,7 +38,6 @@ el:
         application: Εφαρμογή
         callback_url: URL επιστροφής (Callback)
         delete: Διαγραφή
-        empty: Δεν έχετε αιτήσεις.
         name: Όνομα
         new: Νέα εφαρμογή
         scopes: Εύρος εφαρμογής
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index 5f54f1a5f2..cb12d0e821 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -38,7 +38,6 @@ eo:
         application: Aplikaĵo
         callback_url: Revena URL
         delete: Forigi
-        empty: Vi havas neniun aplikaĵon.
         name: Nomo
         new: Nova aplikaĵo
         scopes: Ampleksoj
@@ -119,6 +118,8 @@ eo:
       admin:read:accounts: legas senteman informacion de ĉiuj kontoj
       admin:read:reports: legas konfidencajn informojn de ĉiuj signaloj kaj signalitaj kontoj
       admin:write: modifu ĉiujn datumojn en la servilo
+      admin:write:accounts: plenumi agojn de kontrolo sur kontoj
+      admin:write:reports: plenumi agojn de kontrolo sur signaloj
       follow: ŝanĝi rilatojn al aliaj kontoj
       push: ricevi viajn puŝ-sciigojn
       read: legi ĉiujn datumojn de via konto
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 85ab7729de..61b14ba16c 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -38,7 +38,6 @@ es-AR:
         application: Aplicación
         callback_url: Dirección web de respuesta ("callback")
         delete: Eliminar
-        empty: No tenés aplicaciones.
         name: Nombre
         new: Nueva aplicación
         scopes: Ámbitos
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index ba437ca9bd..75a04eccf2 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -38,7 +38,6 @@ es:
         application: Aplicación
         callback_url: URL de callback
         delete: Eliminar
-        empty: No tienes aplicaciones.
         name: Nombre
         new: Nueva aplicación
         scopes: Ámbitos
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index d3b011a67a..8fb9446317 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -38,7 +38,6 @@ et:
         application: Rakendus
         callback_url: Ümbersuunamise URL
         delete: Kustuta
-        empty: Teil pole rakendusi.
         name: Nimi
         new: Uus rakendus
         scopes: Ulatused
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 10ef75dc4f..19cc409928 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -38,7 +38,6 @@ eu:
         application: Aplikazioa
         callback_url: Itzulera URLa
         delete: Ezabatu
-        empty: Ez duzu eskaerarik.
         name: Izena
         new: Aplikazio berria
         scopes: Irismena
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index c9ca1895e6..03a8d7963e 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -38,7 +38,6 @@ fa:
         application: برنامه
         callback_url: نشانی Callback
         delete: حذف
-        empty: شما هیچ برنامه‌ای ندارید.
         name: نام
         new: برنامهٔ تازه
         scopes: دامنه‌ها
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 71547b9847..9cb5d754c8 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -38,7 +38,6 @@ gl:
         application: Aplicativo
         callback_url: URL de chamada
         delete: Eliminar
-        empty: Non tes aplicacións.
         name: Nome
         new: Novo aplicativo
         scopes: Permisos
diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml
index b461a77b6a..efaeaae169 100644
--- a/config/locales/doorkeeper.id.yml
+++ b/config/locales/doorkeeper.id.yml
@@ -38,7 +38,6 @@ id:
         application: Aplikasi
         callback_url: URL Callback
         delete: Hapus
-        empty: Anda tidak punya aplikasi.
         name: Nama
         new: Aplikasi baru
         scopes: Cakupan
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 68e2b57f3e..122b38c04a 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -38,7 +38,6 @@ it:
         application: Applicazione
         callback_url: URL di callback
         delete: Elimina
-        empty: Non hai applicazioni.
         name: Nome
         new: Nuova applicazione
         scopes: Visibilità
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 72c98c00c4..67eadbf2d2 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -38,7 +38,6 @@ ja:
         application: アプリ
         callback_url: コールバックURL
         delete: 削除
-        empty: アプリがありません
         name: 名前
         new: 新規アプリ
         scopes: アクセス権
diff --git a/config/locales/doorkeeper.kk.yml b/config/locales/doorkeeper.kk.yml
index 75f8de5429..2c3346b6eb 100644
--- a/config/locales/doorkeeper.kk.yml
+++ b/config/locales/doorkeeper.kk.yml
@@ -38,7 +38,6 @@ kk:
         application: Қосымша
         callback_url: Callbаck URL
         delete: Өшіру
-        empty: Сізде ешқандай қосымша жоқ.
         name: Аты
         new: Жаңа қосымша
         scopes: Scopеs
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 3d4cb4441d..3f9e128574 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -38,7 +38,6 @@ ko:
         application: 애플리케이션
         callback_url: 콜백 URL
         delete: 삭제
-        empty: 어플리케이션이 없습니다
         name: 이름
         new: 새 애플리케이션
         scopes: 범위
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 90d8f93580..215c8795d0 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -38,7 +38,6 @@ pt-BR:
         application: Aplicativos
         callback_url: Link de retorno
         delete: Excluir
-        empty: Não tem aplicações.
         name: Nome
         new: Novo aplicativo
         scopes: Autorizações
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 2433f23e9c..e23310a187 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -38,7 +38,6 @@ pt-PT:
         application: Aplicações
         callback_url: URL de retorno
         delete: Eliminar
-        empty: Não tem aplicações.
         name: Nome
         new: Nova Aplicação
         scopes: Autorizações
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index 532e2c9aca..f04a1306d4 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -38,7 +38,6 @@ ru:
         application: Приложение
         callback_url: Callback URL
         delete: Удалить
-        empty: У вас нет созданных приложений.
         name: Название
         new: Новое приложение
         scopes: Разрешения
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index d9367ce5ea..af98020c1a 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -38,7 +38,6 @@ sv:
         application: Applikation
         callback_url: Återkalls URL
         delete: Ta bort
-        empty: Du har inga program.
         name: Namn
         new: Ny applikation
         scopes: Omfattning
diff --git a/config/locales/doorkeeper.ta.yml b/config/locales/doorkeeper.ta.yml
index 2f266a754d..879b6ab213 100644
--- a/config/locales/doorkeeper.ta.yml
+++ b/config/locales/doorkeeper.ta.yml
@@ -16,7 +16,6 @@ ta:
         error: அய்யோ! உள்ளீடுகளில் உள்ள தவறுகளைச் சரி செய்யுங்கள்
       index:
         application: பயன்பாடு
-        empty: செயலிகள் எதுவும் இல்லை.
         title: உங்களது பயன்பாடுகள்
       new:
         title: புதிய பயன்பாடு
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 597a65038d..33d6944f0b 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -36,7 +36,6 @@ th:
         application: แอปพลิเคชัน
         callback_url: URL เรียกกลับ
         delete: ลบ
-        empty: คุณไม่มีแอปพลิเคชัน
         name: ชื่อ
         new: แอปพลิเคชันใหม่
         scopes: ขอบเขต
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index a218e31575..b4362f2a27 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -38,7 +38,6 @@ tr:
         application: Uygulama
         callback_url: Geri Dönüş URL
         delete: Sil
-        empty: Hiç uygulamanız yok.
         name: İsim
         new: Yeni uygulama
         scopes: Kapsam
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 3c640074dd..f9374272f3 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -652,6 +652,7 @@ eo:
     success_msg: Via konto estis sukcese forigita
     warning:
       email_change_html: Vi povas <a href="%{path}">ŝanĝi vian retadreson</a> sen forigi vian konton
+      more_details_html: Por pli da detaloj, vidi la <a href="%{terms_path}">privatecan politikon</a>.
       username_available: Via uzantnomo iĝos denove disponebla
       username_unavailable: Via uzantnomo restos nedisponebla
   directories:
@@ -850,6 +851,7 @@ eo:
       title: Nova diskonigo
   notifications:
     email_events: Eventoj por retpoŝtaj sciigoj
+    email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
     other_settings: Aliaj agordoj de sciigoj
   number:
     human:
@@ -874,6 +876,7 @@ eo:
       duration_too_long: estas tro for en la estonteco
       duration_too_short: estas tro frue
       expired: La enketo jam finiĝis
+      invalid_choice: La elektita voĉdono ne ekzistas
       over_character_limit: ne povas esti po pli longa ol %{max} signoj
       too_few_options: devas enhavi pli da unu propono
       too_many_options: ne povas enhavi pli da %{max} proponoj
@@ -1023,6 +1026,8 @@ eo:
     pinned: Alpinglita
     reblogged: diskonigita
     sensitive_content: Tikla enhavo
+  tags:
+    does_not_match_previous_name: ne kongruas kun la antaŭa nomo
   terms:
     title: Uzkondiĉoj kaj privateca politiko de %{instance}
   themes:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 20c0aff036..da1ad126f8 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -921,6 +921,7 @@ es-AR:
       duration_too_long: está demasiado lejos en el futuro
       duration_too_short: es demasiado pronto
       expired: La encuesta ya finalizó
+      invalid_choice: La opción elegida no existe
       over_character_limit: no puede ser más largo de %{max} caracteres, cada uno
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1c56cff6ae..113ea36724 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -70,10 +70,10 @@ es:
     pin_errors:
       following: Debes estar siguiendo a la persona a la que quieres aprobar
     posts:
-      one: Barritar
+      one: Toot
       other: Toots
-    posts_tab_heading: Bramidos
-    posts_with_replies: Bramidos con respuestas
+    posts_tab_heading: Toots
+    posts_with_replies: Toots con respuestas
     reserved_username: El nombre de usuario está reservado
     roles:
       admin: Administrador
@@ -382,7 +382,7 @@ es:
       disable: Deshabilitar
       disabled: Deshabilitado
       enable: Hablitar
-      enable_hint: Una vez conectado, tu servidor se suscribirá a todos los bramidos públicos de este relés, y comenzará a enviar los bramidos públicos de este servidor hacia él.
+      enable_hint: Una vez conectado, tu servidor se suscribirá a todos los toots públicos de este relés, y comenzará a enviar los toots públicos de este servidor hacia él.
       enabled: Habilitado
       inbox_url: URL del relés
       pending: Esperando la aprobación del relés
@@ -717,7 +717,7 @@ es:
     archive_takeout:
       date: Fecha
       download: Descargar tu archivo
-      hint_html: Puedes solicitar un archivo de tus <strong>bramidos y materiales subidos</strong>. Los datos exportados estarán en formato ActivityPub, legibles por cualquier programa compatible.
+      hint_html: Puedes solicitar un archivo de tus <strong>toots y archivos multimedia subidos</strong>. Los datos exportados estarán en formato ActivityPub, legibles por cualquier software compatible.
       in_progress: Recopilando tu archivo...
       request: Solicitar tu archivo
       size: Tamaño
@@ -891,8 +891,8 @@ es:
       subject: Fuiste mencionado por %{name}
       title: Nueva mención
     reblog:
-      body: "%{name} ha rebarritado tu estado:"
-      subject: "%{name} ha rebarritado tu estado"
+      body: "%{name} ha retooteado tu estado:"
+      subject: "%{name} ha retooteado tu estado"
       title: Nueva difusión
   notifications:
     email_events: Eventos para notificaciones por correo electrónico
@@ -1047,9 +1047,9 @@ es:
     open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
-      limit: Ya has fijado el número máximo de bramidos
-      ownership: El bramido de alguien más no puede fijarse
-      private: Los bramidos no-públicos no pueden fijarse
+      limit: Ya has fijado el número máximo de publicaciones
+      ownership: El toot de alguien más no puede fijarse
+      private: Los toots no-públicos no pueden fijarse
       reblog: Un boost no puede fijarse
     poll:
       total_people:
@@ -1070,8 +1070,8 @@ es:
       unlisted: Público, pero no mostrar en la historia federada
       unlisted_long: Todos pueden ver, pero no está listado en las cronologías públicas
   stream_entries:
-    pinned: Bramido fijado
-    reblogged: rebramido
+    pinned: Toot fijado
+    reblogged: retooteado
     sensitive_content: Contenido sensible
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 02bfb636c9..16e80ae353 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -924,6 +924,7 @@ et:
       duration_too_long: kestab liiga kaua
       duration_too_short: on liiga vara
       expired: See küsitlus on juba lõppenud
+      invalid_choice: Valitud küsitluse valikut pole olemas
       over_character_limit: igaüks ei saa olla rohkem kui %{max} tähemärki
       too_few_options: peab olema rohkem kui üks vastus
       too_many_options: ei saa sisaldada rohkem kui %{max} vastust
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 1a24275eea..81c163f7f0 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -923,6 +923,7 @@ fa:
       duration_too_long: در آیندهٔ خیلی دور است
       duration_too_short: در آیندهٔ خیلی نزدیک است
       expired: این نظرسنجی به پایان رسیده است
+      invalid_choice: گزینه رای دادن وجود ندارد
       over_character_limit: هر کدام نمی‌تواند از %{max} نویسه طولانی‌تر باشد
       too_few_options: حتماً باید بیش از یک گزینه داشته باشد
       too_many_options: نمی‌تواند بیشتر از %{max} گزینه داشته باشد
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 705236e7d1..9c8f56889e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -339,6 +339,7 @@ fr:
       delete: Supprimer
       destroyed_msg: Le blocage de domaine de courriel a été désactivé
       domain: Domaine
+      empty: Aucun domaine de courriel n’est actuellement sur liste noire.
       new:
         create: Créer le blocage
         title: Nouveau blocage de domaine de courriel
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index ba6fbed7ca..ae3cc479c1 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -922,6 +922,7 @@ hu:
       duration_too_long: túl távoli időpont
       duration_too_short: túl közeli időpont
       expired: A szavazásnak már vége
+      invalid_choice: A kiválasztott szavazási lehetőség nem létezik
       over_character_limit: egyik sem lehet %{max} karakternél hosszabb
       too_few_options: több, mint egy opciónak kell lennie
       too_many_options: nem lehet több, mint %{max} opció
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 99d2741226..2a759bc5f6 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -892,6 +892,7 @@ id:
       duplicate_options: berisi item ganda
       duration_too_short: terlalu cepat
       expired: Japat telah berakhir
+      invalid_choice: Opsi pilihan yang dipilih tidak ada
       over_character_limit: tidak boleh lebih dari %{max} karakter
       too_few_options: harus punya lebih dari satu item
       too_many_options: tidak boleh berisi lebih dari %{max} item
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 424be5ce9c..a4d21deb26 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -59,7 +59,7 @@ is:
     following: Fylgist með
     joined: Gerðist þátttakandi %{date}
     last_active: síðasta virkni
-    link_verified_on: Eignarhald á þessum tengli var athugað þann {date}
+    link_verified_on: Eignarhald á þessum tengli var athugað þann %{date}
     media: Myndskrár
     moved_html: "%{name} hefur verið færður í %{new_profile_link}:"
     network_hidden: Þessar upplýsingar ekki tiltækar
@@ -223,7 +223,7 @@ is:
         suspend_account: "%{name} setti notandaaðganginn %{target} í bið"
         unassigned_report: "%{name} fjarlægði úthlutun af skýrslu %{target}"
         unsilence_account: "%{name} hætti að hylja notandaaðganginn %{target}"
-        unsuspend_account: "%{name} tók notandaaðganginn {target} úr bið"
+        unsuspend_account: "%{name} tók notandaaðganginn %{target} úr bið"
         update_custom_emoji: "%{name} uppfærði tjáningartákn %{target}"
         update_status: "%{name} uppfærði stöðufærslu frá %{target}"
       deleted_status: "(eydd stöðufærsla)"
@@ -452,6 +452,8 @@ is:
         users: Til innskráðra staðværra notenda
       domain_blocks_rationale:
         title: Birta röksemdafærslu
+      enable_bootstrap_timeline_accounts:
+        title: Virkja sjálfgefnar fylgnistillingar fyrir nýja notendur
       hero:
         desc_html: Birt á forsíðunni. Mælt með að hún sé a.m.k. 600×100 mynddílar. Þegar þetta er ekki stillt, er notuð smámynd netþjónsins
         title: Aðalmynd
@@ -483,6 +485,9 @@ is:
           none: Enginn getur nýskráð sig
           open: Allir geta nýskráð sig
         title: Nýskráningarhamur
+      show_known_fediverse_at_about_page:
+        desc_html: Þegar þetta er óvirkt, takmarkast opinbera tímalínan sem tengt er í af upphafssíðunni við að birta einungis staðvært efni (af sama vefþjóni)
+        title: Hafa með efni úr skýjasambandi á síðu fyrir óauðkennda opinbera tímalínu
       show_staff_badge:
         desc_html: Sýna starfsmannamerki á síðu notandans
         title: Sýna starfsmannamerki
@@ -505,11 +510,15 @@ is:
       thumbnail:
         desc_html: Notað við forskoðun í gegnum OpenGraph og API-kerfisviðmót. Mælt með 1200×630 mynddílum
         title: Smámynd vefþjóns
+      timeline_preview:
+        desc_html: Birta tengil í opinbera tímalínu á upphafssíðu og leyfa aðgang API-kerfisviðmóts að opinberri tímalínu án auðkenningar
+        title: Leyfa óauðkenndan aðgang að opinberri tímalínu
       title: Stillingar vefsvæðis
       trendable_by_default:
         desc_html: Hefur áhrif á myllumerki sem ekki hafa áður verið gerð óleyfileg
         title: Leyfa myllumerkjum að fara í umræðuna án þess að þau séu fyrst yfirfarin
       trends:
+        desc_html: Birta opinberlega þau áður yfirförnu myllumerki sem eru núna í umræðunni
         title: Myllumerki í umræðunni
     statuses:
       back_to_account: Fara aftur á síðu notandaaðgangsins
@@ -522,11 +531,13 @@ is:
       media:
         title: Myndefni
       no_media: Ekkert myndefni
+      no_status_selected: Engum stöðufærslum var breytt þar sem engar voru valdar
       title: Staða notendaaðganga
       with_media: Með myndefni
     tags:
       accounts_today: Einstök afnot í dag
       accounts_week: Einstök afnot í þessari viku
+      breakdown: Samantekt á notkun dagsins eftir uppruna
       context: Samhengi
       directory: Í möppunni
       in_directory: "%{count} í möppunni"
@@ -540,6 +551,7 @@ is:
       trending_right_now: Í umræðunni nákvæmlega núna
       unique_uses_today: "%{count} færslur í dag"
       unreviewed: Ekki yfirfarið
+      updated_msg: Það tókst að uppfæra stillingar myllumerkja
     title: Stjórnendur
     warning_presets:
       add_new: Bæta við nýju
@@ -549,15 +561,20 @@ is:
       title: Sýsla með forstilltar aðvaranir
   admin_mailer:
     new_pending_account:
+      body: Nákvæmari upplýsingar um nýja notandaaðganginn eru hér fyrir neðan. Þú getur samþykkt eða hafnað þessari umsókn.
       subject: Nýr notandaaðgangur er kominn til yfirferðar á %{instance} (%{username})
     new_report:
       body: "%{reporter} hefur kært %{target}"
       body_remote: Einhver frá %{domain} hefur kært %{target}
       subject: Ný kæra vegna %{instance} (#%{id})
     new_trending_tag:
+      body: 'Myllumerkið #%{name} er í umræðunni í dag, en hefur ekki verið yfirfarið áður. Það mun ekki verða birt opinberlega nema að þú samþykkir það, annars geturðu vistað eyðublaðið óbreytt og aldrei heyrt á þetta minnst framar.'
       subject: Nýtt myllumerki er komið til yfirferðar á %{instance} (#%{name})
   aliases:
-    add_new: Búa til samnefni
+    add_new: Búa til samnefni (alias)
+    created_msg: Tókst að búa til samnefni. Þú getur núna byrjað að færa gögn af gamla aðgangnum.
+    deleted_msg: Tókst að fjarlægja samnefnið. Flutningur af þeim notandaaðgangi yfir á þennan er ekki lengur mögulegur.
+    hint_html: Ef þú vilt flytjast af öðrum notandaaðgangi yfir á þennan, þá geturðu búið hér til samnefni, sem er nauðsynlegt áður en þú getur haldið áfram við að flytja fylgjendur af gamla notandaaðgangnum yfir á þennan aðgang. Þessi aðgerð er í sjálfu sér <strong>skaðlaus og afturkræf</strong>. <strong>Yfirfærsla notandaaðgangsins er síðan ræst á gamla notandaaðgangnum</strong>.
     remove: Aftengja samnefni
   appearance:
     advanced_web_interface: Ítarlegt vefviðmót
@@ -596,12 +613,14 @@ is:
     description:
       prefix_invited_by_user: "@%{name} býður þér að taka þátt á þessum Mastodon-vefþjóni!"
       prefix_sign_up: Skráðu þig á Mastodon strax í dag!
+      suffix: Með notandaaðgangi geturðu fylgst með fólki, sent inn stöðufærslur og skipst á skilaboðum við notendur á hvaða Mastodon-vefþjóni sem er, auk margs fleira!
     didnt_get_confirmation: Fékkstu ekki leiðbeiningar um hvernig eigi að staðfesta aðganginn?
     forgot_password: Gleymdirðu lykilorðinu?
-    invalid_reset_password_token: Teikn fyrir endurstillingu lykilorðs er ógilt eðaútrunnið. Biddu um nýtt.
+    invalid_reset_password_token: Teikn fyrir endurstillingu lykilorðs er ógilt eða útrunnið. Biddu um nýtt teikn.
     login: Skrá inn
     logout: Skrá út
     migrate_account: Færa á annan notandaaðgang
+    migrate_account_html: Ef þú vilt endurbeina þessum aðgangi á einhvern annan, geturðu <a href="%{path}">stillt það hér</a>.
     or_log_in_with: Eða skráðu inn með
     providers:
       cas: CAS
@@ -613,14 +632,19 @@ is:
     security: Öryggi
     set_new_password: Stilla nýtt lykilorð
     setup:
+      email_below_hint_html: Ef tölvupóstfangið hér fyrir neðan er rangt, skaltu breyta því hér og fá nýjan staðfestingarpóst.
+      email_settings_hint_html: Staðfestingarpósturinn var sendur til %{email}. Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
       title: Uppsetning
     status:
       account_status: Staða notandaaðgangs
       confirming: Bíð eftir að staðfestingu tölvupósts sé lokið.
       functional: Notandaaðgangurinn þinn er með fulla virkni.
+      pending: Umsóknin þín bíður eftir að starfsfólkið okkar fari yfir hana. Það gæti tekið nokkurn tíma. Þú munt fá tölvupóst ef umsóknin er samþykkt.
+      redirecting_to: Notandaaðgangurinn þinn er óvirkur vegna þess að hann endurbeinist á %{acct}.
     trouble_logging_in: Vandræði við að skrá inn?
   authorize_follow:
     already_following: Þú ert að þegar fylgjast með þessum aðgangi
+    error: Því miður, það kom upp villa við að fletta upp fjartengda notandaaðgangnum
     follow: Fylgja
     follow_request: 'Þú sendir beiðni um að fylgjast með til:'
     following: 'Tókst! Þú ert núna að fylgjast með:'
@@ -657,6 +681,10 @@ is:
     warning:
       before: 'Áður en haldið er áfram, skaltu lesa þessa minnispunkta gaumgæfilega:'
       caches: Efni sem aðrir netþjónar hafa sett í skyndiminni gæti verið til staðar áfram
+      data_removal: Færslurnar þínar og önnur gögn verða endanlega fjarlægð
+      email_change_html: Þú getur <a href="%{path}">breytt tölvupóstfanginu þínu</a> án þess að eyða aðgangnum þínum
+      email_contact_html: Ef hann berst ekki geturðu sent póst á <a href="mailto:%{email}">%{email}</a> til að fá aðstoð
+      email_reconfirmation_html: Ef staðfestingarpósturinn berst ekki geturðu <a href="%{path}">beðið um hann aftur</a>
       irreversible: Þú munt ekki getað endurheimt eða endurvirkjað aðganginn þinn
       more_details_html: Til að skoða þetta nánar, er gott að líta á <a href="%{terms_path}">persónuverndarstefnuna</a>.
       username_available: Notandanafnið þitt mun verða tiltækt aftur
@@ -676,11 +704,12 @@ is:
     '422':
       content: Öryggisprófun mistókst. Ertu að loka á vefkökur/fótspor?
       title: Öryggisprófun mistókst
-    '429': Throttled
+    '429': Í hægagangi
     '500':
       content: Því miður, en eitthvað fór úrskeiðis á okkar enda.
       title: Þessi síða er ekki rétt
-    '503': The page could not be served due to a temporary server failure.
+    '503': Ekki var hægt að afgreiða síðuna vegna tímabundinnar bilunar á vefþjóni.
+    noscript_html: Til að nota vefútgáfu Mastodon þarftu að virkja JavaScript. Þú getur líka prófað eitt af Mastodon <a href="%{apps_path}">forritunum</a> fyrir stýrikerfið þitt.
   existing_username_validator:
     not_found: Fann ekki staðværan notanda með þetta notandanafn
     not_found_multiple: tókst ekki að finna %{usernames}
@@ -714,6 +743,7 @@ is:
       invalid_context: Ekkert eða ógilt samhengi var gefið
     index:
       delete: Eyða
+      empty: Þú ert ekki með neinar síur.
       title: Síur
     new:
       title: Bæta við nýrri síu
@@ -777,6 +807,7 @@ is:
       one: 1 afnot
       other: "%{count} afnot"
     max_uses_prompt: Engin takmörk
+    prompt: Útbúðu og deildu tenglum með öðrum til að veita aðgang að þessum vefþjóni
     table:
       expires_at: Rennur út
       uses: Afnot
@@ -791,18 +822,29 @@ is:
   migrations:
     acct: Færði í
     cancel: Hætta við endurbeiningu
+    cancel_explanation: Sé hætt við endurbeiningu verður núverandi aðgangur þinn endurvirkjaður, en það mun ekki ná til baka þeim fylgjendum sem hafa verið fluttir á þann aðgang.
     cancelled_msg: Tókst að hætta við endurbeiningu.
     errors:
+      already_moved: er sami aðgangur og þú hefur þegar flutt þig á
+      missing_also_known_as: er ekki að bakvísa í þennan aðgang
       move_to_self: getur ekki verið núverandi aðgangur
       not_found: fannst ekki
       on_cooldown: Þú ert í kælingu
     followers_count: Fylgjendur þegar flutningur átti sér stað
+    incoming_migrations: Flytjast frá öðrum aðgangi
+    incoming_migrations_html: Til að flytjast af öðrum notandaaðgangi yfir á þennan, þarftu fyrst að <a href="%{path}">útbúa samnefni fyrir aðgang</a>.
+    moved_msg: Notandaaðgangurinn þinn endurbeinist núna á %{acct} og er verið að yfirfæra fylgjendurna þína.
+    not_redirecting: Notandaaðgangurinn þinn er ekki að endurbeinast á neinn annan aðgang.
+    on_cooldown: Þú hefur nýverið yfirfært aðganginn þinn. Þessi aðgerð verður tiltæk aftur eftir %{count} daga.
     past_migrations: Fyrri yfirfærslur
     proceed_with_move: Færa fylgjendur
     redirecting_to: Notandaaðgangurinn þinn endurbeinist á %{acct}.
     set_redirect: Stilla endurbeiningu
     warning:
+      backreference_required: Það verður fyrst að stilla nýja aðganginn til að bakvísa á þennan aðgang
       before: 'Áður en haldið er áfram, skaltu lesa þessa minnispunkta gaumgæfilega:'
+      cooldown: Eftir yfirfærslu/flutning kemur kælingartímabil á meðan þú getur ekki flutt þig aftur
+      followers: Þessi aðgerð mun flytja alla fylgjendur af núverandi aðgangi yfir á nýja aðganginn
       only_redirect_html: Einnig geturðu <a href="%{path}">einungis sett upp endurbeiningu á notandasniðið þitt</a>.
       other_data: Engin önnur gögn munu flytjast sjálfvirkt
   moderation:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 02bd800929..4ef87a5bc5 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -910,6 +910,7 @@ kk:
       duration_too_long: тым ұзақ екен
       duration_too_short: тым аз екен
       expired: Сауалнама уақыты аяқталған
+      invalid_choice: Таңдалған жауап енді жоқ екен
       over_character_limit: "%{max} таңбадан артық болмайды"
       too_few_options: бір жауаптан көп болуы керек
       too_many_options: "%{max} жауаптан көп болмайды"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 92eb364cd9..25bb714ef9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -911,7 +911,7 @@ ko:
       duration_too_long: 너무 먼 미래입니다
       duration_too_short: 너무 가깝습니다
       expired: 투표가 이미 끝났습니다
-      invalid_choice: 선택한 옵션이 존재하지 않습니다
+      invalid_choice: 선택한 투표 항목이 존재하지 않습니다
       over_character_limit: 각각 %{max} 글자를 넘을 수 없습니다
       too_few_options: 한가지 이상의 항목을 포함해야 합니다
       too_many_options: 항목은 %{max}개를 넘을 수 없습니다
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c3ddd69a71..7fe2c8946e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -339,7 +339,7 @@ pt-BR:
       delete: Excluir
       destroyed_msg: Domínio de e-mail desbloqueado
       domain: Domínio
-      empty: Nenhum domínio de e-mail atualmente na lista negra.
+      empty: Sem domínios de e-mail bloqueados.
       new:
         create: Adicionar domínio
         title: Novo domínio de e-mail bloqueado
@@ -745,7 +745,7 @@ pt-BR:
       invalid_irreversible: O filtro irreversível só funciona com os contextos página inicial e notificações
     index:
       delete: Remover
-      empty: Não tem filtros.
+      empty: Sem filtros.
       title: Filtros
     new:
       title: Adicionar filtro
@@ -921,6 +921,7 @@ pt-BR:
       duration_too_long: é muito longe no futuro
       duration_too_short: é curto demais
       expired: A enquete já terminou
+      invalid_choice: Opção inválida
       over_character_limit: não pode ter mais que %{max} caracteres em cada
       too_few_options: deve ter mais que um item
       too_many_options: não pode ter mais que %{max} itens
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 4be5024ad5..8628c5774d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -921,6 +921,7 @@ pt-PT:
       duration_too_long: está demasiado à frente no futuro
       duration_too_short: é demasiado cedo
       expired: A sondagem já terminou
+      invalid_choice: A opção de voto escolhida não existe
       over_character_limit: não pode ter mais do que %{max} caracteres cada um
       too_few_options: tem de ter mais do que um item
       too_many_options: não pode conter mais do que %{max} itens
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 0ac4fb4913..3fae058301 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -36,7 +36,7 @@ ca:
         setting_aggregate_reblogs: No mostra els nous impulsos dels tuts que ja s'han impulsat recentment (només afecta als impulsos nous rebuts)
         setting_default_sensitive: Els mèdia sensibles estan ocults per defecte i es poden revelar amb un clic
         setting_display_media_default: Amaga els multimèdia marcats com a sensibles
-        setting_display_media_hide_all: Sempre oculta tots els multimèdia
+        setting_display_media_hide_all: Oculta sempre tot el contingut multimèdia
         setting_display_media_show_all: Mostra sempre els elements multimèdia marcats com a sensibles
         setting_hide_network: Qui tu segueixes i els que et segueixen a tu no es mostraran en el teu perfil
         setting_noindex: Afecta el teu perfil públic i les pàgines d'estat
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 00ecdb457b..994cb1b845 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -14,6 +14,8 @@ eo:
         avatar: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata
         context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi
+        current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
+        current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
         email: Vi ricevos konfirman retmesaĝon
         fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 6a5817e7cd..c6a89fb409 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -36,6 +36,8 @@ is:
         fields:
           name: Skýring
           value: Efni
+      account_alias:
+        acct: Auðkenni gamla aðgangsins
       admin_account_action:
         include_statuses: Innifela kærð tíst í tölvupóstinum
         send_email_notification: Láta notanda vita með tölvupósti
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 2254d98cfe..3e2855e588 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -158,7 +158,7 @@ ja:
         pending_account: 新しいアカウントの承認が必要な時
         reblog: トゥートがブーストされた時
         report: 通報を受けた時
-        trending_tag: 未審査のハッシュタグが人気の時
+        trending_tag: 未審査のハッシュタグが人気の時にメールで通知する
       tag:
         listable: 検索とディレクトリへの使用を許可する
         name: ハッシュタグ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index a36970c14a..2fe515f55c 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -156,7 +156,7 @@ nl:
         mention: Wanneer iemand jou heeft vermeld
         pending_account: Wanneer een nieuw account moet worden beoordeeld
         reblog: Wanneer iemand jouw toot heeft geboost
-        report: Wanneer een nieuwe rapportage werd ingediend
+        report: Bij het indienen van een nieuwe rapportage
         trending_tag: Wanneer een nog niet beoordeelde hashtag trending is
       tag:
         listable: Toestaan dat deze hashtag in zoekopdrachten en in de gebruikersgids te zien valt
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 764c3ace46..b94277825f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -676,6 +676,9 @@ sv:
     next: Nästa
     older: Äldre
     prev: Tidigare
+  polls:
+    errors:
+      invalid_choice: Det valda röstalternativet finns inte
   preferences:
     other: Annat
   relationships:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 8e8f91bd0b..71bf225d8e 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -230,3 +230,6 @@ ta:
     email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
     other_settings: அறிவிப்புகள் குறித்த பிற அமைப்புகள்
+  polls:
+    errors:
+      invalid_choice: நீங்கள் தேர்வு செய்த விருப்பம் கிடைக்கவில்லை
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 8a71cf557d..b7f4a5f34f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -554,6 +554,7 @@ th:
       x_months: "%{count} เดือน"
       x_seconds: "%{count} วินาที"
   deletes:
+    challenge_not_passed: ข้อมูลที่คุณป้อนไม่ถูกต้อง
     confirm_username: ป้อนชื่อผู้ใช้ของคุณเพื่อยืนยันกระบวนงาน
     proceed: ลบบัญชี
     success_msg: ลบบัญชีของคุณสำเร็จ
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index b8ef6fe439..b01c1ea204 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -72,6 +72,7 @@ vi:
     roles:
       admin: quản trị viên
       bot: Người máy
+      group: Nhóm
       moderator: Phép chia lấy phần dư
     unavailable: Hồ sơ không có sẵn
     unfollow: Hủy theo dõi
@@ -888,6 +889,7 @@ vi:
       duration_too_long: quá xa trong tương lai
       duration_too_short: quá sớm
       expired: Cuộc thăm dò đã kết thúc
+      invalid_choice: Lựa chọn không tồn tại
       over_character_limit: không thể dài hơn %{max} ký tự mỗi ký tự
       too_few_options: phải có nhiều hơn một mục
       too_many_options: không thể chứa nhiều hơn %{max}