diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index cae56eb8..aeb8b7f4 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -61,7 +61,7 @@
     <string name="disclaimer_full">Gall y wybodaeth isod roi adlewyrchiad anghyflawn o broffil y defnyddiwr.</string>
     <string name="insert_emoji">Mewnosod emoji</string>
     <string name="no_emoji">Ni gasglwyd emoji dethol gan yr ap am y tro.</string>
-    <string name="logout_account_confirmation">Are you sure you want to logout @%1$s@%2$s?</string>
+    <string name="logout_account_confirmation">Dych chi\'n siwr i chi eisiau allgofnodi @%1$s@%2$s?</string>
     <!-- Status -->
     <string name="no_status">Dim neges i\'w dangos</string>
     <string name="favourite_add">Ychwanegu\'r neges hon at eich ffefrynnau\?</string>
@@ -76,7 +76,7 @@
     <string name="more_action_6">Rhannu</string>
     <string name="more_action_7">Crybwyll</string>
     <string name="more_action_8">Tawelu am gyfnod</string>
-    <string name="more_action_9">Delete &amp; re-draft</string>
+    <string name="more_action_9">Dileu &amp; ailwampio</string>
     <string-array name="more_action_confirm">
         <item>Tawelu\'r cyfrif hwn?</item>
         <item>Blocio\'r cyfrif hwn?</item>
@@ -105,11 +105,11 @@
     <string name="date_day">%d d</string>
     <plurals name="date_seconds_polls">
         <item quantity="zero">%d seconds</item>
-        <item quantity="one">%d second</item>
-        <item quantity="two">%d seconds</item>
-        <item quantity="few">%d seconds</item>
-        <item quantity="many">%d seconds</item>
-        <item quantity="other">%d seconds</item>
+        <item quantity="one">%d eiliad</item>
+        <item quantity="two">eiliad</item>
+        <item quantity="few">%d eiliadau</item>
+        <item quantity="many">%d eiliadau</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="date_minutes_polls">
         <item quantity="zero">%d minutes</item>
@@ -120,20 +120,20 @@
         <item quantity="other">%d minutes</item>
     </plurals>
     <plurals name="date_hours_polls">
-        <item quantity="zero">%d hours</item>
-        <item quantity="one">%d hour</item>
-        <item quantity="two">%d hours</item>
-        <item quantity="few">%d hours</item>
-        <item quantity="many">%d hours</item>
-        <item quantity="other">%d hours</item>
+        <item quantity="zero">%d awr</item>
+        <item quantity="one">%d awr</item>
+        <item quantity="two">%d awr</item>
+        <item quantity="few">%d oriau</item>
+        <item quantity="many">%d oriau</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="date_day_polls">
         <item quantity="zero">%d days</item>
-        <item quantity="one">%d day</item>
-        <item quantity="two">%d days</item>
-        <item quantity="few">%d days</item>
-        <item quantity="many">%d days</item>
-        <item quantity="other">%d days</item>
+        <item quantity="one">%d dydd</item>
+        <item quantity="two">%d dydd</item>
+        <item quantity="few">%d dyddiau</item>
+        <item quantity="many">%d dyddiau</item>
+        <item quantity="other"></item>
     </plurals>
     <!-- TOOT -->
     <string name="toot_select_image_error">Roedd gwall!</string>
@@ -176,11 +176,11 @@
     <!-- Notifications -->
     <string name="no_notifications">Dim hysbysiad i\'w arddangos</string>
     <string name="notif_mention">wedi\'ch crybwyll</string>
-    <string name="notif_status">wrote a new message</string>
+    <string name="notif_status">wedi ysgrifennu neges newydd</string>
     <string name="notif_reblog">wedi hybu\'ch tŵt</string>
     <string name="notif_favourite">wedi nodi\'ch tŵt yn ffefryn</string>
     <string name="notif_follow">wedi\'ch dilyn chi</string>
-    <string name="notif_follow_request">asked to follow you</string>
+    <string name="notif_follow_request">ymofyn i ganlyn chi</string>
     <string name="delete_notification_ask_all">Dileu pob hysbysiad?</string>
     <string name="delete_notification_all">Mae pob hysbysiad wedi ei ddileu!</string>
     <!-- HEADER -->
@@ -318,10 +318,10 @@
     <string name="channel_notif_follow">New follow</string>
     <string name="channel_notif_boost">Hybiad newydd</string>
     <string name="channel_notif_fav">Ffefryn newydd</string>
-    <string name="channel_notif_mention">New Mention</string>
+    <string name="channel_notif_mention">Crybwylliad newydd</string>
     <string name="channel_notif_poll">Poll Ended</string>
     <string name="channel_notif_backup">Negeseuon wrth gefn</string>
-    <string name="channel_notif_status">New posts</string>
+    <string name="channel_notif_status">Postiau newydd</string>
     <string name="channel_notif_media">Lawrlwytho Cyfryngau</string>
     <string name="select_sound">Dewis tôn</string>
     <string name="set_enable_time_slot">Caniatau slot amser</string>
@@ -398,34 +398,34 @@
     <string name="no_tags">Dim tagiau</string>
     <string name="set_retrieve_metadata_share_from_extras">Attach an image when sharing a URL</string>
     <!-- end languages -->
-    <string name="create_poll">Create a poll</string>
-    <string name="poll_choice_s">Choice %d</string>
+    <string name="create_poll">Creu pôl</string>
+    <string name="poll_choice_s">Dewis %d</string>
     <string name="poll_invalid_choices">You need two choices at least for the poll!</string>
-    <string name="done">Done</string>
+    <string name="done">Wedi gorffen</string>
     <string name="poll_finish_at">end at %s</string>
     <string name="vote">Vote</string>
     <string name="notif_poll">A poll you have voted in has ended</string>
     <string name="notif_poll_self">Mae arolwg barn a gyhoeddwyd gennych wedi dod i ben</string>
-    <string name="settings_category_notif_categories">Categories</string>
+    <string name="settings_category_notif_categories">Categorïau</string>
     <string name="move_timeline">Move timeline</string>
     <string name="hide_timeline">Hide timeline</string>
     <string name="reorder_timelines">Rheoli ffrydiau</string>
-    <string name="reorder_list_deleted">List permanently deleted</string>
+    <string name="reorder_list_deleted">Rhestr wedi dileu\'n barhaol</string>
     <string name="reorder_instance_removed">Followed instance removed</string>
     <string name="reorder_tag_removed">Pinned tag removed</string>
-    <string name="undo">Undo</string>
+    <string name="undo">Dadwneud</string>
     <string name="warning_main_timeline">Main timelines can only be hidden!</string>
     <string name="set_sensitive_content">Always mark media as sensitive</string>
-    <string name="gnu_instance">GNU instance</string>
+    <string name="gnu_instance">Enghraifft GNU</string>
     <string name="set_forward_tags">Forward tags in replies</string>
     <string name="set_long_press_media">Long press to store media</string>
-    <string name="add_tags">Manage tags</string>
+    <string name="add_tags">Rheoli tagiau</string>
     <string name="display_name">Display name</string>
     <string name="label_emoji">Emoji</string>
     <string name="label_text">Text</string>
     <string name="label_filter">Filter</string>
-    <string name="label_brush">Brush</string>
-    <string name="discard">Discard</string>
+    <string name="label_brush">Brws</string>
+    <string name="discard">Gwaredu</string>
     <string name="saving">Saving…</string>
     <string name="image_saved">Image Saved Successfully!</string>
     <string name="save_image_failed">Failed to save Image</string>
@@ -435,30 +435,30 @@
     <string name="toast_unmute_conversation">The conversation is no longer muted!</string>
     <string name="toast_mute_conversation">The conversation is muted</string>
     <string name="category_general">General</string>
-    <string name="category_regional">Regional</string>
-    <string name="category_art">Art</string>
+    <string name="category_regional">Rhanbarthol</string>
+    <string name="category_art">Celf</string>
     <string name="category_activism">Activism</string>
-    <string name="category_games">Gaming</string>
+    <string name="category_games">Gêmau</string>
     <string name="category_tech">Technology</string>
-    <string name="category_furry">Furry</string>
-    <string name="category_food">Food</string>
-    <string name="instance_logo">Logo of the instance</string>
-    <string name="join_mastodon">Join Mastodon</string>
+    <string name="category_furry">Blewog</string>
+    <string name="category_food">Bwyd</string>
+    <string name="instance_logo">Logo enghraifft</string>
+    <string name="join_mastodon">Ymuno â Mastodon</string>
     <string name="pickup_instance_category">Choose an instance by picking up a category, then tap on a check button.</string>
-    <string name="users">%1$s users</string>
+    <string name="users">%1$s defnyddwyr</string>
     <string name="password_confirm">Confirm password</string>
-    <string name="agreement_check">I agree to %1$s and %2$s</string>
-    <string name="server_rules">server rules</string>
+    <string name="agreement_check">Dw i\'n cytuno â %1$s a %2$s</string>
+    <string name="server_rules">rheolau gweinydd</string>
     <string name="tos">terms of service</string>
     <string name="sign_up">Cofrestru</string>
     <string name="validation_needed">This instance works with invitations. Your account will need to be manually approved by an administrator before being usable.</string>
-    <string name="password_error">Passwords don\'t match!</string>
+    <string name="password_error">Dydy\'r cyfrinair ddim yn cyd-fynd!</string>
     <string name="email_error">The email doesn\'t seem to be valid!</string>
     <string name="email_indicator">You will be sent a confirmation e-mail</string>
     <string name="password_indicator">Use at least 8 characters</string>
     <string name="password_too_short">Password should contain at least 8 characters</string>
     <string name="username_error">Username should only contain letters, numbers and underscores</string>
-    <string name="account_created">Account created!</string>
+    <string name="account_created">Cyfrif wedi creu!</string>
     <string name="account_created_message">        Your account has been created!\n\n
         Think to validate your email within the 48 next hours.\n\n
         You can now connect your account by writing <b>%1$s</b> in the first field and tap on <b>Connect</b>.\n\n
@@ -467,43 +467,43 @@
     <string name="save_draft">Save the message in drafts?</string>
     <string name="administration">Administration</string>
     <string name="reports">Reports</string>
-    <string name="unresolved">Unresolved</string>
-    <string name="remote">Remote</string>
+    <string name="unresolved">Ddim wedi penderfynu</string>
+    <string name="remote">Bell</string>
     <string name="active">Active</string>
-    <string name="pending">Pending</string>
-    <string name="disabled">Disabled</string>
-    <string name="suspended">Suspended</string>
-    <string name="permissions">Permissions</string>
-    <string name="disable">Disable</string>
-    <string name="silence">Silence</string>
+    <string name="pending">Hyd</string>
+    <string name="disabled">Anabl</string>
+    <string name="suspended">Ar grog</string>
+    <string name="permissions">Caniatâd</string>
+    <string name="disable">Anablu</string>
+    <string name="silence">Distawrwydd</string>
     <string name="account">Account</string>
-    <string name="unsilence">Undo silence</string>
-    <string name="undisable">Undo disable</string>
-    <string name="suspend">Suspend</string>
-    <string name="unsuspend">Undo suspend</string>
+    <string name="unsilence">Dadwneud distawrwydd</string>
+    <string name="undisable">Dadwneud anablu</string>
+    <string name="suspend">Gwahardd</string>
+    <string name="unsuspend">Dadwneud gwahardd</string>
     <string name="audio">The application needs to access audio recording</string>
-    <string name="voice_message">Voice message</string>
+    <string name="voice_message">Neges llais</string>
     <string name="set_enable_time_slot_indication">During the time slot, the app will send notifications. You can reverse (ie: silent) this time slot with the right spinner.</string>
     <string name="set_fit_preview_indication">Previews will not be cropped in timelines</string>
     <string name="set_capitalize_indication">Automatically insert a line break after the mention to capitalize the first letter</string>
     <string name="settings_title_custom_sharing_indication">Allow content creators to share statuses to their RSS feeds</string>
-    <string name="compose">Compose</string>
-    <string name="select">Select</string>
-    <string name="add_instances">Add an instance</string>
+    <string name="compose">Cyfansoddi</string>
+    <string name="select">Dewis</string>
+    <string name="add_instances">Adio enghraifft</string>
     <string name="set_enable_crash_report">Enable crash reports</string>
     <string name="set_enable_crash_report_indication">If enabled, a crash report will be created locally and then you will be able to share it.</string>
     <string name="crash_title">Mae Fedilab wedi stopio :(</string>
     <string name="crash_message">Mae modd i chi anfon adroddiad crash ata\'i drwy ebost. Bydd yn help i\'w ddatrys. :)\n\nMae modd i chi ychwanegu cynnwys ychwanegol! Diolch!</string>
-    <string name="visibility">Visibility</string>
+    <string name="visibility">Gwelededd</string>
     <string name="set_disable_animated_emoji">Disable custom animated emojis</string>
     <string name="report_account">Report account</string>
     <plurals name="number_of_voters">
-        <item quantity="zero">%d voters</item>
-        <item quantity="one">%d voter</item>
-        <item quantity="two">%d voters</item>
-        <item quantity="few">%d voters</item>
-        <item quantity="many">%d voters</item>
-        <item quantity="other">%d voters</item>
+        <item quantity="zero">%d pleidleisiwr</item>
+        <item quantity="one">%d pleidleisiwr</item>
+        <item quantity="two">%d pleidleisiwr</item>
+        <item quantity="few">%d pleidleisiwyr</item>
+        <item quantity="many">%d pleidleisiwyr</item>
+        <item quantity="other"></item>
     </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
@@ -531,7 +531,7 @@
     <string name="note_for_account">Notes for the account</string>
     <string name="set_resize_picture_indication">Allow to compress large photos into smaller sized photos with very less or negligible loss in quality of the image.</string>
     <string name="set_resize_video_indication">Allow compressing videos while maintaining their quality.</string>
-    <string name="order_by">Order by</string>
+    <string name="order_by">Trefnu erbyn</string>
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
@@ -540,19 +540,19 @@
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
-    <string name="reset_color">Reset colors</string>
+    <string name="reset_color">Ailosod lliwiau</string>
     <string name="clik_reset">Tap here to reset all your custom colors</string>
     <string name="reset">Reset</string>
     <string name="icons_color_title">Icons</string>
     <string name="icons_color">Color of bottom icons in timelines</string>
-    <string name="logo_of_the_instance">Logo of the instance</string>
-    <string name="edit_profile">Edit profile</string>
-    <string name="make_an_action">Make an action</string>
-    <string name="translation">Translation</string>
+    <string name="logo_of_the_instance">Logo enghraifft</string>
+    <string name="edit_profile">Golygu proffeil</string>
+    <string name="make_an_action">Gwneud gweithred</string>
+    <string name="translation">Cyfieithiad</string>
     <string name="text_color_title">Text color</string>
     <string name="text_color">Change the text color in messages</string>
     <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="theming">Theming</string>
+    <string name="theming">Themâu</string>
     <string name="data_export_theme">The theme was exported</string>
     <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
     <string name="import_theme">Import a theme</string>
@@ -560,33 +560,33 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
-    <string name="user_count">User count</string>
-    <string name="status_count">Status count</string>
-    <string name="instance_count">Instance count</string>
+    <string name="user_count">Cyfrifiad defnyddwyr</string>
+    <string name="status_count">Cyfrifiad safleoedd</string>
+    <string name="instance_count">Cyfrifiad enghraifft</string>
     <string name="poll_finish_in">End in %s</string>
-    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="no_instance_reccord">Dydy\'r enghraifft\'na ddim ar gael yn https://instances.social</string>
     <string name="display_full_link">Display full link</string>
     <string name="share_link">Share link</string>
     <string name="open_other_app">Open with another app</string>
     <string name="check_redirect">Check redirect</string>
     <string name="no_redirect">This URL does not redirect</string>
-    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="redirect_detected">%1$s \n\nyn ailgyfeirio i\n\n %2$s</string>
     <string name="set_utm_parameters">Remove UTM parameters</string>
     <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
-    <string name="talking_about">%d people talking</string>
-    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="talking_about">%d pobl yn sôn</string>
+    <string name="twitter_accounts">Cyfrifon Twitter (trwy Nitter)</string>
     <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
     <string name="identity_proofs">Identity proofs</string>
     <string name="verified_user">Verified identity</string>
-    <string name="verified_by">Verified by %1$s (%2$s)</string>
+    <string name="verified_by">Wedi gwirio erbyn %1$s (%2$s)</string>
     <string name="action_disabled">Action disabled</string>
     <string name="action_unfollow">Unfollow</string>
     <string name="error_destination_path">Something went wrong, please check your download directory in settings.</string>
-    <string name="action_announcements">Announcements</string>
+    <string name="action_announcements">Cyhoeddiadau</string>
     <string name="no_announcements">No announcements!</string>
     <string name="add_reaction">Add a reaction</string>
     <string name="set_video_cache">Video cache in MB, zero means no cache.</string>
-    <string name="set_watermark">Watermarks</string>
+    <string name="set_watermark">Dyfrnodau</string>
     <string name="set_watermark_indication">Automatically add a watermark at the bottom of pictures. The text can be customized for each account.</string>
     <string name="no_distributors_found">No distributors found!</string>
     <string name="no_distributors_explanation">You need a distributor for receiving push notifications.\nYou will find more details at %1$s.\n\nYou can also disable push notifications in settings for ignoring that message.</string>
@@ -625,4 +625,4 @@
     <string name="set_accounts_page">Nifer y cyfrifon fesul llwyth</string>
     <string name="proxy_protocol_http">HTTP</string>
     <string name="proxy_protocol_socks">SOCKS</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5d1133a5..abec0cde 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -448,13 +448,7 @@
     <string name="password_too_short">La contraseña debe tener al menos 8 caracteres</string>
     <string name="username_error">Los nombres de usuario solo pueden contener letras, números y guiones bajos</string>
     <string name="account_created">¡Cuenta creada!</string>
-    <string name="account_created_message"> ¡Tu cuenta ha sido creada!
-\n
-\n \u0020Valida tu correo electrónico dentro de las próximas 48 horas.
-\n
-\n \u0020Ahora puedes conectar tu cuenta escribiendo <b>%1$s</b> en el primer campo y pulsando en <b>Conectar</b>.
-\n
-\n \u0020<b>Importante</b>: Si tu instancia requiere validación, recibirás un correo electrónico cuando se haya completado. \u0020</string>
+    <string name="account_created_message">¡Tu cuenta ha sido creada! \n \n \u0020Valida tu correo electrónico dentro de las próximas 48 horas. \n \n \u0020Ahora puedes conectar tu cuenta escribiendo <b>%1$s</b> en el primer campo y pulsando en <b>Conectar</b>. \n \n \u0020<b>Importante</b>: Si tu instancia requiere validación, recibirás un correo electrónico cuando se haya completado.</string>
     <string name="save_draft">¿Guardar el mensaje en borradores?</string>
     <string name="administration">Administración</string>
     <string name="reports">Informes</string>
@@ -1064,7 +1058,7 @@
     <string name="data_import_settings_success">Los ajustes se importaron con éxito</string>
     <string name="messages_stored_in_drafts">Mensajes guardados en borradores</string>
     <string name="watch_trends_for_instance">Mira los temas relevantes en esta instancia</string>
-    <string name="hide_content">Ocultar contenido &lt;</string>
+    <string name="hide_content"><![CDATA[Ocultar contenido <]]></string>
     <string name="set_fetch_home">Obtener automáticamente los mensajes de inicio</string>
     <string name="home_cache">Caché de Inicio</string>
     <string name="type_of_home_delay_title">Intervalo de actualización de la página de inicio</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d1117c3c..8ac04d3a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1086,4 +1086,22 @@
     <string name="toast_fail_authenticate">L\'application n\'a réussi à authentifier le compte !</string>
     <string name="toast_error_internet">Pas de connexion internet !</string>
     <string name="set_pixelfed_full_media">Médias en plein écran</string>
+    <string name="more_options">Plus d\'options</string>
+    <string name="action_favourite">Favorit</string>
+    <string name="action_quote">Citer</string>
+    <string name="add_content_warning">Ajouter avertissement de contenu</string>
+    <string name="action_publish">Publier</string>
+    <string name="open_new_attachment_panel">Ouvrir nouveau panneau de pièces jointes</string>
+    <string name="close_new_attachment_panel">Fermer nouveau panneau de pièces jointes</string>
+    <string name="attach_videos">Joindre vidéos</string>
+    <string name="attach_files">Joindre fichiers</string>
+    <string name="network">Réseau</string>
+    <string name="instance_information">Information de l\'instance</string>
+    <string name="add_poll">Ajouter un sondage</string>
+    <string name="remove_content_warning">Supprimer avertissement de contenu</string>
+    <string name="change_visibility">Changer la visibilité</string>
+    <string name="set_language">Définir la langue</string>
+    <string name="attach_audio">Joindre audio</string>
+    <string name="attach_images">Joindre images</string>
+    <string name="set_pixelfed_full_media_indication">Les fichiers multimédia ocuperont toute la largeur de l\'écran et le format de la hauteur de l\'image sera respecté.</string>
 </resources>