diff --git a/src/locales/es.json b/src/locales/es.json
index 22b81bf7e1..0da58d7f57 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -305,17 +305,17 @@
   "column.developers": "Desarrolladores",
   "column.developers.service_worker": "Service Worker",
   "column.direct": "Mensajes directos",
-  "column.directory": "Browse profiles",
+  "column.directory": "Explorar perfiles",
   "column.dislikes": "Le disgusta",
   "column.domain_blocks": "Dominios ocultados",
-  "column.edit_profile": "Edit profile",
+  "column.edit_profile": "Editar perfiles",
   "column.event_map": "Ubicación del evento",
   "column.event_participants": "Participantes",
   "column.events": "Eventos",
   "column.export_data": "Export data",
-  "column.familiar_followers": "People you know following {name}",
-  "column.favourited_statuses": "Liked posts",
-  "column.favourites": "Likes",
+  "column.familiar_followers": "Personas que conoces que siguen a {name}",
+  "column.favourited_statuses": "Entradas favoritas",
+  "column.favourites": "Me gustan",
   "column.federation_restrictions": "Federation Restrictions",
   "column.filters": "Muted words",
   "column.filters.accounts": "Cuentas",
@@ -813,6 +813,7 @@
   "group.update.success": "Grupo guardado correctamente",
   "group.upload_avatar": "Subir avatar",
   "group.upload_banner": "Subir una foto",
+  "group.upload_banner.title": "Cargar imagen de fondo",
   "groups.discover.popular.empty": "No es posible recuperar los grupos populares en este momento. Vuelve a comprobarlo más tarde.",
   "groups.discover.popular.show_more": "Ver más",
   "groups.discover.popular.title": "Grupos populares",
@@ -830,6 +831,10 @@
   "groups.discover.suggested.empty": "No es posible recuperar los grupos sugeridos en este momento. Vuelva a comprobarlo más tarde.",
   "groups.discover.suggested.show_more": "Ver más",
   "groups.discover.suggested.title": "Recomendado para ti",
+  "groups.discover.tags.empty": "No se pueden buscar temas populares en este momento. Por favor, vuelva más tarde.",
+  "groups.discover.tags.show_more": "Mostrar más",
+  "groups.discover.tags.title": "Examinar los temas",
+  "groups.discovery.tags.no_of_groups": "Número de grupos",
   "groups.empty.subtitle": "Empieza a descubrir los grupos a los que unirte o crea el tuyo propio.",
   "groups.empty.title": "Aún no hay grupos",
   "groups.pending.count": "{number, plural, una {# solicitud pendiente} other {# solicitudes pendientes}}",
@@ -837,6 +842,10 @@
   "groups.pending.empty.title": "Ninguna solicitud pendiente",
   "groups.pending.label": "Solicitudes pendientes",
   "groups.popular.label": "Grupos recomendados",
+  "groups.search.placeholder": "Buscar en mis grupos",
+  "groups.suggested.label": "Grupos recomendados",
+  "groups.tags.title": "Examinar los temas",
+  "hashtag.follow": "Siga el hashtag",
   "header.login.label": "Log in",
   "header.register.label": "Register",
   "home.column_settings.show_reblogs": "Mostrar retoots",
@@ -899,6 +908,8 @@
   "landing_page_modal.download": "Download",
   "landing_page_modal.helpCenter": "Help Center",
   "lightbox.close": "Cerrar",
+  "lightbox.expand": "Ampliar",
+  "lightbox.minimize": "Minimizar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
   "lightbox.view_context": "Ver contexto",
@@ -917,6 +928,7 @@
   "lists.subheading": "Tus listas",
   "loading_indicator.label": "Cargando…",
   "location_search.placeholder": "Encontrar una dirección",
+  "login.fields.email_label": "Correo electrónico",
   "login.fields.instance_label": "Instance",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
@@ -942,9 +954,13 @@
   "manage_group.delete_group": "Borrar el grupo",
   "manage_group.done": "Hecho",
   "manage_group.edit_group": "Editar el grupo",
+  "manage_group.fields.cannot_change_hint": "Esto no se puede cambiar una vez creado el grupo.",
   "manage_group.fields.description_label": "Descripción",
   "manage_group.fields.description_placeholder": "Descripción",
+  "manage_group.fields.hashtag_placeholder": "Añadir un tema",
+  "manage_group.fields.name_help": "Esto no se puede cambiar una vez creado el grupo.",
   "manage_group.fields.name_label": "Nombre del grupo (obligatorio)",
+  "manage_group.fields.name_label_optional": "Nombre del grupo",
   "manage_group.fields.name_placeholder": "Nombre del grupo",
   "manage_group.get_started": "¡Empecemos!",
   "manage_group.next": "Siguiente",
@@ -998,12 +1014,15 @@
   "mute_modal.auto_expire": "Automatically expire mute?",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
+  "mutes.empty.groups": "Aún no has silenciado ningún grupo.",
   "navbar.login.action": "Log in",
+  "navbar.login.email.placeholder": "Correo electrónico",
   "navbar.login.forgot_password": "Forgot password?",
   "navbar.login.password.label": "Password",
   "navbar.login.username.placeholder": "Email or username",
   "navigation.chats": "Chats",
   "navigation.compose": "Compose",
+  "navigation.compose_group": "Publicar para el grupo",
   "navigation.dashboard": "Dashboard",
   "navigation.developers": "Developers",
   "navigation.direct_messages": "Messages",
@@ -1017,10 +1036,14 @@
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_edit": "Edit post",
   "navigation_bar.compose_event": "Administrar evento",
+  "navigation_bar.compose_group": "Redactar para grupo",
+  "navigation_bar.compose_group_reply": "Responder al mensaje del grupo",
   "navigation_bar.compose_quote": "Quote post",
   "navigation_bar.compose_reply": "Reply to post",
   "navigation_bar.create_event": "Crear un nuevo evento",
   "navigation_bar.create_group": "Crear un grupo",
+  "navigation_bar.create_group.private": "Crear un grupo privado",
+  "navigation_bar.create_group.public": "Crear un grupo público",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_group": "Editar un grupo",
   "navigation_bar.favourites": "Favoritos",
@@ -1044,11 +1067,13 @@
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.group_favourite": "A {name} le gustó el mensaje de tu grupo",
+  "notification.group_reblog": "{name} ha reenviado el mensaje de tu grupo",
   "notification.mention": "{name} te ha mencionado",
   "notification.mentioned": "{name} mentioned you",
   "notification.move": "{name} moved to {targetName}",
   "notification.name": "{link}{others}",
-  "notification.others": " + {count, plural, one {# otro} other {# otros}}",
+  "notification.others": "+ {count, plural, one {# otro} other {# otros}}",
   "notification.pleroma:chat_mention": "{name} sent you a message",
   "notification.pleroma:emoji_reaction": "{name} reacted to your post",
   "notification.pleroma:event_reminder": "Un evento en el que participas empezará pronto",
@@ -1100,6 +1125,7 @@
   "onboarding.suggestions.title": "Suggested accounts",
   "onboarding.view_feed": "View Feed",
   "password_reset.confirmation": "Check your email for confirmation.",
+  "password_reset.fields.email_placeholder": "Correo electrónico",
   "password_reset.fields.username_placeholder": "Email or username",
   "password_reset.header": "Reset Password",
   "password_reset.reset": "Reset password",
@@ -1135,6 +1161,7 @@
   "preferences.fields.language_label": "Language",
   "preferences.fields.media_display_label": "Media display",
   "preferences.fields.missing_description_modal_label": "Show confirmation dialog before sending a post without media descriptions",
+  "preferences.fields.preserve_spoilers_label": "Conservar el aviso del contenido al responder",
   "preferences.fields.privacy_label": "Default post privacy",
   "preferences.fields.reduce_motion_label": "Reduce motion in animations",
   "preferences.fields.system_font_label": "Use system's default font",
@@ -1199,6 +1226,8 @@
   "remote_instance.pin_host": "Pin {host}",
   "remote_instance.unpin_host": "Unpin {host}",
   "remote_interaction.account_placeholder": "Enter your username@domain you want to act from",
+  "remote_interaction.dislike": "Proceder a no me gusta",
+  "remote_interaction.dislike_title": "No me gustan las publicaciones de forma remota",
   "remote_interaction.divider": "or",
   "remote_interaction.event_join": "Proceder a unirse",
   "remote_interaction.event_join_title": "Unirse a un evento remoto",
@@ -1226,10 +1255,13 @@
   "report.chatMessage.context": "Al reportar el mensaje de un usuario, los cinco mensajes anteriores y posteriores al mismo serán enviados a nuestro equipo de moderadores para tener contexto.",
   "report.chatMessage.title": "Reportar mensaje",
   "report.confirmation.content": "If we find that this account is violating the {link} we will take further action on the matter.",
+  "report.confirmation.entity.account": "cuenta",
+  "report.confirmation.entity.group": "grupo",
   "report.confirmation.title": "Thanks for submitting your report.",
   "report.done": "Done",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
+  "report.group.title": "Grupo de informes",
   "report.next": "Next",
   "report.otherActions.addAdditional": "Would you like to add additional statuses to this report?",
   "report.otherActions.addMore": "Add more",
@@ -1281,14 +1313,17 @@
   "security.update_password.fail": "Update password failed.",
   "security.update_password.success": "Password successfully updated.",
   "settings.account_migration": "Move Account",
+  "settings.blocks": "Bloqueos",
   "settings.change_email": "Change Email",
   "settings.change_password": "Change Password",
   "settings.configure_mfa": "Configure MFA",
   "settings.delete_account": "Delete Account",
   "settings.edit_profile": "Edit Profile",
   "settings.messages.label": "Permitir a usuarios empezar una nueva conversación contigo",
+  "settings.mutes": "Silenciados",
   "settings.other": "Other options",
   "settings.preferences": "Preferences",
+  "settings.privacy": "Privacidad",
   "settings.profile": "Profile",
   "settings.save.success": "Your preferences have been saved!",
   "settings.security": "Security",
@@ -1335,13 +1370,15 @@
   "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon",
   "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label",
   "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL",
-  "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.",
+  "soapbox_config.raw_json_hint": "Edite directamente los datos de configuración. Los cambios realizados directamente en el archivo JSON anularán los campos de formulario anteriores. Haga clic en \"Guardar\" para aplicar los cambios.",
   "soapbox_config.raw_json_invalid": "no es válido",
   "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data",
   "soapbox_config.redirect_root_no_login_hint": "Ruta para redirigir la página de inicio cuando un usuario no ha iniciado sesión.",
   "soapbox_config.redirect_root_no_login_label": "Redirigir la página de inicio",
   "soapbox_config.save": "Save",
   "soapbox_config.saved": "Soapbox config saved!",
+  "soapbox_config.sentry_dsn_hint": "URL DSN para la notificación de errores. Funciona con Sentry y GlitchTip.",
+  "soapbox_config.sentry_dsn_label": "Sentry DSN",
   "soapbox_config.tile_server_attribution_label": "Atribución de mosaicos de mapa",
   "soapbox_config.tile_server_label": "Servidor de mosaicos de mapa",
   "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
@@ -1359,6 +1396,7 @@
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mensaje directo a @{name}",
   "status.disabled_replies.group_membership": "Sólo los miembros del grupo pueden responder",
+  "status.disfavourite": "Disgusto",
   "status.edit": "Edit",
   "status.embed": "Incrustado",
   "status.external": "View post on {domain}",
@@ -1366,6 +1404,7 @@
   "status.filtered": "Filtrado",
   "status.group": "Publicado en {group}",
   "status.group_mod_delete": "Eliminar un mensaje del grupo",
+  "status.interactions.dislikes": "{count, plural, one {No me gusta} other {No me gustan}}",
   "status.interactions.favourites": "{count, plural, one {Like} other {Likes}}",
   "status.interactions.quotes": "{count, plural, one {Cita} other {Citas}}",
   "status.interactions.reblogs": "{count, plural, one {Repost} other {Reposts}}",
@@ -1375,6 +1414,8 @@
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
+  "status.pin_to_group": "Vincular al grupo",
+  "status.pin_to_group.success": "¡Vinculado al grupo!",
   "status.pinned": "Toot fijado",
   "status.quote": "Quote post",
   "status.reactions.cry": "Sad",
@@ -1388,6 +1429,7 @@
   "status.reblog": "Retootear",
   "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogged_by_with_group": "{name} reenviado desde {group}",
   "status.reblogs.empty": "Nadie impulsó este toot todavía. Cuando alguien lo haga, aparecerá aqui.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_account_from_group": "Remove account from group",
@@ -1410,6 +1452,8 @@
   "status.unbookmarked": "Bookmark removed.",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Dejar de fijar",
+  "status.unpin_to_group": "Desvincular del grupo",
+  "status.zap": "Zap",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "statuses.quote_tombstone": "Post is unavailable.",
   "statuses.tombstone": "One or more posts are unavailable.",
@@ -1435,6 +1479,7 @@
   "tabs_bar.profile": "Profile",
   "tabs_bar.search": "Buscar",
   "tabs_bar.settings": "Settings",
+  "textarea.counter.label": "{count} caracteres restantes",
   "theme_editor.Reset": "Restablecer",
   "theme_editor.export": "Exportar tema",
   "theme_editor.import": "Importar tema",