diff --git a/README.md b/README.md
index 94e12287..ea1b4190 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 <br>
 <br>
 
-FluffyChat is a multi-platform Matrix client written in Dart/Flutter. It compiles to native code von Android, iOS, macOS, Windows and Linux and renders with Skia on the web. FluffyChat is just a hobby project from the developers of [Famedly](https://famedly.com) and licensed under AGPLv3. It follows a [design philosophy](https://ko-fi.com/post/FluffyChats-Design-Philosophy-W7W63A6YS) to be minimalistic, inclusive and easy to use.
+FluffyChat is a multi-platform Matrix client written in Dart/Flutter. It compiles to native code on Android, iOS, macOS, Windows and Linux and renders with Skia on the web. FluffyChat is just a hobby project from the developers of [Famedly](https://famedly.com) and licensed under AGPLv3. It follows a [design philosophy](https://ko-fi.com/post/FluffyChats-Design-Philosophy-W7W63A6YS) to be minimalistic, inclusive and easy to use.
 
 # How to build
 
diff --git a/assets/l10n/intl_ar.arb b/assets/l10n/intl_ar.arb
index 00a9d614..5e0b9d99 100644
--- a/assets/l10n/intl_ar.arb
+++ b/assets/l10n/intl_ar.arb
@@ -1360,7 +1360,7 @@
       "senderName": {}
     }
   },
-  "startYourFirstChat": "ابدأ محادثتك الأولى :-)",
+  "startYourFirstChat": "ابدأ محادثتك الأولى! 🙂\n- أنقر زر الرسالة\n- أدخل اسم المستخدم المستهدف\n- اكتب ما يحلو لك",
   "@startYourFirstChat": {
     "type": "text",
     "placeholders": {}
@@ -1410,7 +1410,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "timeOfDay": "",
+  "timeOfDay": "{hours12}:{minutes} {suffix}",
   "@timeOfDay": {
     "type": "text",
     "placeholders": {
@@ -1420,7 +1420,7 @@
       "suffix": {}
     }
   },
-  "title": "",
+  "title": "فلافي-شات",
   "@title": {
     "description": "Title for the application",
     "type": "text",
@@ -1459,7 +1459,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "unknownEvent": "",
+  "unknownEvent": "حدث مجهول '{type}'",
   "@unknownEvent": {
     "type": "text",
     "placeholders": {
@@ -1535,7 +1535,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "userSentUnknownEvent": "",
+  "userSentUnknownEvent": "أرسل {username} حدث {type}",
   "@userSentUnknownEvent": {
     "type": "text",
     "placeholders": {
@@ -2087,14 +2087,14 @@
     "type": "text",
     "placeholders": {}
   },
-  "noPasswordRecoveryDescription": "لم تضف أي طريقة لاستعادة كلمة المرور.",
+  "noPasswordRecoveryDescription": "لم تضف أي طريقة لاستعادة كلمة السر.",
   "@noPasswordRecoveryDescription": {
     "type": "text",
     "placeholders": {}
   },
   "newUsernameDescription": "سيكون معرفك على شكل @username:servername",
   "@newUsernameDescription": {},
-  "newPasswordDescription": "لتتمكن من استعادة كلمة المرور في حالة فقدانها أضف عنوان بريد إلكتروني لاحقًا.",
+  "newPasswordDescription": "لتتمكن من استعادة كلمة السر في حالة فقدانها أضف عنوان بريد إلكتروني لاحقًا.",
   "@newPasswordDescription": {},
   "notifications": "الإشعارات",
   "@notifications": {
@@ -2168,7 +2168,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "passwordForgotten": "نسيتَ كلمة المرور",
+  "passwordForgotten": "نسيتَ كلمة السر",
   "@passwordForgotten": {
     "type": "text",
     "placeholders": {}
@@ -2225,5 +2225,152 @@
   "@notificationsEnabledForThisAccount": {
     "type": "text",
     "placeholders": {}
+  },
+  "spaceIsPublic": "الفضاء عمومي",
+  "@spaceIsPublic": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "toggleFavorite": "بدّل حالة التفضيل",
+  "@toggleFavorite": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "toggleUnread": "علّمه كمقروء/غير مقروء",
+  "@toggleUnread": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "tapOnDeviceToVerify": "انقر على الجهاز لتوثيقه",
+  "@tapOnDeviceToVerify": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "unavailable": "غير متوفر",
+  "@unavailable": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "whyDoYouWantToReportThis": "لماذا تريد الإبلاغ عنه؟",
+  "@whyDoYouWantToReportThis": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "withTheseAddressesRecoveryDescription": "يمكنك استعادة كلمة السر بهذه العناوين.",
+  "@withTheseAddressesRecoveryDescription": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "zoomOut": "صغّر",
+  "@zoomOut": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "zoomIn": "كبّر",
+  "@zoomIn": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "singlesignon": "ولوج فريد",
+  "@singlesignon": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "toggleMuted": "بدّل حالة الكتم",
+  "@toggleMuted": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "showPassword": "أظهر كلمة السر",
+  "@showPassword": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "soundVibrationLedColor": "الصوت والاهتزاز ولون ضوء الإشعار",
+  "@soundVibrationLedColor": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "yourChatsAreBeingSynced": "يُزامن محادثاتك…",
+  "@yourChatsAreBeingSynced": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userNotVerified": "المستخدم غير موثّق",
+  "@userNotVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "verified": "موثّق",
+  "@verified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "spaceName": "اسم الفضاء",
+  "@spaceName": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "synchronizingPleaseWait": "يُزامن… يرجى الانتظار.",
+  "@synchronizingPleaseWait": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "tapToShowImage": "انقر على صورة لإظهارها",
+  "@tapToShowImage": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "tooManyRequestsWarning": "طابات كثيرة. حاول مجددًا لاحقًا!",
+  "@tooManyRequestsWarning": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "unlockChatBackup": "فك قفل النسخ الاحتياطي للمحادثة",
+  "@unlockChatBackup": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userVerified": "المستخدم موثّق",
+  "@userVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "weSentYouAnEmail": "أرسلنا لك رسالة بالبريد الإلكتروني",
+  "@weSentYouAnEmail": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "yourPublicKey": "مفتاحك العمومي",
+  "@yourPublicKey": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "youWillBeConnectedTo": "سيتم وصلك بـ {homeserver}",
+  "@youWillBeConnectedTo": {
+    "type": "text",
+    "placeholders": {
+      "homeserver": {}
+    }
+  },
+  "status": "الحالة",
+  "@status": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userUnknownVerification": "حالة توثيق المستخدم مجهولة",
+  "@userUnknownVerification": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "transferFromAnotherDevice": "أنقله من جهاز آخر",
+  "@transferFromAnotherDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "wipeChatBackup": "أتريد حذف النسخ الاحتياطي للمحادثة لإنشاء مفتاح أمان جديد؟",
+  "@wipeChatBackup": {
+    "type": "text",
+    "placeholders": {}
   }
 }
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 15d3a937..feaf81fd 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -1451,7 +1451,9 @@
     "placeholders": {}
   },
   "newPasswordDescription": "In order to be able to recover your password, you should later add an email address to your account.",
+  "@newPasswordDescription": {},
   "newUsernameDescription": "Your user ID will then have the format @username:servername",
+  "@newUsernameDescription": {},
   "noPasswordRecoveryDescription": "You have not added a way to recover your password yet.",
   "@noPasswordRecoveryDescription": {
     "type": "text",
@@ -1557,24 +1559,33 @@
     "placeholders": {}
   },
   "openCamera": "Open camera",
-  "oneClientLoggedOut": "One of your clients has been logged out",
   "@openCamera": {
     "type": "text",
     "placeholders": {}
   },
+  "oneClientLoggedOut": "One of your clients has been logged out",
+  "@oneClientLoggedOut": {},
   "addAccount": "Add account",
+  "@addAccount": {},
   "editBundlesForAccount": "Edit bundles for this account",
+  "@editBundlesForAccount": {},
   "addToBundle": "Add to bundle",
+  "@addToBundle": {},
   "removeFromBundle": "Remove from this bundle",
+  "@removeFromBundle": {},
   "bundleName": "Bundle name",
+  "@bundleName": {},
   "enableMultiAccounts": "(BETA) Enable multi accounts on this device",
+  "@enableMultiAccounts": {},
   "openInMaps": "Open in maps",
   "@openInMaps": {
     "type": "text",
     "placeholders": {}
   },
   "link": "Link",
+  "@link": {},
   "serverRequiresEmail": "This server needs to validate your email address for registration.",
+  "@serverRequiresEmail": {},
   "optionalGroupName": "(Optional) Group name",
   "@optionalGroupName": {
     "type": "text",
@@ -2074,7 +2085,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} shared the location",
+  "sharedTheLocation": "{username} shared their location",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb
index 83b49ce3..5029502f 100644
--- a/assets/l10n/intl_es.arb
+++ b/assets/l10n/intl_es.arb
@@ -1919,5 +1919,54 @@
   "@zoomOut": {
     "type": "text",
     "placeholders": {}
+  },
+  "autoplayImages": "Reproducir emoticonos y stickers animados automáticamente",
+  "@autoplayImages": {
+    "type": "text",
+    "placeholder": {}
+  },
+  "allChats": "Todos los chats",
+  "@allChats": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "addToSpace": "Agregar al espacio",
+  "@addToSpace": {},
+  "cantOpenUri": "No puedo abrir el URI {uri}",
+  "@cantOpenUri": {
+    "type": "text",
+    "placeholders": {
+      "uri": {}
+    }
+  },
+  "addNewFriend": "Agregar nuevo amigo",
+  "@addNewFriend": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "all": "Todo",
+  "@all": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "appLock": "Bloqueo de aplicación",
+  "@appLock": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPause": "Pausa",
+  "@audioPlayerPause": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPlay": "Encender",
+  "@audioPlayerPlay": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "botMessages": "Mensajes de bot",
+  "@botMessages": {
+    "type": "text",
+    "placeholders": {}
   }
 }
diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb
index 1a3d41dd..8a029e03 100644
--- a/assets/l10n/intl_et.arb
+++ b/assets/l10n/intl_et.arb
@@ -2047,7 +2047,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} jagas asukohta",
+  "sharedTheLocation": "{username} jagas oma asukohta",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
diff --git a/assets/l10n/intl_fr.arb b/assets/l10n/intl_fr.arb
index d4ede882..30d09a2b 100644
--- a/assets/l10n/intl_fr.arb
+++ b/assets/l10n/intl_fr.arb
@@ -2056,7 +2056,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} a partagé une localisation",
+  "sharedTheLocation": "{username} a partagé sa position",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
diff --git a/assets/l10n/intl_hr.arb b/assets/l10n/intl_hr.arb
index c7777cc0..6e1e5391 100644
--- a/assets/l10n/intl_hr.arb
+++ b/assets/l10n/intl_hr.arb
@@ -2002,7 +2002,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} je dijelio/la mjesto",
+  "sharedTheLocation": "{username} je dijelio/la svoje mjesto",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
diff --git a/assets/l10n/intl_nl.arb b/assets/l10n/intl_nl.arb
index 6b2631ae..329c33e3 100644
--- a/assets/l10n/intl_nl.arb
+++ b/assets/l10n/intl_nl.arb
@@ -2055,7 +2055,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} heeft de locatie gedeeld",
+  "sharedTheLocation": "{username} heeft deze locatie gedeeld",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
diff --git a/assets/l10n/intl_ru.arb b/assets/l10n/intl_ru.arb
index 798677c5..77da0417 100644
--- a/assets/l10n/intl_ru.arb
+++ b/assets/l10n/intl_ru.arb
@@ -1,7 +1,7 @@
 {
   "@@locale": "ru",
   "@@last_modified": "2021-08-14 12:41:09.903021",
-  "about": "О приложении",
+  "about": "О проекте",
   "@about": {
     "type": "text",
     "placeholders": {}
@@ -659,7 +659,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "dateAndTimeOfDay": "{date}, {timeOfDay}",
+  "dateAndTimeOfDay": "{timeOfDay}, {date}",
   "@dateAndTimeOfDay": {
     "type": "text",
     "placeholders": {
@@ -667,7 +667,7 @@
       "timeOfDay": {}
     }
   },
-  "dateWithoutYear": "{day}.{month}",
+  "dateWithoutYear": "{day}-{month}",
   "@dateWithoutYear": {
     "type": "text",
     "placeholders": {
@@ -675,7 +675,7 @@
       "day": {}
     }
   },
-  "dateWithYear": "{day}.{month}.{year}",
+  "dateWithYear": "{day}-{month}-{year}",
   "@dateWithYear": {
     "type": "text",
     "placeholders": {
@@ -1270,7 +1270,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "login": "Вход",
+  "login": "Войти",
   "@login": {
     "type": "text",
     "placeholders": {}
diff --git a/assets/l10n/intl_tr.arb b/assets/l10n/intl_tr.arb
index 592021bd..45fcf535 100644
--- a/assets/l10n/intl_tr.arb
+++ b/assets/l10n/intl_tr.arb
@@ -2056,7 +2056,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} konumu paylaştı",
+  "sharedTheLocation": "{username} konumunu paylaştı",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {