diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7d1cbd127..c7627d518 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">التحميل جارٍ …</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 ساعات</string>
+    <string name="hint_edited_message">(مُعدّلة)</string>
     <string name="invisible">غير مرئي</string>
     <string name="languages_error_message">تعذّرت استعادة اللغات</string>
     <string name="languages_error_title">فشلت الاستعادة</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 10ca563cb..e65d4e50b 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">Loading …</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 hours</string>
+    <string name="hint_edited_message">(edited)</string>
     <string name="invisible">Invisible</string>
     <string name="languages_error_message">Languages could not be retrieved</string>
     <string name="languages_error_title">Retrieval failed</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index d351ae70a..bab6e7429 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -40,6 +40,7 @@
     <string name="file_list_loading">Načítání…</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 hodiny</string>
+    <string name="hint_edited_message">(upraveno)</string>
     <string name="invisible">Není vidět</string>
     <string name="languages_error_message">Jazyky se nepodařilo získat</string>
     <string name="languages_error_title">Získání se nezdařil</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0392e9fee..7910f0759 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">Lade …</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 Stunden</string>
+    <string name="hint_edited_message">(Bearbeitet)</string>
     <string name="invisible">Unsichtbar</string>
     <string name="languages_error_message">Sprachen konnten nicht abgerufen werden</string>
     <string name="languages_error_title">Abrufen fehlgeschlagen</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index f127df4cc..47c46077e 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -122,6 +122,7 @@
     <string name="nc_conversation_menu_conversation_info">Información de la conversación</string>
     <string name="nc_conversation_menu_video_call">Video llamada</string>
     <string name="nc_conversation_menu_voice_call">Llamada de voz</string>
+    <string name="nc_conversation_not_found">Conversación no encontrada</string>
     <string name="nc_conversation_settings">Configuración de la conversación</string>
     <string name="nc_conversations_empty">Únete a la conversación o incia una nueva</string>
     <string name="nc_conversations_empty_details">¡Saluda a tus amigos y colegas!</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 39adc89de..7c9ed4353 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -40,6 +40,7 @@
     <string name="file_list_loading">Cargando …</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 horas</string>
+    <string name="hint_edited_message">(editado)</string>
     <string name="invisible">Invisible</string>
     <string name="languages_error_message">Los lenguajes no pudieron ser recuperados</string>
     <string name="languages_error_title">Recuperación fallida</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 8103091de..0e437609f 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -179,6 +179,7 @@
     <string name="nc_dialog_save_to_storage_yes">Bai</string>
     <string name="nc_display_name_not_fetched">Ezin izan da erakusteko izena lortu, bertan behera uzten</string>
     <string name="nc_display_name_not_stored">Ezin izan da erakusteko izena biltegiratu, bertan behera uzten</string>
+    <string name="nc_edit_message">Aldatu</string>
     <string name="nc_email">E-posta</string>
     <string name="nc_expire_message_eight_hours">8 ordu</string>
     <string name="nc_expire_message_four_weeks">4 aste</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c2b038b28..9c5102d49 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -126,6 +126,7 @@
     <string name="nc_conversation_menu_conversation_info">اطلاعات مکالمه</string>
     <string name="nc_conversation_menu_video_call">تماس تصویری</string>
     <string name="nc_conversation_menu_voice_call">تماس صوتی</string>
+    <string name="nc_conversation_not_found">Conversation not found</string>
     <string name="nc_conversation_settings">تنظیمات گفتگو</string>
     <string name="nc_conversations_empty">عضو یک گفتگو شوید یا یک گفتگو جدید شروع کنید</string>
     <string name="nc_conversations_empty_details">به رفقا و هم‌قطاران‌تان سلام کنید!</string>
@@ -163,6 +164,7 @@
     <string name="nc_dialog_reauth_or_delete">Do you want to reauthorize or delete this account?</string>
     <string name="nc_display_name_not_fetched">امکان دریافت نام وجود ندارد. درحال لغو</string>
     <string name="nc_display_name_not_stored">"امکان ذخیره نام وجود ندارد، درحال لغو "</string>
+    <string name="nc_edit_message">ویرایش</string>
     <string name="nc_email">رایانامه</string>
     <string name="nc_expire_message_eight_hours">8 ساعت</string>
     <string name="nc_expire_message_four_weeks">4 weeks</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 2366e535e..14015d59d 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -94,6 +94,7 @@
     <string name="nc_conversation_menu_conversation_info">Keskustelun tiedot</string>
     <string name="nc_conversation_menu_video_call">Videopuhelu</string>
     <string name="nc_conversation_menu_voice_call">Äänipuhelu</string>
+    <string name="nc_conversation_not_found">Keskustelua ei löydy</string>
     <string name="nc_conversation_settings">Keskustelun asetukset</string>
     <string name="nc_conversations_empty">Liity keskusteluun tai aloita uusi</string>
     <string name="nc_conversations_empty_details">Sano hei ystävillesi ja työkavereillesi!</string>
@@ -126,6 +127,7 @@
     <string name="nc_dialog_reauth_or_delete">Haluatko valtuuttaa tämän tilin uudelleen vai poistaa tilin?</string>
     <string name="nc_dialog_save_to_storage_no">Ei</string>
     <string name="nc_dialog_save_to_storage_yes">Kyllä</string>
+    <string name="nc_edit_message">Muokkaa</string>
     <string name="nc_email">Sähköposti</string>
     <string name="nc_expire_message_eight_hours">8 tuntia</string>
     <string name="nc_expire_message_four_weeks">4 viikkoa</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 935e0f1bb..b75113ae1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -39,6 +39,7 @@
     <string name="file_list_loading">Chargement…</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 heures</string>
+    <string name="hint_edited_message">(modifié)</string>
     <string name="invisible">Invisible</string>
     <string name="languages_error_message">Les langues n\'ont pas pu être récupérées</string>
     <string name="languages_error_title">Récupération échouée</string>
@@ -135,6 +136,7 @@
     <string name="nc_conversation_menu_conversation_info">Infos sur la conversation</string>
     <string name="nc_conversation_menu_video_call">Appel vidéo</string>
     <string name="nc_conversation_menu_voice_call">Appel vocal</string>
+    <string name="nc_conversation_not_found">Discussion non trouvée</string>
     <string name="nc_conversation_settings">Paramètres de la conversation</string>
     <string name="nc_conversations_empty">Rejoignez une conversation ou démarrez-en une nouvelle</string>
     <string name="nc_conversations_empty_details">Dites bonjour à vos amis et collègues !</string>
@@ -180,6 +182,7 @@
     <string name="nc_dialog_save_to_storage_yes">Oui</string>
     <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_email">E-mail</string>
     <string name="nc_expire_message_eight_hours">8 heures</string>
     <string name="nc_expire_message_four_weeks">4 semaines</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 47c16407d..775506e03 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -177,6 +177,7 @@
     <string name="nc_dialog_save_to_storage_yes">Si</string>
     <string name="nc_display_name_not_fetched">Non foi posíbel recuperar o nome para amosar, interrompendo</string>
     <string name="nc_display_name_not_stored">Non foi posíbel almacenar o nome para amosar, interrompendo</string>
+    <string name="nc_edit_message">Editar</string>
     <string name="nc_email">Correo-e</string>
     <string name="nc_expire_message_eight_hours">8 horas</string>
     <string name="nc_expire_message_four_weeks">4 semanas</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 674922ccf..d4b610339 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -130,6 +130,7 @@
     <string name="nc_dialog_save_to_storage_yes">Da</string>
     <string name="nc_display_name_not_fetched">Neuspješno dohvaćanje imena za prikaz, prekid</string>
     <string name="nc_display_name_not_stored">Nije moguće pohraniti ime za prikaz, prekid</string>
+    <string name="nc_edit_message">Uredi</string>
     <string name="nc_email">E-pošta</string>
     <string name="nc_expire_message_off">Isključeno</string>
     <string name="nc_expire_message_one_day">1 dan</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 2e8eb70be..b261ee806 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -168,6 +168,7 @@
     <string name="nc_dialog_save_to_storage_yes">Igen</string>
     <string name="nc_display_name_not_fetched">A megjelenítendő név nem kérhető le, megszakítás</string>
     <string name="nc_display_name_not_stored">A megjelenítendő név nem tárolható, megszakítás</string>
+    <string name="nc_edit_message">Szerkesztés</string>
     <string name="nc_email">E-mail</string>
     <string name="nc_expire_message_eight_hours">8 óra</string>
     <string name="nc_expire_message_four_weeks">4 hét</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index ec2e0f811..4c634c151 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -73,6 +73,7 @@
     <string name="nc_conversation_menu_conversation_info">Upplýsingar um samtal</string>
     <string name="nc_conversation_menu_video_call">Myndsímtal</string>
     <string name="nc_conversation_menu_voice_call">Raddsímtal</string>
+    <string name="nc_conversation_not_found">Samtal fannst ekki</string>
     <string name="nc_conversation_settings">Conversation settings</string>
     <string name="nc_conversations_empty">Taktu þátt í samtali eða byrjaðu nýtt samtal</string>
     <string name="nc_conversations_empty_details">Segðu hæ við vini þína og samstarfsmenn!</string>
@@ -101,6 +102,7 @@
     <string name="nc_dialog_outdated_client_option_update">Uppfæra</string>
     <string name="nc_display_name_not_fetched">Gat ekki náð í birtingarnafn, hætti</string>
     <string name="nc_display_name_not_stored">Gat ekki geymt birtingarnafn, hætti</string>
+    <string name="nc_edit_message">Breyta</string>
     <string name="nc_email">Tölvupóstur</string>
     <string name="nc_expire_message_eight_hours">8 klukkustundir</string>
     <string name="nc_expire_message_off">Slökkt</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 484734dc8..7be987001 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -145,6 +145,7 @@
     <string name="nc_dialog_save_to_storage_yes">Sì</string>
     <string name="nc_display_name_not_fetched">Il nome visualizzato non può essere recuperato, interruzione in corso</string>
     <string name="nc_display_name_not_stored">Nome visualizzato non memorizzato, interruzione in corso</string>
+    <string name="nc_edit_message">Modifica</string>
     <string name="nc_email">Email</string>
     <string name="nc_expire_message_eight_hours">8 ore</string>
     <string name="nc_expire_message_off">Spenta</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
deleted file mode 100644
index 3ec5195b5..000000000
--- a/app/src/main/res/values-iw/strings.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <resources>
-    <string name="account_icon">סמל חשבון</string>
-    <string name="appbar_search_in">חפש ב %s</string>
-    <string name="audio_output_phone">טלפון</string>
-    <string name="avatar">תמונה מייצגת</string>
-    <string name="away">לא פה</string>
-    <string name="calendar">לוח שנה</string>
-    <string name="clear_status_message">פינוי הודעת המצב</string>
-    <string name="clear_status_message_after">מחיקת הודעת מצב לאחר</string>
-    <string name="close">סגירה</string>
-    <string name="conversations">דיונים</string>
-    <string name="create_conversation">יצירת דיון</string>
-    <string name="custom">מותאם אישית</string>
-    <string name="dnd">לא להפריע</string>
-    <string name="dontClear">לא לפנות</string>
-    <string name="edit">עריכה</string>
-    <string name="emoji_category_recent">אחרונים</string>
-    <string name="encrypted">מוצפן</string>
-    <string name="file_list_folder">תקיה</string>
-    <string name="file_list_loading">בטעינה…</string>
-    <string name="filename_progress">%1$s (%2$d)</string>
-    <string name="fourHours">4 שעות</string>
-    <string name="invisible">נסתרת</string>
-    <string name="load_more_results">לטעון עוד תוצאות</string>
-    <string name="menu_item_sort_by_date_newest_first">החדש ביותר ראשון</string>
-    <string name="menu_item_sort_by_date_oldest_first">הישן ביותר ראשון</string>
-    <string name="menu_item_sort_by_name_a_z">א - ת</string>
-    <string name="menu_item_sort_by_name_z_a">ת - א</string>
-    <string name="menu_item_sort_by_size_biggest_first">הגדול ביותר ראשון</string>
-    <string name="menu_item_sort_by_size_smallest_first">הקטן ביותר ראשון</string>
-    <string name="messages">הודעות</string>
-    <string name="nc_Server_account_imported">החשבון שנבחר עבר ייבוא והוא זמין</string>
-    <string name="nc_about">על אודות</string>
-    <string name="nc_account_chooser_active_user">משתמש פעיל</string>
-    <string name="nc_account_chooser_add_account">הוספת חשבון</string>
-    <string name="nc_account_scheduled_for_deletion">החשבון מועמד למחיקה ולא ניתן לשנות אותו</string>
-    <string name="nc_add_attachment">הוספת קובץ מצורף</string>
-    <string name="nc_add_emojis">הוספת אמוג׳י</string>
-    <string name="nc_add_participants">הוספת משתתפים</string>
-    <string name="nc_add_to_favorites">הוספה למועדפים</string>
-    <string name="nc_all_ok_operation">סבבה, הכול בוצע!</string>
-    <string name="nc_allow_guests">לאפשר אורחים</string>
-    <string name="nc_biometric_unlock">שחרור %1$s</string>
-    <string name="nc_call_name">שם הדיון</string>
-    <string name="nc_call_name_is_same">השם שהקלדת זהה לקיים</string>
-    <string name="nc_call_timeout">אין תגובה תוך 45 שניות, יש לגעת כדי לנסות שוב</string>
-    <string name="nc_cancel">ביטול</string>
-    <string name="nc_capabilities_failed">אחזור היכולות נכשל, התהליך נפסק</string>
-    <string name="nc_certificate_dialog_text">האם אתה סומך על אישור ה- SSL הלא ידוע עד כה, שהונפק על ידי %1$s עבור %2$s, תקף מ-%3$sעד %4$s?</string>
-    <string name="nc_certificate_dialog_title">חקירת האישור</string>
-    <string name="nc_certificate_error">הגדרות ה־SSL שלך מנעו חיבור</string>
-    <string name="nc_change_cert_auth">החלפת אישור לאימות</string>
-    <string name="nc_circle">מעגל</string>
-    <string name="nc_circles">מעגלים</string>
-    <string name="nc_client_cert_change">החלפת אישור לקוח</string>
-    <string name="nc_client_cert_setup">הגדרת אישור לקוח</string>
-    <string name="nc_common_and">וגם</string>
-    <string name="nc_common_copy">העתקה</string>
-    <string name="nc_common_copy_success">הועתק ללוח הגזירים</string>
-    <string name="nc_common_disabled">מושבת</string>
-    <string name="nc_common_dismiss">התעלמות</string>
-    <string name="nc_common_error_sorry">משהו השתבש, עמך הסליחה!</string>
-    <string name="nc_common_set">הגדרה</string>
-    <string name="nc_common_skip">דלג</string>
-    <string name="nc_common_unknown">לא ידוע</string>
-    <string name="nc_configure_cert_auth">בחירת אישור לאימות</string>
-    <string name="nc_contacts_done">סיום</string>
-    <string name="nc_conversation_link">קישור לדיון</string>
-    <string name="nc_conversation_menu_conversation_info">פרטי דיון</string>
-    <string name="nc_conversation_menu_video_call">שיחת וידאו</string>
-    <string name="nc_conversation_menu_voice_call">שיחה קולית</string>
-    <string name="nc_conversation_settings">הגדרות דיון</string>
-    <string name="nc_conversations_empty">ניתן להצטרף לדיון או להתחיל באחד חדש.</string>
-    <string name="nc_conversations_empty_details">על הדרך לראות מה עם חבריך לעבודה!</string>
-    <string name="nc_copy_message">העתק</string>
-    <string name="nc_create_poll">יצירת סקר</string>
-    <string name="nc_date_header_today">היום</string>
-    <string name="nc_date_header_yesterday">אתמול</string>
-    <string name="nc_delete">מחיקה</string>
-    <string name="nc_delete_all">למחוק הכול</string>
-    <string name="nc_delete_call">מחיקת דיון</string>
-    <string name="nc_delete_conversation_more">מחיקת הדיון הזה תוביל למחיקתו גם אצל כל המשתתפים האחרים.</string>
-    <string name="nc_delete_message">מחק</string>
-    <string name="nc_demote">הורדה מדרגת פיקוח</string>
-    <string name="nc_description_send_message_button">שליחת הודעה</string>
-    <string name="nc_diagnose_account_category_title">חשבון נוכחי</string>
-    <string name="nc_diagnose_account_server">שרת</string>
-    <string name="nc_diagnose_account_user_name">משתמש</string>
-    <string name="nc_diagnose_app_category_title">יישומון</string>
-    <string name="nc_diagnose_app_name_title">שם היישומון</string>
-    <string name="nc_diagnose_device_name_title">התקן</string>
-    <string name="nc_dialog_invalid_password">ססמה שגויה</string>
-    <string name="nc_dialog_maintenance_mode">מצב תחזוקה</string>
-    <string name="nc_dialog_outdated_client_option_update">עדכון</string>
-    <string name="nc_display_name_not_fetched">לא ניתן לאחזר את שם התצוגה, התהליך נפסק</string>
-    <string name="nc_display_name_not_stored">לא ניתן לאחסן את שם התצוגה, התהליך נפסק</string>
-    <string name="nc_email">דוא״ל</string>
-    <string name="nc_expire_message_off">כבוי</string>
-    <string name="nc_expire_message_one_day">יום</string>
-    <string name="nc_expire_message_one_hour">שעה</string>
-    <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_file_browser_back">חזרה</string>
-    <string name="nc_following_link">משתמש שעוקב אחר קישור ציבורי</string>
-    <string name="nc_formatted_message_you">אני: %1$s</string>
-    <string name="nc_forward_message">העברה</string>
-    <string name="nc_get_from_provider">עדיין אין לך שרת?\nניתן ללחוץ כאן ולקבל אחת מספק</string>
-    <string name="nc_get_source_code">קבלת קוד המקור</string>
-    <string name="nc_group">קבוצה</string>
-    <string name="nc_groups">קבוצות</string>
-    <string name="nc_guest">אורח</string>
-    <string name="nc_guest_access_allow_title">לאפשר אורחים</string>
-    <string name="nc_guest_access_password_dialog_hint">נא להקליד ססמה</string>
-    <string name="nc_guest_access_password_title">הגנה בססמה</string>
-    <string name="nc_guest_access_password_weak_alert_title">ססמה חלשה</string>
-    <string name="nc_important_conversation">דיון חשוב</string>
-    <string name="nc_join_via_link">הצטרפות עם קישור</string>
-    <string name="nc_join_via_web">הצטרפות דרך דפדפן</string>
-    <string name="nc_last_moderator">עליך לקדם מפקח חדש בטרם עזיבת %1$s.</string>
-    <string name="nc_last_moderator_title">לא ניתן לעזוב את הדיון</string>
-    <string name="nc_last_modified">%1$s | שינוי אחרון: %2$s</string>
-    <string name="nc_leave">יציאה מהדיון</string>
-    <string name="nc_license_summary">הרישיון הציבורי הכללי של GNU, גרסה 3</string>
-    <string name="nc_license_title">רשיון</string>
-    <string name="nc_limit_hit">הגעת למגבלת %s התווים</string>
-    <string name="nc_lobby">לובי</string>
-    <string name="nc_lobby_waiting">כרגע מיקומך הוא בהמתנה בלובי.</string>
-    <string name="nc_locked_tap_to_unlock">יש לגעת כדי לשחרר</string>
-    <string name="nc_manual">לא מוגדר</string>
-    <string name="nc_mark_as_read">סימון כנקרא</string>
-    <string name="nc_mark_as_unread">סימון כלא נקרא</string>
-    <string name="nc_message_sent">הודעה נשלחה</string>
-    <string name="nc_moderator">פיקוח</string>
-    <string name="nc_never">מעולם לא הצטרף</string>
-    <string name="nc_new_conversation">דיון חדש</string>
-    <string name="nc_new_messages">הודעות שלא נקראו</string>
-    <string name="nc_new_password">ססמה חדשה</string>
-    <string name="nc_nick_guest">אורח/ת</string>
-    <string name="nc_no">לא</string>
-    <string name="nc_no_proxy">אין מתווך</string>
-    <string name="nc_notification_channel">%1$s על %2$s בערוץ ההודעות</string>
-    <string name="nc_notification_channel_calls">שיחות</string>
-    <string name="nc_notification_channel_messages">הודעות</string>
-    <string name="nc_notification_channel_uploads">העלאות</string>
-    <string name="nc_notification_settings">הגדרות התראה</string>
-    <string name="nc_notify_me_always">להודיע תמיד</string>
-    <string name="nc_notify_me_mention">להודיע כשהזכירו אותי</string>
-    <string name="nc_notify_me_never">לא להודיע אף פעם</string>
-    <string name="nc_offline">אין חיבור כרגע, נא לבדוק את הקישוריות שלך</string>
-    <string name="nc_ok">אישור</string>
-    <string name="nc_owner">בעלות</string>
-    <string name="nc_participants">משתתפים</string>
-    <string name="nc_participants_add">הוספת משתתפים</string>
-    <string name="nc_password">ססמה</string>
-    <string name="nc_permissions_settings">פתיחת הגדרות</string>
-    <string name="nc_phone_book_integration_account_not_found">החשבון לא נמצא</string>
-    <string name="nc_plain_old_messages">הודעות</string>
-    <string name="nc_privacy">פרטיות</string>
-    <string name="nc_proceed">להמשיך</string>
-    <string name="nc_profile_personal_info_title">פרטים אישיים</string>
-    <string name="nc_promote">קידום לדרגת פיקוח</string>
-    <string name="nc_public_call">דיון ציבורי חדש</string>
-    <string name="nc_public_call_explanation">שיחות פומביות מאפשרות לך להזמין אנשים מבחוץ דרך קישור בעל מבנה מיוחד.</string>
-    <string name="nc_push_disabled">התראות בדחיפה הושבתו</string>
-    <string name="nc_push_to_talk">לחיצה לדיבור</string>
-    <string name="nc_push_to_talk_desc">כשהמיקרופון מושבת, יש ללחוץ ולהחזיק כדי להשתמש בלחיצה לדיבור</string>
-    <string name="nc_remind">להזכיר לי מאוחר יותר</string>
-    <string name="nc_remove_from_favorites">הסרה מהמועדפים</string>
-    <string name="nc_remove_group_and_members">הסרת קבוצה וחברים</string>
-    <string name="nc_remove_participant">הסרת משתתף</string>
-    <string name="nc_rename">שינוי שם הדיון</string>
-    <string name="nc_rename_confirm">שינוי שם</string>
-    <string name="nc_reply">תגובה</string>
-    <string name="nc_save_message">שמירה</string>
-    <string name="nc_save_success">נשמר בהצלחה</string>
-    <string name="nc_screen_lock_timeout_30">30 שניות</string>
-    <string name="nc_screen_lock_timeout_300">5 דקות</string>
-    <string name="nc_screen_lock_timeout_60">דקה</string>
-    <string name="nc_screen_lock_timeout_600">10 דקות</string>
-    <string name="nc_screen_lock_timeout_six_hundred">600</string>
-    <string name="nc_screen_lock_timeout_sixty">60</string>
-    <string name="nc_screen_lock_timeout_thirty">30</string>
-    <string name="nc_screen_lock_timeout_three_hundred">300</string>
-    <string name="nc_search">חיפוש</string>
-    <string name="nc_select_an_account">בחירת חשבון</string>
-    <string name="nc_sent_a_gif" formatted="true">נשלח GIF על ידי %1$s.</string>
-    <string name="nc_sent_a_gif_you">שלחת הנפשה.</string>
-    <string name="nc_sent_a_video" formatted="true">נשלח סרטון על ידי %1$s.</string>
-    <string name="nc_sent_a_video_you">שלחת סרטון.</string>
-    <string name="nc_sent_an_attachment" formatted="true">נשלח קובץ על ידי %1$s.</string>
-    <string name="nc_sent_an_attachment_you">שלחת קובץ מצורף.</string>
-    <string name="nc_sent_an_audio" formatted="true">נשלח מקטע שמע על ידי %1$s.</string>
-    <string name="nc_sent_an_audio_you">שלחת קובץ שמע.</string>
-    <string name="nc_sent_an_image" formatted="true">נשלחה תמונה על ידי %1$s.</string>
-    <string name="nc_sent_an_image_you">שלחת תמונה.</string>
-    <string name="nc_server_connect">בדיקת החיבור לשרת</string>
-    <string name="nc_server_db_upgrade_needed">נא לשדרג את מסד הנתונים שלך מסוג %1$s</string>
-    <string name="nc_server_failed_to_import_account">ייבוא החשבון הנבחר נכשל</string>
-    <string name="nc_server_import_account">ייבוא חשבון מהיישומון %1$s</string>
-    <string name="nc_server_import_account_plain">ייבוא חשבון</string>
-    <string name="nc_server_import_accounts">ייבוא חשבונות מהיישומון %1$s</string>
-    <string name="nc_server_import_accounts_plain">ייבוא חשבונות</string>
-    <string name="nc_server_maintenance">נא להוציא את השרת %1$s ממצב תחזוקה</string>
-    <string name="nc_server_not_installed">נא לסיים את ההתקנה של %1$s אצלך</string>
-    <string name="nc_server_testing_connection">בדיקת חיבור</string>
-    <string name="nc_server_unsupported">השרת אין לו התקנה של אפליקציית ה-Talk הנתמכת</string>
-    <string name="nc_server_url">כתובת שרת https://…</string>
-    <string name="nc_server_version">%1$s עובד רק עם %2$s 13 ומעלה</string>
-    <string name="nc_settings">הגדרות</string>
-    <string name="nc_settings_account_updated">החשבון הקיים שלך עודכן, במקום הוספת חדש</string>
-    <string name="nc_settings_advanced_title">מתקדם</string>
-    <string name="nc_settings_appearance">מראה</string>
-    <string name="nc_settings_call_ringtone">שיחות</string>
-    <string name="nc_settings_incognito_keyboard_desc">מורה למקלדת להשבית למידה מותאמת אישית (ללא ערבויות)</string>
-    <string name="nc_settings_incognito_keyboard_title">מקלדת אלמונית</string>
-    <string name="nc_settings_no_ringtone">אין צליל</string>
-    <string name="nc_settings_no_talk_installed">אפליקציית Talk אינה מותקנת בשרת שניסית לאמת נגדו</string>
-    <string name="nc_settings_notification_sounds">צלילי הודעות</string>
-    <string name="nc_settings_notification_sounds_post_oreo">התראות</string>
-    <string name="nc_settings_other_notifications_ringtone">הודעות</string>
-    <string name="nc_settings_phone_book_integration_phone_number_dialog_title">מספר טלפון</string>
-    <string name="nc_settings_privacy">פרטיות</string>
-    <string name="nc_settings_proxy_host_title">מארח מתווך</string>
-    <string name="nc_settings_proxy_password_title">ססמה במתווך</string>
-    <string name="nc_settings_proxy_port_title">פתחת מתווך</string>
-    <string name="nc_settings_proxy_type_title">סוג מתווך</string>
-    <string name="nc_settings_proxy_username_title">שם משתמש במתווך</string>
-    <string name="nc_settings_remove">הסרה</string>
-    <string name="nc_settings_remove_account">הסרת חשבון</string>
-    <string name="nc_settings_remove_confirmation">נא לאשר את כוונתך להסיר את החשבון הנוכחי.</string>
-    <string name="nc_settings_screen_lock_desc">תנעל את %1$s באמצעות נעילת מסך Android או שיטה ביומטרית נתמכת</string>
-    <string name="nc_settings_screen_lock_timeout_title">נגמר הזמן הקצוב של חוסר פעילות לנעילת המסך</string>
-    <string name="nc_settings_screen_lock_title">נעילת מסך</string>
-    <string name="nc_settings_screen_security_desc">מונע צילומי מסך ברשימה האחרונה ובתוך האפליקציה</string>
-    <string name="nc_settings_screen_security_title">אבטחת מסך</string>
-    <string name="nc_settings_server_eol_title">גרסת השרת אינה נתמכת</string>
-    <string name="nc_settings_theme_battery_saver">הוגדרה על ידי חוסך הסוללה</string>
-    <string name="nc_settings_theme_dark">כהה</string>
-    <string name="nc_settings_theme_follow_system">להשתמש בבררת המחדל של המערכת</string>
-    <string name="nc_settings_theme_key">ערכת עיצוב</string>
-    <string name="nc_settings_theme_light">בהירה</string>
-    <string name="nc_settings_theme_title">ערכת עיצוב</string>
-    <string name="nc_settings_warning">אזהרה</string>
-    <string name="nc_settings_wrong_account">ניתן לאמת רק את החשבון הנוכחי</string>
-    <string name="nc_share_contact_permission">נדרשת הרשאה לקריאת רשימת אנשי הקשר</string>
-    <string name="nc_share_subject">הזמנה אל %1$s</string>
-    <string name="nc_share_text">כדאי להצטרף לדיון תחת %1$s/index.php/call/%2$s</string>
-    <string name="nc_share_text_pass">\nססמה: %1$s</string>
-    <string name="nc_share_this_location">שיתוף המיקום הזה</string>
-    <string name="nc_share_to_choose_account">נא לבחור חשבון</string>
-    <string name="nc_shared_items_deck_card">כרטיס בחסיפה</string>
-    <string name="nc_shared_items_location">מיקום</string>
-    <string name="nc_sort_by">מיון על בסיס</string>
-    <string name="nc_start_time">מועד התחלה</string>
-    <string name="nc_switch_account">החלף חשבון</string>
-    <string name="nc_upload_in_progess">מתבצעת העלאה</string>
-    <string name="nc_user">משתמש</string>
-    <string name="nc_webinar">סמינר מקוון</string>
-    <string name="nc_wrong_link">הקישור לדיון אינו תקף</string>
-    <string name="nc_wrong_password">ססמה שגויה</string>
-    <string name="nc_yes">כן</string>
-    <string name="next_week">השבוע הבא</string>
-    <string name="oneHour">שעה</string>
-    <string name="online">מקוון</string>
-    <string name="online_status">מצב מקוון</string>
-    <string name="polls_options">אפשרויות</string>
-    <string name="polls_settings">הגדרות</string>
-    <string name="reactions_tab_all">הכול</string>
-    <string name="save">שמירה</string>
-    <string name="scope_federated_description">לסנכרן מול שרתים מהימנים בלבד</string>
-    <string name="scope_federated_title">Federated</string>
-    <string name="scope_local_title">מקומ</string>
-    <string name="scope_private_title">פרטי</string>
-    <string name="scope_published_description">לסנכרן מול שרתים מהימנים וספר הכתובות הגלובלי והציבורי</string>
-    <string name="secondsAgo">לפני מספר שניות</string>
-    <string name="selected_list_item">Selected</string>
-    <string name="send_email">שליחת דואר אלקטרוני</string>
-    <string name="set">הגדרה</string>
-    <string name="set_status">הגדרת מצב</string>
-    <string name="set_status_message">הגדרת הודעת מצב</string>
-    <string name="share">שתף</string>
-    <string name="shared_items_audio">שמע</string>
-    <string name="shared_items_file">קובץ</string>
-    <string name="shared_items_media">מדיה</string>
-    <string name="shared_items_other">אחר</string>
-    <string name="shared_items_voice">קולי</string>
-    <string name="starred">סימון כמועדף</string>
-    <string name="status_message">הודעת מצב</string>
-    <string name="take_photo_send">שליחה</string>
-    <string name="thirtyMinutes">30 דקות</string>
-    <string name="thisWeek">השבוע</string>
-    <string name="title_attachments">קבצים מצורפים</string>
-    <string name="today">היום</string>
-    <string name="tomorrow">מחר</string>
-    <string name="translate">תרגום</string>
-    <string name="translation_device_settings">הגדרות מכשיר</string>
-    <string name="translation_from">מאת</string>
-    <string name="translation_to">אל</string>
-    <string name="user_info_address">כתובת</string>
-    <string name="user_info_displayname">שם מלא</string>
-    <string name="user_info_email">דוא״ל</string>
-    <string name="user_info_phone">מספר טלפון</string>
-    <string name="user_info_twitter">טוויטר</string>
-    <string name="user_info_website">אתר אינטרנט</string>
-    <string name="user_status">מצב</string>
-    <string name="userinfo_no_info_headline">לא הוגדרו פרטים אישיים</string>
-    <string name="userinfo_no_info_text">הוספת שם, תמונה ופרטי קשר לעמוד הפרופיל שלך.</string>
-    <string name="whats_your_status">מה המצב שלך?</string>
-    </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index b451e9d67..cbdeb02b3 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -31,6 +31,7 @@
     <string name="file_list_loading">読み込み中…</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4時間</string>
+    <string name="hint_edited_message">(編集済み)</string>
     <string name="invisible">オフライン</string>
     <string name="load_more_results">結果をさらに読み込む</string>
     <string name="lock_symbol">鍵の記号</string>
@@ -139,6 +140,7 @@
     <string name="nc_dialog_save_to_storage_yes">はい</string>
     <string name="nc_display_name_not_fetched">表示名を取得できませんでした。</string>
     <string name="nc_display_name_not_stored">表示名を保存できませんでした。</string>
+    <string name="nc_edit_message">編集</string>
     <string name="nc_email">メール</string>
     <string name="nc_expire_message_eight_hours">8時間</string>
     <string name="nc_expire_message_off">オフ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a5c18e7e1..3a7219b24 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -34,6 +34,7 @@
     <string name="file_list_loading">불러오는 중 …</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 시간</string>
+    <string name="hint_edited_message">(수정됨)</string>
     <string name="invisible">숨겨짐</string>
     <string name="later_today">오늘 중</string>
     <string name="load_more_results">더 많은 결과 불러오기</string>
@@ -145,6 +146,7 @@
     <string name="nc_dialog_save_to_storage_yes">예</string>
     <string name="nc_display_name_not_fetched">표시 이름을 가져올 수 없음, 중단함</string>
     <string name="nc_display_name_not_stored">표시 이름을 저장할 수 없음, 중단함</string>
+    <string name="nc_edit_message">편집</string>
     <string name="nc_email">이메일</string>
     <string name="nc_expire_message_eight_hours">8시간</string>
     <string name="nc_expire_message_four_weeks">4주</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 67992beb9..ed5c2c472 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -104,6 +104,7 @@
     <string name="nc_dialog_outdated_client_option_update">Atnaujinti</string>
     <string name="nc_dialog_save_to_storage_no">Ne</string>
     <string name="nc_dialog_save_to_storage_yes">Taip</string>
+    <string name="nc_edit_message">Taisyti</string>
     <string name="nc_email">El. paštas</string>
     <string name="nc_expire_message_eight_hours">8 valandos</string>
     <string name="nc_expire_message_off">Išjungta</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 1651d68a5..44d774a9b 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">Laster ...</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 timer</string>
+    <string name="hint_edited_message">(redigert)</string>
     <string name="invisible">Usynlig</string>
     <string name="languages_error_message">Språk kunne ikke hentes</string>
     <string name="languages_error_title">Henting feilet</string>
@@ -137,6 +138,7 @@
     <string name="nc_conversation_menu_conversation_info">Samtale informasjon</string>
     <string name="nc_conversation_menu_video_call">Videosamtale</string>
     <string name="nc_conversation_menu_voice_call">Samtale</string>
+    <string name="nc_conversation_not_found">Samtalen ble ikke funnet</string>
     <string name="nc_conversation_settings">Samtale innstillinger</string>
     <string name="nc_conversations_empty">Ta del i en samtale eller start en ny</string>
     <string name="nc_conversations_empty_details">Si hei til venner og kolleger!</string>
@@ -207,6 +209,7 @@
     <string name="nc_dialog_save_to_storage_yes">Ja</string>
     <string name="nc_display_name_not_fetched">Kunne ikke hente visningsnavn, avbryter</string>
     <string name="nc_display_name_not_stored">Kunne ikke lagre visningsnavn, avbryter</string>
+    <string name="nc_edit_message">Rediger</string>
     <string name="nc_email">E-post</string>
     <string name="nc_expire_message_eight_hours">8 timer</string>
     <string name="nc_expire_message_four_weeks">4 uker</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3cca7afcb..bd4501e6f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -144,6 +144,7 @@
     <string name="nc_dialog_save_to_storage_yes">Ja</string>
     <string name="nc_display_name_not_fetched">Weergave kon niet worden opgehaald, afgebroken</string>
     <string name="nc_display_name_not_stored">Kon weergavenaam niet opslaan, afbreken</string>
+    <string name="nc_edit_message">Bewerken</string>
     <string name="nc_email">E-mailadres</string>
     <string name="nc_expire_message_eight_hours">8 uur</string>
     <string name="nc_expire_message_four_weeks">4 weken</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a7b045d8a..700ed47ca 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -177,6 +177,7 @@
     <string name="nc_dialog_save_to_storage_yes">Tak</string>
     <string name="nc_display_name_not_fetched">Nie udało się pobrać nazwy, przerwano żądanie</string>
     <string name="nc_display_name_not_stored">Nie można zapisać wyświetlanej nazwy, przerwano żądanie</string>
+    <string name="nc_edit_message">Edycja</string>
     <string name="nc_email">E-mail</string>
     <string name="nc_expire_message_eight_hours">8 godzin</string>
     <string name="nc_expire_message_four_weeks">4 tygodnie</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0ab7f9145..8e52deb04 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -178,6 +178,7 @@
     <string name="nc_dialog_save_to_storage_yes">Sim</string>
     <string name="nc_display_name_not_fetched">Nome de exibição não obtido, interrompendo</string>
     <string name="nc_display_name_not_stored">Não foi possível armazenar o nome de exibição, cancelando</string>
+    <string name="nc_edit_message">Editar</string>
     <string name="nc_email">E-mail</string>
     <string name="nc_expire_message_eight_hours">8 horas</string>
     <string name="nc_expire_message_four_weeks">4 semanas</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0b639f453..8f69da50e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -166,6 +166,7 @@
     <string name="nc_dialog_save_to_storage_yes">Да</string>
     <string name="nc_display_name_not_fetched">Не удалось получить отображаемое имя, продолжение невозможно</string>
     <string name="nc_display_name_not_stored">Не удалось сохранить отображаемое имя, продолжение невозможно</string>
+    <string name="nc_edit_message">Редактирование</string>
     <string name="nc_email">Эл. почта</string>
     <string name="nc_expire_message_eight_hours">8 часов</string>
     <string name="nc_expire_message_four_weeks">4 недели</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 9b3efbef9..4d6ba58c1 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -93,6 +93,7 @@
     <string name="nc_conversation_menu_conversation_info">Informatziones de resonada</string>
     <string name="nc_conversation_menu_video_call">Mutida de vìdeu</string>
     <string name="nc_conversation_menu_voice_call">Mutida de boghe</string>
+    <string name="nc_conversation_not_found">Resonada no agatada</string>
     <string name="nc_conversation_settings">Impostatziones de sa resonada</string>
     <string name="nc_conversations_empty">Intra in una resonada o cumintza•nde una noa</string>
     <string name="nc_conversations_empty_details">Saluda a sa gente!</string>
@@ -127,6 +128,7 @@
     <string name="nc_dialog_save_to_storage_yes">Si</string>
     <string name="nc_display_name_not_fetched">Errore in su recùperu de su nùmene ammustradu, annullende</string>
     <string name="nc_display_name_not_stored">No at fatu a sarvare su nùmene ammustradu, annullende</string>
+    <string name="nc_edit_message">Modìfica</string>
     <string name="nc_email">Posta eletrònica</string>
     <string name="nc_expire_message_off">Istudadu</string>
     <string name="nc_expire_message_one_day">1 die</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index ae9fb940c..bf8f20487 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -167,6 +167,7 @@
     <string name="nc_dialog_save_to_storage_yes">Áno</string>
     <string name="nc_display_name_not_fetched">Zobrazované meno sa nedalo načítať, ruším</string>
     <string name="nc_display_name_not_stored">Nedá sa uložiť zobrazované meno, ruším</string>
+    <string name="nc_edit_message">Úprava</string>
     <string name="nc_email">Email</string>
     <string name="nc_expire_message_eight_hours">8 hodín</string>
     <string name="nc_expire_message_four_weeks">4 týždne</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 97a542cdd..624d0272b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -155,6 +155,7 @@
     <string name="nc_dialog_save_to_storage_yes">Da</string>
     <string name="nc_display_name_not_fetched">Prikaznega imena ni mogoče pridobiti; opravilo je prekinjeno.</string>
     <string name="nc_display_name_not_stored">Prikaznega imena ni mogoče shraniti; opravilo je prekinjeno.</string>
+    <string name="nc_edit_message">Uredi</string>
     <string name="nc_email">Elektronski naslov</string>
     <string name="nc_expire_message_eight_hours">8 ur</string>
     <string name="nc_expire_message_four_weeks">4 tedni</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0f0b13ce8..80ce0303e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">Учитавање…</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 сата</string>
+    <string name="hint_edited_message">(уређено)</string>
     <string name="invisible">Невидљива</string>
     <string name="languages_error_message">Није успело преузимање језика</string>
     <string name="languages_error_title">Није успело преузимање</string>
@@ -137,6 +138,7 @@
     <string name="nc_conversation_menu_conversation_info">Информације о разговору</string>
     <string name="nc_conversation_menu_video_call">Видео позив</string>
     <string name="nc_conversation_menu_voice_call">Аудио позив</string>
+    <string name="nc_conversation_not_found">Разговор није нађен</string>
     <string name="nc_conversation_settings">Подешавања разговора</string>
     <string name="nc_conversations_empty">Придружи се разговору или започни нови</string>
     <string name="nc_conversations_empty_details">Поздравите Ваше пријатеље и колеге!</string>
@@ -207,6 +209,7 @@
     <string name="nc_dialog_save_to_storage_yes">Да</string>
     <string name="nc_display_name_not_fetched">Име за приказ се не може добавити. Прекидам</string>
     <string name="nc_display_name_not_stored">Не могу да сачувам име за приказ. Прекидам</string>
+    <string name="nc_edit_message">Измени</string>
     <string name="nc_email">Е-пошта</string>
     <string name="nc_expire_message_eight_hours">8 сати</string>
     <string name="nc_expire_message_four_weeks">4 недеље</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 981dd4aea..a374e0ed6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -85,6 +85,7 @@
     <string name="nc_conversation_menu_conversation_info">Konversationsinfo</string>
     <string name="nc_conversation_menu_video_call">Videosamtal</string>
     <string name="nc_conversation_menu_voice_call">Röstsamtal</string>
+    <string name="nc_conversation_not_found">Konversationen hittades inte</string>
     <string name="nc_conversation_settings">Konversationsinställningar</string>
     <string name="nc_conversations_empty">Anslut till en konversation eller starta en ny</string>
     <string name="nc_conversations_empty_details">Säg hej till dina vänner och kollegor!</string>
@@ -115,6 +116,7 @@
     <string name="nc_dialog_save_to_storage_yes">Ja</string>
     <string name="nc_display_name_not_fetched">Visningsnamn kunde inte hämtas, avbryter</string>
     <string name="nc_display_name_not_stored">Kunde inte lagra visningsnamnet, avbryter</string>
+    <string name="nc_edit_message">Redigera</string>
     <string name="nc_email">E-post</string>
     <string name="nc_expire_message_off">Av</string>
     <string name="nc_expire_message_one_day">1 dag</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 63fb174bd..158253389 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">Yükleniyor…</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4 saat</string>
+    <string name="hint_edited_message">(düzenlendi)</string>
     <string name="invisible">Görünmez</string>
     <string name="languages_error_message">Diller alınamadı</string>
     <string name="languages_error_title">Alınamadı</string>
@@ -207,6 +208,7 @@
     <string name="nc_dialog_save_to_storage_yes">Evet</string>
     <string name="nc_display_name_not_fetched">Görüntülenecek ad alınamadı, vazgeçiliyor</string>
     <string name="nc_display_name_not_stored">Görüntülenecek ad kaydedilemedi, vazgeçiliyor</string>
+    <string name="nc_edit_message">Düzenle</string>
     <string name="nc_email">E-posta</string>
     <string name="nc_expire_message_eight_hours">8 saat</string>
     <string name="nc_expire_message_four_weeks">4 hafta</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 96011b670..7fedf3876 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -119,6 +119,7 @@
     <string name="nc_conversation_menu_conversation_info">Інформація про розмову</string>
     <string name="nc_conversation_menu_video_call">Відеодзвінок</string>
     <string name="nc_conversation_menu_voice_call">Голосовий дзвінок</string>
+    <string name="nc_conversation_not_found">Розмову не знайдено</string>
     <string name="nc_conversation_settings">Налаштування розмови</string>
     <string name="nc_conversations_empty">Приєднайтеся до розмови або почніть нову</string>
     <string name="nc_conversations_empty_details">Привітайтеся з вашими друзями та колегами!</string>
@@ -151,6 +152,7 @@
     <string name="nc_dialog_save_to_storage_yes">Так</string>
     <string name="nc_display_name_not_fetched">Ім\'я для показу не вдалося розпізнати. Скасування</string>
     <string name="nc_display_name_not_stored">Неможливо отримати ім\'я для показу. Скасування</string>
+    <string name="nc_edit_message">Редагувати</string>
     <string name="nc_email">Електронна пошта</string>
     <string name="nc_expire_message_eight_hours">8 годин</string>
     <string name="nc_expire_message_four_weeks">4 тижні</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5c1cce403..4aa6688ca 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -132,6 +132,7 @@
     <string name="nc_conversation_menu_conversation_info">对话信息</string>
     <string name="nc_conversation_menu_video_call">视频通话</string>
     <string name="nc_conversation_menu_voice_call">语音通话</string>
+    <string name="nc_conversation_not_found">没有找到对话</string>
     <string name="nc_conversation_settings">对话设置</string>
     <string name="nc_conversations_empty">加入一个对话或开始一个新的对话</string>
     <string name="nc_conversations_empty_details">跟你的朋友和同事打个招呼！</string>
@@ -172,6 +173,7 @@
     <string name="nc_dialog_save_to_storage_yes">是</string>
     <string name="nc_display_name_not_fetched">无法获取显示名，中止</string>
     <string name="nc_display_name_not_stored">无法储存显示名称，正在终止</string>
+    <string name="nc_edit_message">编辑</string>
     <string name="nc_email">电子邮件</string>
     <string name="nc_expire_message_eight_hours">8小时</string>
     <string name="nc_expire_message_four_weeks">4 星期</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 9e51bcbbe..a2079a3af 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">加載中 …</string>
     <string name="filename_progress">%1$s（%2$d）</string>
     <string name="fourHours">4 小時</string>
+    <string name="hint_edited_message">（已編輯）</string>
     <string name="invisible">隱藏</string>
     <string name="languages_error_message">無法擷取語言</string>
     <string name="languages_error_title">擷取失敗</string>
@@ -137,6 +138,7 @@
     <string name="nc_conversation_menu_conversation_info">對話資訊</string>
     <string name="nc_conversation_menu_video_call">視訊通話</string>
     <string name="nc_conversation_menu_voice_call">語音通話</string>
+    <string name="nc_conversation_not_found">未找到對話</string>
     <string name="nc_conversation_settings">對話設定</string>
     <string name="nc_conversations_empty">加入或者開一個新的對話</string>
     <string name="nc_conversations_empty_details">跟大家打招呼</string>
@@ -207,6 +209,7 @@
     <string name="nc_dialog_save_to_storage_yes">是</string>
     <string name="nc_display_name_not_fetched">無法取得顯示名稱，將停止操作。</string>
     <string name="nc_display_name_not_stored">無法儲存顯示名稱，操作中斷。</string>
+    <string name="nc_edit_message">編輯</string>
     <string name="nc_email">電郵地址</string>
     <string name="nc_expire_message_eight_hours">8 小时</string>
     <string name="nc_expire_message_four_weeks">4 個星期</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f5d3ab3bc..fcd6bbea3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -41,6 +41,7 @@
     <string name="file_list_loading">正在載入……</string>
     <string name="filename_progress">%1$s (%2$d)</string>
     <string name="fourHours">4小時</string>
+    <string name="hint_edited_message">（已編輯）</string>
     <string name="invisible">隱藏</string>
     <string name="languages_error_message">無法擷取語言</string>
     <string name="languages_error_title">擷取失敗</string>
@@ -137,6 +138,7 @@
     <string name="nc_conversation_menu_conversation_info">對話資訊</string>
     <string name="nc_conversation_menu_video_call">視訊通話</string>
     <string name="nc_conversation_menu_voice_call">語音通話</string>
+    <string name="nc_conversation_not_found">找不到對話</string>
     <string name="nc_conversation_settings">對話設定</string>
     <string name="nc_conversations_empty">加入一個對話或者開一個新的</string>
     <string name="nc_conversations_empty_details">跟大家打個招呼！</string>
@@ -207,6 +209,7 @@
     <string name="nc_dialog_save_to_storage_yes">是</string>
     <string name="nc_display_name_not_fetched">無法取得顯示名稱，將停止動作。</string>
     <string name="nc_display_name_not_stored">無法儲存顯示名稱，操作中斷。</string>
+    <string name="nc_edit_message">編輯</string>
     <string name="nc_email">電子郵件</string>
     <string name="nc_expire_message_eight_hours">8小時</string>
     <string name="nc_expire_message_four_weeks">4 週</string>