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 ee2389eb0..106e62efe 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -8,6 +8,7 @@
     <string name="archive_hint">Once a conversation is archived, it will be hidden by default. Select the filter \"Archived\" to view archived conversations. Direct mentions will still be received.</string>
     <string name="archived">Archived</string>
     <string name="archived_conversation">Archived %1$s</string>
+    <string name="audio_call">Audio call</string>
     <string name="audio_output_bluetooth">Bluetooth</string>
     <string name="audio_output_dialog_headline">Audio output</string>
     <string name="audio_output_phone">Phone</string>
@@ -31,6 +32,7 @@
     <string name="close">Close</string>
     <string name="close_icon">Close Icon</string>
     <string name="connection_established">Connection established</string>
+    <string name="connection_lost">No connection to server</string>
     <string name="connection_lost_sent_messages_are_queued">Connection lost - Sent messages are queued</string>
     <string name="continuous_voice_message_recording">Lock recording for continuously recording of the voice message</string>
     <string name="conversation_is_read_only">Conversation is read only</string>
@@ -46,6 +48,7 @@
     <string name="dnd">Do not disturb</string>
     <string name="dontClear">Don\'t clear</string>
     <string name="edit">Edit</string>
+    <string name="edit_error_24_hours_old_message">Messages older than 24 hours can not be edited</string>
     <string name="edit_message_icon_description">Edit message</string>
     <string name="emoji_backspace">Backspace</string>
     <string name="emoji_category_recent">Recent</string>
@@ -81,6 +84,7 @@
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
     <string name="menu_item_sort_by_size_biggest_first">Biggest first</string>
     <string name="menu_item_sort_by_size_smallest_first">Smallest first</string>
+    <string name="message_copied">Message copied</string>
     <string name="message_deleted_by_you">Message deleted by you</string>
     <string name="message_last_edited_by">Edited by %1$s</string>
     <string name="message_poll_tap_to_open">Tap to open poll</string>
@@ -253,6 +257,7 @@
     <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>
     <string name="nc_following_link">User following a public link</string>
     <string name="nc_formatted_message_you">You: %1$s</string>
     <string name="nc_forward_message">Forward</string>
@@ -367,6 +372,9 @@
     <string name="nc_public_call_explanation">Public conversations let you invite people from outside through a specially crafted link.</string>
     <string name="nc_public_call_status">Public conversation</string>
     <string name="nc_push_disabled">Push notifications disabled</string>
+    <string name="nc_push_notification_error"> Sorry something went wrong, error is %1$s</string>
+    <string name="nc_push_notification_fetch_error">Sorry something went wrong, cannot fetch test push message</string>
+    <string name="nc_push_notification_message">Push notification is sent successfully. You should now receive a notification on this device with the title \'Testing push notifications\'</string>
     <string name="nc_push_to_talk">Press-to-transmit</string>
     <string name="nc_push_to_talk_desc">With the microphone disabled, click&amp;hold to use Press-to-transmit</string>
     <string name="nc_refresh">Refresh</string>
@@ -395,6 +403,7 @@
     <string name="nc_search">Search</string>
     <string name="nc_select_an_account">Select an account</string>
     <string name="nc_select_participants">Select participants</string>
+    <string name="nc_send_edit_message">Update message</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s sent a GIF.</string>
     <string name="nc_sent_a_gif_you">You sent a GIF.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s sent a video.</string>
@@ -475,6 +484,7 @@
     <string name="nc_settings_server_eol">The server version is too old and not supported by this version of the Android app</string>
     <string name="nc_settings_server_eol_title">Unsupported server</string>
     <string name="nc_settings_server_notification_app_not_installed_title">Server notifications app not installed</string>
+    <string name="nc_settings_theme_battery_saver">Set by battery saver</string>
     <string name="nc_settings_theme_dark">Dark</string>
     <string name="nc_settings_theme_follow_system">Use system default</string>
     <string name="nc_settings_theme_key">theme</string>
@@ -507,6 +517,8 @@
     <string name="nc_switch_account">Switch account</string>
     <string name="nc_team">Team</string>
     <string name="nc_teams">Teams</string>
+    <string name="nc_test_push_button">Test push notifications</string>
+    <string name="nc_test_results">Test results</string>
     <string name="nc_upload_choose_local_files">Choose files</string>
     <string name="nc_upload_confirm_send_multiple">Send these files to %1$s?</string>
     <string name="nc_upload_confirm_send_single">Send this file to %1$s?</string>
@@ -530,6 +542,7 @@
     <string name="nc_yes">Yes</string>
     <string name="new_conversation_creation_icon">New Conversation Creation Icon</string>
     <string name="next_week">Next week</string>
+    <string name="no_conversations_archived">No archived conversations</string>
     <string name="no_offline_messages_saved">No offline messages saved</string>
     <string name="no_phone_book_integration_due_to_permissions">No phone number integration due to missing permissions</string>
     <string name="oneHour">1 hour</string>
@@ -668,6 +681,7 @@
     <string name="userinfo_error_text">Failed to retrieve personal user information.</string>
     <string name="userinfo_no_info_headline">No personal info set</string>
     <string name="userinfo_no_info_text">Add name, picture and contact details on your profile page.</string>
+    <string name="video_call">Video call</string>
     <string name="whats_your_status">What is your status?</string>
     <plurals name="see_similar_system_messages">
         <item quantity="one">See %d similar message</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e56f060ea..ba3cdee57 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -675,7 +675,7 @@
     <string name="user_info_displayname">Vollständiger Name</string>
     <string name="user_info_email">E-Mail</string>
     <string name="user_info_phone">Telefonnummer</string>
-    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_twitter">X</string>
     <string name="user_info_website">Webseite</string>
     <string name="user_status">Status</string>
     <string name="userinfo_error_text">Persönliche Nutzerinformationen konnten nicht geladen werden</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 5c112c6d4..006174a10 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -8,6 +8,7 @@
     <string name="archive_hint">對話封存後，預設會隱藏。選取篩選條件「已封存」可檢視已封存的對話。仍會收到直接提及。</string>
     <string name="archived">已封存</string>
     <string name="archived_conversation">已封存 %1$s</string>
+    <string name="audio_call">音頻通話</string>
     <string name="audio_output_bluetooth">藍牙</string>
     <string name="audio_output_dialog_headline">音頻輸出</string>
     <string name="audio_output_phone">電話</string>
@@ -31,6 +32,7 @@
     <string name="close">關閉</string>
     <string name="close_icon">關閉圖示</string>
     <string name="connection_established">連線已建立</string>
+    <string name="connection_lost">無法連接到伺服器</string>
     <string name="connection_lost_sent_messages_are_queued">連線已中斷 - 已發送的訊息已排隊等待傳送</string>
     <string name="continuous_voice_message_recording">鎖定錄音以連續錄製音頻訊息</string>
     <string name="conversation_is_read_only">對話是唯讀</string>
@@ -46,6 +48,7 @@
     <string name="dnd">請勿打擾</string>
     <string name="dontClear">不要清除</string>
     <string name="edit">編輯</string>
+    <string name="edit_error_24_hours_old_message">無法編輯超過24小時的訊息</string>
     <string name="edit_message_icon_description">編輯訊息</string>
     <string name="emoji_backspace">Backspace</string>
     <string name="emoji_category_recent">最新</string>
@@ -81,6 +84,7 @@
     <string name="menu_item_sort_by_name_z_a">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="message_copied">已複製訊息</string>
     <string name="message_deleted_by_you">訊息被您刪除</string>
     <string name="message_last_edited_by">由 %1$s 編輯</string>
     <string name="message_poll_tap_to_open">點按即可打開民意調查</string>
@@ -253,6 +257,7 @@
     <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>
     <string name="nc_following_link">用戶關注公共連結</string>
     <string name="nc_formatted_message_you">你： %1$s</string>
     <string name="nc_forward_message">轉寄</string>
@@ -367,6 +372,9 @@
     <string name="nc_public_call_explanation">公開對話讓您可通過特製的連結邀請外部人士。</string>
     <string name="nc_public_call_status">公開對話</string>
     <string name="nc_push_disabled">取消推送通知</string>
+    <string name="nc_push_notification_error">抱歉，出現問題，錯誤是 %1$s</string>
+    <string name="nc_push_notification_fetch_error">抱歉，出現問題，無法獲取測試推送訊息</string>
+    <string name="nc_push_notification_message">推送通知已成功發送。您現在應該在此設備上收到標題為「測試推送通知」的通知</string>
     <string name="nc_push_to_talk">一鍵通</string>
     <string name="nc_push_to_talk_desc">在停用米高風的情況下，單擊並按住即可使用一鍵通</string>
     <string name="nc_refresh">刷新</string>
@@ -395,6 +403,7 @@
     <string name="nc_search">搜尋</string>
     <string name="nc_select_an_account">選擇一個賬號</string>
     <string name="nc_select_participants">選擇參與者</string>
+    <string name="nc_send_edit_message">更新訊息</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s 傳送一個 GIF。</string>
     <string name="nc_sent_a_gif_you">您傳送了一個 GIF 檔</string>
     <string name="nc_sent_a_video" formatted="true">%1$s 傳送一個影片</string>
@@ -475,6 +484,7 @@
     <string name="nc_settings_server_eol">伺服器版本太舊，此版本的Android應用程式不支持該伺服器版本</string>
     <string name="nc_settings_server_eol_title">不支援伺服器</string>
     <string name="nc_settings_server_notification_app_not_installed_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>
@@ -507,6 +517,8 @@
     <string name="nc_switch_account">切換帳戶</string>
     <string name="nc_team">團隊</string>
     <string name="nc_teams">團隊</string>
+    <string name="nc_test_push_button">測試推送通知</string>
+    <string name="nc_test_results">測試結果</string>
     <string name="nc_upload_choose_local_files">選擇檔案</string>
     <string name="nc_upload_confirm_send_multiple">將這些檔案發送到 %1$s？</string>
     <string name="nc_upload_confirm_send_single">將此檔案發送到 %1$s？</string>
@@ -530,6 +542,7 @@
     <string name="nc_yes">是</string>
     <string name="new_conversation_creation_icon">新對話建立圖示</string>
     <string name="next_week">下星期</string>
+    <string name="no_conversations_archived">沒有已封存的對話</string>
     <string name="no_offline_messages_saved">未儲存離線訊息</string>
     <string name="no_phone_book_integration_due_to_permissions">由於缺少權限而無法集成電話號碼</string>
     <string name="oneHour">1 小時</string>
@@ -668,6 +681,7 @@
     <string name="userinfo_error_text">無法檢索個人用戶資訊。</string>
     <string name="userinfo_no_info_headline">未設定個人資訊</string>
     <string name="userinfo_no_info_text">在您的個人檔案中新增名字、頭像和聯絡資訊</string>
+    <string name="video_call">視頻通話</string>
     <string name="whats_your_status">您目前的狀態是什麼呢？</string>
     <plurals name="see_similar_system_messages">
         <item quantity="other">檢視 %d 則類似的訊息</item>