diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ac4a7257a..4b052513e 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -231,6 +231,11 @@
     <string name="nc_external_server_failed">فشل جلب إعدادات الإشارات</string>
     <string name="nc_failed_signaling_settings">لا يدعم خادومك الانضمام إلى المحادثات العامة عبر الهواتف المحمولة. يمكنك محاولة الانضمام إلى المحادثة عبر متصفح الويب.</string>
     <string name="nc_failed_to_perform_operation">حدث خطأ ما!</string>
+    <string name="nc_federation_invitation_accept">قبول</string>
+    <string name="nc_federation_invitation_reject">رفض</string>
+    <string name="nc_federation_invited_to_room">من %1$s في %2$s</string>
+    <string name="nc_federation_no_invitations">لا توجد دعوات معلقة</string>
+    <string name="nc_federation_pending_invitation_hint">لديك دعوات معلقة</string>
     <string name="nc_file_browser_back">العودة</string>
     <string name="nc_file_storage_permission">إذن الوصول إلى الملف لازمٌ</string>
     <string name="nc_filter">فرز المحادثات</string>
@@ -262,6 +267,7 @@
     <string name="nc_ignore_battery_optimization_dialog_title">تجاهل توفير البطارية</string>
     <string name="nc_important_conversation">محادثة مهمة</string>
     <string name="nc_important_conversation_desc">الاشعارات في هذه المحادثة ستتجاوز إعداد الحالة \"يُرجى عدم الإزعاج\"</string>
+    <string name="nc_invitations">دعوات</string>
     <string name="nc_join_via_link">انضم عن طريق الرابط</string>
     <string name="nc_join_via_web">الانضمام عبر الويب</string>
     <string name="nc_last_moderator">يجب عليك ترقية مشرف لاحد المشاركين قبل مغادرة %1$s.</string>
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 30c705e8a..61e3c144a 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -231,6 +231,11 @@
     <string name="nc_external_server_failed">Failed to fetch signaling settings</string>
     <string name="nc_failed_signaling_settings">Target server does not support joining public conversations via mobile phones. You may attempt to join the conversation via web browser.</string>
     <string name="nc_failed_to_perform_operation">Sorry, something went wrong!</string>
+    <string name="nc_federation_invitation_accept">Accept</string>
+    <string name="nc_federation_invitation_reject">Reject</string>
+    <string name="nc_federation_invited_to_room">from %1$s at %2$s</string>
+    <string name="nc_federation_no_invitations">No pending invitations</string>
+    <string name="nc_federation_pending_invitation_hint">You have pending invitations</string>
     <string name="nc_file_browser_back">Back</string>
     <string name="nc_file_storage_permission">Permission for file access is required</string>
     <string name="nc_filter">Filter Conversations</string>
@@ -262,6 +267,7 @@
     <string name="nc_ignore_battery_optimization_dialog_title">Ignore battery optimization</string>
     <string name="nc_important_conversation">Important conversation</string>
     <string name="nc_important_conversation_desc">Notifications in this conversation will override Do Not Disturb settings</string>
+    <string name="nc_invitations">Invitations</string>
     <string name="nc_join_via_link">Join with a link</string>
     <string name="nc_join_via_web">Join via web</string>
     <string name="nc_last_moderator">You need to promote a new moderator before you can leave %1$s.</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 73d22b7f2..b5c6137f4 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -165,6 +165,8 @@
     <string name="nc_external_server_failed">Извличането на настройките за сигнализиране не беше успешно</string>
     <string name="nc_failed_signaling_settings">Целевият сървър не поддържа присъединяване към обществени разговори чрез мобилни телефони. Може да опитате присъединяване към разговора чрез уеб браузър.</string>
     <string name="nc_failed_to_perform_operation">Съжалявам нещо се обърка!</string>
+    <string name="nc_federation_invitation_accept">Приемам</string>
+    <string name="nc_federation_invitation_reject">Отхвърляне</string>
     <string name="nc_file_browser_back">Назад</string>
     <string name="nc_file_storage_permission">Нужно е право за достъп до файл</string>
     <string name="nc_following_link">Потребител, който следва публична връзка</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 46d8c6279..fcee39769 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -165,6 +165,8 @@
     <string name="nc_external_server_failed">No s\'ha pogut obtenir la configuració de senyalització</string>
     <string name="nc_failed_signaling_settings">El servidor final no és compatible amb les converses públiques a través de telèfons mòbils. Podeu intentar unir-vos a la conversa mitjançant un navegador web.</string>
     <string name="nc_failed_to_perform_operation">Disculpeu, alguna cosa ha anat malament!</string>
+    <string name="nc_federation_invitation_accept">Accepta</string>
+    <string name="nc_federation_invitation_reject">Rebutja</string>
     <string name="nc_file_browser_back">Enrere</string>
     <string name="nc_following_link">Usuari que segueix un enllaç públic</string>
     <string name="nc_formatted_message_you">Tu: %1$s</string>
@@ -192,6 +194,7 @@
     <string name="nc_hint_enter_a_message">Introduïu un missatge …</string>
     <string name="nc_important_conversation">Conversa important</string>
     <string name="nc_important_conversation_desc">Les notificacions d\'aquesta conversa anul·laran els paràmetres de no destorbar.</string>
+    <string name="nc_invitations">Invitacions</string>
     <string name="nc_join_via_link">Uniu-vos amb un enllaç</string>
     <string name="nc_join_via_web">Uniu-vos via web</string>
     <string name="nc_last_moderator">Heu de designar un nou moderador abans de deixar %1$s.</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4b52115a4..013d6eee7 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -201,6 +201,8 @@
     <string name="nc_external_server_failed">Nepodařilo se získat nastavení signalizace</string>
     <string name="nc_failed_signaling_settings">Cílový server nepodporuje připojování se k veřejným konverzacím prostřednictvím mobilních telefonů. Můžete se pokusit připojit ke konverzaci prostřednictvím webového prohlížeče.</string>
     <string name="nc_failed_to_perform_operation">Omlouváme se, něco se pokazilo!</string>
+    <string name="nc_federation_invitation_accept">Přijmout</string>
+    <string name="nc_federation_invitation_reject">Zamítnout</string>
     <string name="nc_file_browser_back">Zpět</string>
     <string name="nc_file_storage_permission">Je zapotřebí oprávnění pro přístup k souborům</string>
     <string name="nc_filter">Filtrovat konverzace</string>
@@ -230,6 +232,7 @@
     <string name="nc_hint_enter_a_message">Zadejte zprávu…</string>
     <string name="nc_important_conversation">Důležitá konverzace</string>
     <string name="nc_important_conversation_desc">Upozornění v této konverzaci budou ignorovat režim Nerušit</string>
+    <string name="nc_invitations">Pozvání</string>
     <string name="nc_join_via_link">Připojit se přes odkaz</string>
     <string name="nc_join_via_web">Připojit se přes web</string>
     <string name="nc_last_moderator">Než budete moci opustit %1$s, je třeba předat někomu roli moderátora.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 89262ce2a..8222c8e98 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -111,6 +111,8 @@
     <string name="nc_external_server_failed">Anskaffelse af signaleringsindstillinger fejlede</string>
     <string name="nc_failed_signaling_settings">Serveren understøtter ikke deltagelse i offentlige samtaler over mobil telefoner. Du kan forsøge at deltage i samtalen over en web browser.</string>
     <string name="nc_failed_to_perform_operation">Noget gik galt, undskyld!</string>
+    <string name="nc_federation_invitation_accept">Accepter</string>
+    <string name="nc_federation_invitation_reject">Afvis</string>
     <string name="nc_file_browser_back">Tilbage</string>
     <string name="nc_following_link">Bruger følger et offentligt link</string>
     <string name="nc_formatted_message_you">Dig: %1$s</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5142d69dd..5d06116c7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -231,6 +231,11 @@
     <string name="nc_external_server_failed">Konnte die Benachrichtigungseinstellungen nicht abrufen</string>
     <string name="nc_failed_signaling_settings">Der Zielserver erlaubt es nicht, öffentlichen Unterhaltungen via Mobiltelefon beizutreten. Sie können versuchen, der Unterhaltung mit einem Internetbrowser beizutreten.</string>
     <string name="nc_failed_to_perform_operation">Leider ist etwas schiefgelaufen!</string>
+    <string name="nc_federation_invitation_accept">Annehmen</string>
+    <string name="nc_federation_invitation_reject">Ablehnen</string>
+    <string name="nc_federation_invited_to_room">von %1$s um %2$s</string>
+    <string name="nc_federation_no_invitations">Keine ausstehenden Einladungen</string>
+    <string name="nc_federation_pending_invitation_hint">Sie haben ausstehende Einladungen</string>
     <string name="nc_file_browser_back">Zurück</string>
     <string name="nc_file_storage_permission">Erlaubnis für Dateizugriff ist erforderlich</string>
     <string name="nc_filter">Unterhaltungen filtern</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6c6d409b0..cbdf6eba5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
   <resources>
     <string name="account_icon">Icône du compte</string>
+    <string name="add_to_notes">Ajouter à Notes</string>
     <string name="added_to_favorites">La conversation %1$s a été ajoutée aux favorites</string>
     <string name="appbar_search_in">Rechercher dans %s</string>
     <string name="audio_call">Appel audio</string>
@@ -21,6 +22,7 @@
     <string name="clear_status_message_after">Effacer le message d\'état après</string>
     <string name="close">Fermer</string>
     <string name="continuous_voice_message_recording">Verrouiller l\'enregistrement pour enregistrer en continu le message vocal</string>
+    <string name="conversation_is_read_only">La conversation est en lecture seule</string>
     <string name="conversations">Discussions</string>
     <string name="create_conversation">Créer la conversation</string>
     <string name="custom">Personnalisé</string>
@@ -30,6 +32,7 @@
     <string name="dnd">Ne pas déranger</string>
     <string name="dontClear">Ne pas effacer</string>
     <string name="edit">Modifier</string>
+    <string name="edit_error_24_hours_old_message">Impossible de modifier des messages plus anciens que 24 heures</string>
     <string name="emoji_backspace">Retour arrière</string>
     <string name="emoji_category_recent">Récent</string>
     <string name="encrypted">Chiffré</string>
@@ -112,6 +115,7 @@
     <string name="nc_change_cert_auth">Modifier le certificat d\'authentification</string>
     <string name="nc_circle">Cercle</string>
     <string name="nc_circles">Cercles</string>
+    <string name="nc_clear_edit_button">effacer le bouton de modification</string>
     <string name="nc_clear_history">Supprimer tous les messages</string>
     <string name="nc_clear_history_success">Tous les messages ont été supprimés</string>
     <string name="nc_clear_history_warning">Voulez-vous vraiment supprimer tous les messages de cette conversation ?</string>
@@ -163,6 +167,10 @@
     <string name="nc_diagnose_app_users_amount">Utilisateurs enregistrés</string>
     <string name="nc_diagnose_battery_optimization_title">Paramètres pour la batterie</string>
     <string name="nc_diagnose_device_name_title">Appareil</string>
+    <string name="nc_diagnose_dialog_open_diagnose">Ouvrir l\'écran de diagnostic</string>
+    <string name="nc_diagnose_gplay_available_no">Les services Google Play ne sont pas disponibles. Les notifications ne sont pas prises en charge</string>
+    <string name="nc_diagnose_gplay_available_title">Services Google Play</string>
+    <string name="nc_diagnose_gplay_available_yes">Les services Google Play sont disponibles</string>
     <string name="nc_diagnose_phone_category_title">Téléphone</string>
     <string name="nc_diagnose_server_talk_version">Version du serveur Talk</string>
     <string name="nc_diagnose_server_version">Version du serveur</string>
@@ -183,6 +191,8 @@
     <string name="nc_display_name_not_fetched">Le nom d’affichage n’a pas pu être récupéré, annulation</string>
     <string name="nc_display_name_not_stored">Impossible d\'enregistrer le nom d\'affichage, abandon</string>
     <string name="nc_edit_message">Modifier</string>
+    <string name="nc_edited_by">Modifié par</string>
+    <string name="nc_edited_by_admin">Modifié par un administrateur</string>
     <string name="nc_email">E-mail</string>
     <string name="nc_expire_message_eight_hours">8 heures</string>
     <string name="nc_expire_message_four_weeks">4 semaines</string>
@@ -195,7 +205,11 @@
     <string name="nc_external_server_failed">Échec de l\'extraction des paramètres de signalisation</string>
     <string name="nc_failed_signaling_settings">Le serveur cible ne supporte pas l\'accès aux conversations publiques depuis un téléphone mobile. Veuillez essayer de rejoindre la conversation depuis un navigateur web.</string>
     <string name="nc_failed_to_perform_operation">Désolé, quelque chose s\'est mal passé !</string>
+    <string name="nc_federation_invitation_accept">Accepter</string>
     <string name="nc_federation_invitation_reject">Rejeter</string>
+    <string name="nc_federation_invited_to_room">de %1$s à %2$s</string>
+    <string name="nc_federation_no_invitations">Aucune invitation en attente</string>
+    <string name="nc_federation_pending_invitation_hint">Vous avez des invitations en attente</string>
     <string name="nc_file_browser_back">Retour</string>
     <string name="nc_file_storage_permission">La permission d\'accès aux fichiers est requise</string>
     <string name="nc_filter">Filtrer les conversations</string>
@@ -363,6 +377,7 @@
     <string name="nc_settings_advanced_title">Avancé</string>
     <string name="nc_settings_appearance">Apparence</string>
     <string name="nc_settings_call_ringtone">Appels</string>
+    <string name="nc_settings_diagnose_subtitle">Ouvrir l\'écran de diagnostic pour vérifier les réglages ou créer un rapport de bug</string>
     <string name="nc_settings_incognito_keyboard_desc">Indique au clavier de désactiver l\'apprentissage personnalisé (sans garantie)</string>
     <string name="nc_settings_incognito_keyboard_title">Clavier incognito</string>
     <string name="nc_settings_no_ringtone">Aucun son</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 542833c2e..ab975d1a1 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -233,6 +233,9 @@
     <string name="nc_failed_to_perform_operation">Noe gikk galt.</string>
     <string name="nc_federation_invitation_accept">Aksepter</string>
     <string name="nc_federation_invitation_reject">Avvis</string>
+    <string name="nc_federation_invited_to_room">fra %1$s på %2$s</string>
+    <string name="nc_federation_no_invitations">Ingen ventende invitasjoner</string>
+    <string name="nc_federation_pending_invitation_hint">Du har ventende invitasjoner</string>
     <string name="nc_file_browser_back">Tilbake</string>
     <string name="nc_file_storage_permission">Tillatelse til filtilgang kreves</string>
     <string name="nc_filter">Filtrer samtaler</string>
@@ -264,6 +267,7 @@
     <string name="nc_ignore_battery_optimization_dialog_title">Ignorer batterioptimalisering</string>
     <string name="nc_important_conversation">Viktig samtale</string>
     <string name="nc_important_conversation_desc">Varsler i denne samtalen overstyrer innstillingene for Ikke forstyrr</string>
+    <string name="nc_invitations">Invitasjoner</string>
     <string name="nc_join_via_link">Bli med via en lenke</string>
     <string name="nc_join_via_web">Bli med via nett</string>
     <string name="nc_last_moderator">Du må utnevne en ny moderator før du kan forlate %1$s.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 87843dee5..811f93836 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -233,6 +233,9 @@
     <string name="nc_failed_to_perform_operation">Извињавамо се, нешто је пошло наопако!</string>
     <string name="nc_federation_invitation_accept">Прихвати</string>
     <string name="nc_federation_invitation_reject">Одбаци</string>
+    <string name="nc_federation_invited_to_room">од %1$s са %2$s</string>
+    <string name="nc_federation_no_invitations">Нема позивница на чекању</string>
+    <string name="nc_federation_pending_invitation_hint">Имате позивнице на чекању</string>
     <string name="nc_file_browser_back">Назад</string>
     <string name="nc_file_storage_permission">Потребна је дозвола за приступ фајлу</string>
     <string name="nc_filter">Филтрирај разговоре</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 82571cdef..5c5acdaff 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -233,6 +233,9 @@
     <string name="nc_failed_to_perform_operation">發生錯誤了：（</string>
     <string name="nc_federation_invitation_accept">接受</string>
     <string name="nc_federation_invitation_reject">不批准</string>
+    <string name="nc_federation_invited_to_room">從 %1$s 到 %2$s</string>
+    <string name="nc_federation_no_invitations">沒有擱置的邀請</string>
+    <string name="nc_federation_pending_invitation_hint">您有擱置的邀請</string>
     <string name="nc_file_browser_back">返回</string>
     <string name="nc_file_storage_permission">需要檔案存取權限</string>
     <string name="nc_filter">過濾對話</string>
@@ -264,6 +267,7 @@
     <string name="nc_ignore_battery_optimization_dialog_title">不用理會電池優化</string>
     <string name="nc_important_conversation">重要對話</string>
     <string name="nc_important_conversation_desc">此對話中的通告將覆蓋\"請勿打擾\"設置</string>
+    <string name="nc_invitations">邀請</string>
     <string name="nc_join_via_link">透過連結加入</string>
     <string name="nc_join_via_web">透過網絡加入</string>
     <string name="nc_last_moderator">在您離開 %1$s 之前您需要推舉一位新的主持人。</string>