From d50b0c34e665e5fead0fc0c9efd36806bcd38d10 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 11 Sep 2022 12:50:40 +0200
Subject: [PATCH 1/4] update translations

---
 res/values-zh-rCN/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5f4330337..7dff83bd6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -39,7 +39,7 @@
     <string name="unarchive">解档</string>
     <string name="mute">静音</string>
     <string name="ephemeral_messages">消息定时销毁</string>
-    <string name="ephemeral_messages_hint">这些设置适用于所有使用 Delta Chat 的参与者。 但是，他们可能会复制、保存和转发消息或者使用其他的电子邮件客户端。</string>
+    <string name="ephemeral_messages_hint">这些设置适用于所有使用 Delta Chat 的聊天成员。 他们仍然可以复制、保存和转发消息，或者使用其他的电子邮件客户端。</string>
     <string name="save">保存</string>
     <string name="chat">聊天</string>
     <string name="media">媒体</string>
@@ -285,7 +285,7 @@
     <string name="videochat_instance_placeholder">您的视频聊天实例</string>
     <string name="videochat_instance_example">示例： https://meet.jit.si/$ROOM 或 basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">如启用视频聊天，你可以从每个聊天启动一个视频聊天。视频聊天需要双方均装有兼容的应用或浏览器</string>
-    <string name="videochat_instance_from_qr">使用“%1$s”邀请其他人加入视频聊天吗？\n\n设置好后，您就可以在聊天里发起视频聊天了。 这会取代之前的视频聊天设置（如果有的话）。</string>
+    <string name="videochat_instance_from_qr">使用“%1$s”邀请其他人加入视频聊天吗？\n\n设置好后，您就可以在聊天里发起视频聊天了。 这会取代之前的视频聊天设置。</string>
     <string name="videochat_invitation">视频聊天邀请</string>
     <string name="videochat_invitation_body">您被邀请参加视频聊天，点击 %1$s 来加入。</string>
 
@@ -434,7 +434,7 @@
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new email addresses. -->
     <string name="aeap_addr_changed">%1$s 将邮箱从 %2$s 更改为 %3$s</string>
     <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
-    <string name="aeap_explanation">你将邮箱从 %1$s 改为了 %2$s。\n\n如果你现在发送一条消息到已验证的群组，那里的联系人将自动用你的新邮箱替换旧邮箱。\n\n我们建议你配置旧邮箱将所有邮件转发到新邮箱。否则，你可能收不到还不知道你新邮箱的联系人发过来的消息。</string>
+    <string name="aeap_explanation">你将邮箱从 %1$s 改为了 %2$s。\n\n如果你现在发送一条消息到已验证的群组，那里的联系人将自动用你的新邮箱替换旧邮箱。\n\n我们建议你将旧邮箱配置为转发所有邮件到新邮箱。否则，你可能收不到还不知道你新邮箱的联系人发过来的消息。</string>
 
     <!-- Connectivity -->
     <!-- Headline for the "Inbox" eg. in the "Connectivity" view -->
@@ -443,7 +443,7 @@
     <string name="outgoing_messages">传出消息</string>
     <!-- Headline in the "Connectivity" view. Placeholder will be replaced by the domain of the configured email-address. -->
     <string name="storage_on_domain">%1$s 上的存储</string>
-    <string name="connectivity">连接性</string>
+    <string name="connectivity">连接状态</string>
     <!-- Shown in the title bar if the app is "Not connected"; prefer short strings. -->
     <string name="connectivity_not_connected">未连接</string>
     <!-- Shown in the title bar if the app is "Connecting"; prefer short strings. The ellipsis is a single character (…), not three (...) -->
@@ -521,8 +521,8 @@
     <!-- share and forward messages -->
     <!-- Translators: shown above a chat/contact list when selecting recipients to forward messages -->
     <string name="forward_to">转发给…</string>
-    <string name="share_multiple_attachments">发送 %1$d 个文件到所选聊天？\n\n文件将以未经修改的、保持原大小的方式发送，例如：图像和视频不会被重新编码。</string>
-    <string name="share_multiple_attachments_multiple_chats">发送 %1$d 个文件到 %2$d 个聊天？\n\n文件将以未经修改的、保持原大小的方式发送，例如：图像和视频不会被重新编码。</string>
+    <string name="share_multiple_attachments">发送 %1$d 个文件到所选聊天？\n\n文件将以原样发送（例如：图像和视频不会被重新编码）。</string>
+    <string name="share_multiple_attachments_multiple_chats">发送 %1$d 个文件到 %2$d 个聊天？\n\n文件将以原样发送（例如：图像和视频不会被重新编码）。</string>
     <string name="share_text_multiple_chats">发送这段文字到 %1$d 个聊天？\n\n\"%2$s“</string>
     <string name="share_abort">由于缺少权限，分享中止。</string>
 
@@ -691,7 +691,7 @@
     <string name="autocrypt_continue_transfer_please_enter_code">请输入另一台设备上显示的设置码。</string>
     <string name="autocrypt_continue_transfer_succeeded">端到端设置已传输。此设备已准备好用与另一台设备相同的设置来使用 Autocrypt 了。</string>
     <string name="autocrypt_continue_transfer_retry">重试</string>
-    <string name="autocrypt_bad_setup_code">错误的设置码，请重试。\n\n如果您不记得设置码，从另一台设备发送一个新的 Autocrypt 设置消息即可。</string>
+    <string name="autocrypt_bad_setup_code">错误的设置码，请重试。\n\n如果您忘记了设置码，从另一台设备发送一个新的 Autocrypt 设置消息即可。</string>
 
 
     <!-- system messages -->
@@ -730,7 +730,7 @@
 
     <string name="devicemsg_self_deleted">您已删除“保存的消息”聊天。\n\nℹ️要再次使用“保存的消息”功能，请创建一个与自己的新聊天。</string>
     <!-- %1$s will be replaced by the amount of storage already used, sth. as '500 MB'. If you want to use a percentage sign, type in two of them, eg. %1$s %% -->
-    <string name="devicemsg_storage_exceeding">⚠️邮件服务商提供的存储空间快满了，已使用 %1$s%%。\n\n当存储用量达到 100%% 时，您可能无法接收消息。\n\n👉请检查是否可以在提供商的网页界面上删除旧数据；您还可以考虑启用“设置/删除旧消息”。您可以随时在“设置/连接性”中查看当前的存储使用情况。</string>
+    <string name="devicemsg_storage_exceeding">⚠️邮件服务商提供的存储空间快满了，已使用 %1$s%%。\n\n如果存储空间用光，您可能无法接收消息。\n\n👉请检查是否可以在提供商的网页界面上删除旧数据，或考虑启用“设置/删除旧消息”。您可以在“设置/连接状态”中查看当前的存储使用情况。</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️设备的日期或时间似乎不准确 （%1$s）。\n\n请调整时钟⏰🔧以确保能正确接收信息。</string>
     <string name="devicemsg_update_reminder">⚠️您的 Delta Chat 版本可能过时了。\n\n这可能会在您的聊天伙伴使用更新的版本时造成问题。并且您缺失了最新功能😳\n请浏览 https://get.delta.chat 或应用商店来获取更新。</string>
@@ -767,7 +767,7 @@
     <string name="qrshow_join_group_hint">扫描此处来加入群组\"%1$s\"。</string>
     <string name="qrshow_join_contact_title">邀请二维码</string>
     <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and address eg. "Scan to chat with Alice (alice@example.org)" -->
-    <string name="qrshow_join_contact_hint">扫描此处来建立联系人 %1$s。</string>
+    <string name="qrshow_join_contact_hint">扫描此处来与 %1$s 聊天。</string>
     <string name="qrshow_join_contact_no_connection_toast">没有互联网连接，无法进行二维码设置。</string>
     <string name="qraccount_ask_create_and_login">在“%1$s”创建新的电子邮件地址并在那登录？</string>
     <string name="qraccount_ask_create_and_login_another">在“%1$s”创建新的电子邮件地址并在那登录？\n\n已存在账户不会被删除。使用“切换账户”来在账户之间切换。</string>
@@ -934,8 +934,8 @@
 
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="pref_background_notifications">后台通知</string>
-    <string name="pref_background_notifications_explain">使用与服务器的后台连接。需要忽略电池优化。</string>
-    <string name="pref_background_notifications_rationale">要保持与您的电子邮件服务器的连接并在后台接收消息，请在下一步中忽略电池优化。\n\nDelta Chat 仅使用少量的资源并且会注意不去耗尽电池电量。</string>
+    <string name="pref_background_notifications_explain">使用到服务器的后台连接。需要忽略电池优化。</string>
+    <string name="pref_background_notifications_rationale">要保持到电子邮件服务器的连接并在后台接收消息，请在下一步中忽略电池优化。\n\nDelta Chat 仅使用少量的资源并且会注意不去耗尽电池电量。</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="pref_reliable_service">可靠后台连接</string>
     <string name="pref_reliable_service_explain">需要一个永久通知</string>

From aa34a7458ffcd1a9f6f376fbda219bbd97f1544e Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 11 Sep 2022 20:38:59 +0200
Subject: [PATCH 2/4] update deltachat-core-rust submodule to 'Remove
 StockMessage.action_by_contact() (#3518)'

---
 jni/deltachat-core-rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 949370ad6..5b518e588 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 949370ad63ceee89c0d8677aff9eeb17d5a5811d
+Subproject commit 5b518e588fd515fa68b8dc0927c7e581323260cc

From 13c32b655266ce4c506509b37f81d9d6368be565 Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Sun, 11 Sep 2022 21:03:54 +0200
Subject: [PATCH 3/4] rework system messages (#2380)

* do not set deprecated stock-translations

* mark now unused stock translations as deprecated

* add new system messages to english strings.xml

* add translator comments to new strings

* set new system messages
---
 res/values/strings.xml                        | 91 ++++++++++++++++++-
 .../securesms/connect/DcHelper.java           | 59 ++++++++----
 2 files changed, 126 insertions(+), 24 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c18f12082..9f9694c90 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -712,39 +712,122 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Group name changed from \"%1$s\" to \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Group image changed.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Group image deleted.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Member %1$s added.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Member %1$s removed.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Group left.</string>
     <string name="systemmsg_read_receipt_subject">Message opened</string>
     <string name="systemmsg_read_receipt_body">The \"%1$s\" message you sent was displayed on the screen of the recipient.\n\nThis is no guarantee the content was read.</string>
     <string name="systemmsg_cannot_decrypt">This message cannot be decrypted.\n\n• It might already help to simply reply to this message and ask the sender to send the message again.\n\n• In case you re-installed Delta Chat or another e-mail program on this or another device you may want to send an Autocrypt Setup Message from there.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s by me.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s by %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Unknown sender for this chat. See \'info\' for more details.</string>
     <string name="systemmsg_subject_for_new_contact">Message from %1$s</string>
     <string name="systemmsg_failed_sending_to">Failed to send message to %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Disappearing messages timer disabled.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Disappearing messages timer set to %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Disappearing messages timer set to 1 minute.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Disappearing messages timer set to 1 hour.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Disappearing messages timer set to 1 day.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Disappearing messages timer set to 1 week.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Disappearing messages timer set to 4 weeks.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Disappearing messages timer set to %1$s minutes.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Disappearing messages timer set to %1$s hours.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Disappearing messages timer set to %1$s days.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Disappearing messages timer set to %1$s weeks.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Chat protection disabled.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Chat protection enabled.</string>
 
+    <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name -->
+    <string name="group_name_changed_by_you">You changed the group name from \"%1$s\" to \"%2$s\".</string>
+    <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name, %3$s will be replaced by name and address of the contact who did the action. -->
+    <string name="group_name_changed_by_other">Group name changed from \"%1$s\" to \"%2$s\" by %3$s.</string>
+    <string name="group_image_changed_by_you">You changed the group image.</string>
+    <!-- %1$s will be replaced by name and address of the contact who did the action -->
+    <string name="group_image_changed_by_other">Group image changed by %1$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact added to the group -->
+    <string name="add_member_by_you">You added member %1$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact added to the group, %2$s will be replaced by name and address of the contact who did the action -->
+    <string name="add_member_by_other">Member %1$s added by %2$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact removed from the group -->
+    <string name="remove_member_by_you">You removed member %1$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
+    <string name="remove_member_by_other">Member %1$s removed by %2$s.</string>
+    <string name="group_left_by_you">You left the group.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="group_left_by_other">Group left by %1$s.</string>
+    <string name="group_image_deleted_by_you">You deleted the group image.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="group_image_deleted_by_other">Group image deleted by %1$s.</string>
+    <string name="location_enabled_by_you">You enabled location streaming.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="location_enabled_by_other">Location streaming enabled by %1$s.</string>
+    <string name="ephemeral_timer_disabled_by_you">You disabled disappearing messages timer.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_disabled_by_other">Disappearing messages timer disabled by %1$s.</string>
+    <!-- %1$s will be replaced by the number of seconds (always >1) the timer is set to -->
+    <string name="ephemeral_timer_seconds_by_you">You set disappearing messages timer to %1$s s</string>
+    <!-- %1$s will be replaced by the number of seconds (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_seconds_by_other">Disappearing messages timer set to %1$s s by %2$s.</string>
+    <string name="ephemeral_timer_1_minute_by_you">You set disappearing messages timer to 1 minute.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_minute_by_other">Disappearing messages timer set to 1 minute by %1$s.</string>
+    <string name="ephemeral_timer_1_hour_by_you">You set disappearing messages timer to 1 hour.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_hour_by_other">Disappearing messages timer set to 1 hour by %1$s.</string>
+    <string name="ephemeral_timer_1_day_by_you">You set disappearing messages timer to 1 day.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_day_by_other">Disappearing messages timer set to 1 day by %1$s.</string>
+    <string name="ephemeral_timer_1_week_by_you">You set disappearing messages timer to 1 week.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_week_by_other">Disappearing messages timer set to 1 week by %1$s.</string>
+    <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to -->
+    <string name="ephemeral_timer_minutes_by_you">You set disappearing messages timer to %1$s minutes.</string>
+    <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_minutes_by_other">Disappearing messages timer set to %1$s minutes by %2$s.</string>
+    <!-- %1$s will be replaced by the number of hours (always >1) the timer is set to -->
+    <string name="ephemeral_timer_hours_by_you">You set disappearing messages timer to %1$s hours.</string>
+    <!-- %1$s will be replaced by the number of hours (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_hours_by_other">Disappearing messages timer set to %1$s hours by %2$s.</string>
+    <!-- %1$s will be replaced by the number of days (always >1) the timer is set to -->
+    <string name="ephemeral_timer_days_by_you">You set disappearing messages timer to %1$s days.</string>
+    <!-- %1$s will be replaced by the number of days (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_days_by_other">Disappearing messages timer set to %1$s days by %2$s.</string>
+    <!-- %1$s will be replaced by the number of weeks (always >1) the timer is set to -->
+    <string name="ephemeral_timer_weeks_by_you">You set disappearing messages timer to %1$s weeks.</string>
+    <!-- %1$s will be replaced by the number of weeks (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_weeks_by_other">Disappearing messages timer set to %1$s weeks by %2$s.</string>
+    <string name="protection_enabled_by_you">You enabled chat protection.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="protection_enabled_by_other">Chat protection enabled by %1$s.</string>
+    <string name="protection_disabled_by_you">You disabled chat protection.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="protection_disabled_by_other">Chat protection disabled by %1$s.</string>
+
     <string name="devicemsg_self_deleted">You deleted the \"Saved messages\" chat.\n\nℹ️ To use the \"Saved messages\" feature again, create a new chat with yourself.</string>
     <!-- %1$s will be replaced by the amount of storage already used, sth. as '500 MB'. If you want to use a percentage sign, type in two of them, eg. %1$s %% -->
     <string name="devicemsg_storage_exceeding">⚠️ Your provider\'s storage is about to run out: %1$s%% are already used.\n\nYou may not be able to receive messages if storage is full.\n\n👉 Please check if you can delete old data in the provider\'s web interface and consider enabling \"Settings / Delete Old Messages\". You can check your current storage usage anytime at \"Settings / Connectivity\".</string>
diff --git a/src/org/thoughtcrime/securesms/connect/DcHelper.java b/src/org/thoughtcrime/securesms/connect/DcHelper.java
index e1e15cdc4..d124d91ff 100644
--- a/src/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -138,17 +138,11 @@ public class DcHelper {
     dcContext.setStockTranslation(11, context.getString(R.string.audio));
     dcContext.setStockTranslation(12, context.getString(R.string.file));
     dcContext.setStockTranslation(13, context.getString(R.string.pref_default_status_text));
-    dcContext.setStockTranslation(15, context.getString(R.string.systemmsg_group_name_changed));
-    dcContext.setStockTranslation(16, context.getString(R.string.systemmsg_group_image_changed));
-    dcContext.setStockTranslation(17, context.getString(R.string.systemmsg_member_added));
-    dcContext.setStockTranslation(18, context.getString(R.string.systemmsg_member_removed));
-    dcContext.setStockTranslation(19, context.getString(R.string.systemmsg_group_left));
     dcContext.setStockTranslation(23, context.getString(R.string.gif));
     dcContext.setStockTranslation(24, context.getString(R.string.encrypted_message));
     dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt));
     dcContext.setStockTranslation(31, context.getString(R.string.systemmsg_read_receipt_subject));
     dcContext.setStockTranslation(32, context.getString(R.string.systemmsg_read_receipt_body));
-    dcContext.setStockTranslation(33, context.getString(R.string.systemmsg_group_image_deleted));
     dcContext.setStockTranslation(35, context.getString(R.string.contact_verified));
     dcContext.setStockTranslation(36, context.getString(R.string.contact_not_verified));
     dcContext.setStockTranslation(37, context.getString(R.string.contact_setup_changed));
@@ -156,8 +150,6 @@ public class DcHelper {
     dcContext.setStockTranslation(42, context.getString(R.string.autocrypt_asm_subject));
     dcContext.setStockTranslation(43, context.getString(R.string.autocrypt_asm_general_body));
     dcContext.setStockTranslation(60, context.getString(R.string.login_error_cannot_login));
-    dcContext.setStockTranslation(62, context.getString(R.string.systemmsg_action_by_user));
-    dcContext.setStockTranslation(63, context.getString(R.string.systemmsg_action_by_me));
     dcContext.setStockTranslation(66, context.getString(R.string.location));
     dcContext.setStockTranslation(67, context.getString(R.string.sticker));
     dcContext.setStockTranslation(68, context.getString(R.string.device_talk));
@@ -167,25 +159,13 @@ public class DcHelper {
     dcContext.setStockTranslation(72, context.getString(R.string.systemmsg_unknown_sender_for_chat));
     dcContext.setStockTranslation(73, context.getString(R.string.systemmsg_subject_for_new_contact));
     dcContext.setStockTranslation(74, context.getString(R.string.systemmsg_failed_sending_to));
-    dcContext.setStockTranslation(75, context.getString(R.string.systemmsg_ephemeral_timer_disabled));
-    dcContext.setStockTranslation(76, context.getString(R.string.systemmsg_ephemeral_timer_enabled));
-    dcContext.setStockTranslation(77, context.getString(R.string.systemmsg_ephemeral_timer_minute));
-    dcContext.setStockTranslation(78, context.getString(R.string.systemmsg_ephemeral_timer_hour));
-    dcContext.setStockTranslation(79, context.getString(R.string.systemmsg_ephemeral_timer_day));
-    dcContext.setStockTranslation(80, context.getString(R.string.systemmsg_ephemeral_timer_week));
     dcContext.setStockTranslation(82, context.getString(R.string.videochat_invitation));
     dcContext.setStockTranslation(83, context.getString(R.string.videochat_invitation_body));
     dcContext.setStockTranslation(84, context.getString(R.string.configuration_failed_with_error));
     dcContext.setStockTranslation(85, context.getString(R.string.devicemsg_bad_time));
     dcContext.setStockTranslation(86, context.getString(R.string.devicemsg_update_reminder));
-    dcContext.setStockTranslation(88, context.getString(R.string.systemmsg_chat_protection_enabled));
-    dcContext.setStockTranslation(89, context.getString(R.string.systemmsg_chat_protection_disabled));
     dcContext.setStockTranslation(90, context.getString(R.string.reply_noun));
     dcContext.setStockTranslation(91, context.getString(R.string.devicemsg_self_deleted));
-    dcContext.setStockTranslation(93, context.getString(R.string.systemmsg_ephemeral_timer_minutes));
-    dcContext.setStockTranslation(94, context.getString(R.string.systemmsg_ephemeral_timer_hours));
-    dcContext.setStockTranslation(95, context.getString(R.string.systemmsg_ephemeral_timer_days));
-    dcContext.setStockTranslation(96, context.getString(R.string.systemmsg_ephemeral_timer_weeks));
     dcContext.setStockTranslation(97, context.getString(R.string.forwarded));
     dcContext.setStockTranslation(98, context.getString(R.string.devicemsg_storage_exceeding));
     dcContext.setStockTranslation(99, context.getString(R.string.n_bytes_message));
@@ -207,6 +187,45 @@ public class DcHelper {
     dcContext.setStockTranslation(118, context.getString(R.string.secure_join_replies));
     dcContext.setStockTranslation(119, context.getString(R.string.qrshow_join_contact_hint));
 
+    dcContext.setStockTranslation(124, context.getString(R.string.group_name_changed_by_you));
+    dcContext.setStockTranslation(125, context.getString(R.string.group_name_changed_by_other));
+    dcContext.setStockTranslation(126, context.getString(R.string.group_image_changed_by_you));
+    dcContext.setStockTranslation(127, context.getString(R.string.group_image_changed_by_other));
+    dcContext.setStockTranslation(128, context.getString(R.string.add_member_by_you));
+    dcContext.setStockTranslation(129, context.getString(R.string.add_member_by_other));
+    dcContext.setStockTranslation(130, context.getString(R.string.remove_member_by_you));
+    dcContext.setStockTranslation(131, context.getString(R.string.remove_member_by_other));
+    dcContext.setStockTranslation(132, context.getString(R.string.group_left_by_you));
+    dcContext.setStockTranslation(133, context.getString(R.string.group_left_by_other));
+    dcContext.setStockTranslation(134, context.getString(R.string.group_image_deleted_by_you));
+    dcContext.setStockTranslation(135, context.getString(R.string.group_image_deleted_by_other));
+    dcContext.setStockTranslation(136, context.getString(R.string.location_enabled_by_you));
+    dcContext.setStockTranslation(137, context.getString(R.string.location_enabled_by_other));
+    dcContext.setStockTranslation(138, context.getString(R.string.ephemeral_timer_disabled_by_you));
+    dcContext.setStockTranslation(139, context.getString(R.string.ephemeral_timer_disabled_by_other));
+    dcContext.setStockTranslation(140, context.getString(R.string.ephemeral_timer_seconds_by_you));
+    dcContext.setStockTranslation(141, context.getString(R.string.ephemeral_timer_seconds_by_other));
+    dcContext.setStockTranslation(142, context.getString(R.string.ephemeral_timer_1_minute_by_you));
+    dcContext.setStockTranslation(143, context.getString(R.string.ephemeral_timer_1_minute_by_other));
+    dcContext.setStockTranslation(144, context.getString(R.string.ephemeral_timer_1_hour_by_you));
+    dcContext.setStockTranslation(145, context.getString(R.string.ephemeral_timer_1_hour_by_other));
+    dcContext.setStockTranslation(146, context.getString(R.string.ephemeral_timer_1_day_by_you));
+    dcContext.setStockTranslation(147, context.getString(R.string.ephemeral_timer_1_day_by_other));
+    dcContext.setStockTranslation(148, context.getString(R.string.ephemeral_timer_1_week_by_you));
+    dcContext.setStockTranslation(149, context.getString(R.string.ephemeral_timer_1_week_by_other));
+    dcContext.setStockTranslation(150, context.getString(R.string.ephemeral_timer_minutes_by_you));
+    dcContext.setStockTranslation(151, context.getString(R.string.ephemeral_timer_minutes_by_other));
+    dcContext.setStockTranslation(152, context.getString(R.string.ephemeral_timer_hours_by_you));
+    dcContext.setStockTranslation(153, context.getString(R.string.ephemeral_timer_hours_by_other));
+    dcContext.setStockTranslation(154, context.getString(R.string.ephemeral_timer_days_by_you));
+    dcContext.setStockTranslation(155, context.getString(R.string.ephemeral_timer_days_by_other));
+    dcContext.setStockTranslation(156, context.getString(R.string.ephemeral_timer_weeks_by_you));
+    dcContext.setStockTranslation(157, context.getString(R.string.ephemeral_timer_weeks_by_other));
+    dcContext.setStockTranslation(158, context.getString(R.string.protection_enabled_by_you));
+    dcContext.setStockTranslation(159, context.getString(R.string.protection_enabled_by_other));
+    dcContext.setStockTranslation(160, context.getString(R.string.protection_disabled_by_you));
+    dcContext.setStockTranslation(161, context.getString(R.string.protection_disabled_by_other));
+
     // HACK: svg does not handle entities correctly and shows `&quot;` as the text `quot;`.
     // until that is fixed, we fix the most obvious errors (core uses encode_minimal, so this does not affect so many characters)
     // cmp. https://github.com/deltachat/deltachat-android/issues/2187

From 197efb0b6c4349124fd3209f8fdcae3be2570cba Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 11 Sep 2022 21:33:36 +0200
Subject: [PATCH 4/4] update translations

---
 res/values-az/strings.xml     | 10 +++-
 res/values-bg/strings.xml     | 25 ++++++++--
 res/values-ca/strings.xml     | 11 +++--
 res/values-ckb/strings.xml    | 24 +++++++--
 res/values-cs/strings.xml     | 25 ++++++++--
 res/values-da/strings.xml     | 25 ++++++++--
 res/values-de/strings.xml     | 93 +++++++++++++++++++++++++++++++++--
 res/values-es/strings.xml     | 26 ++++++++--
 res/values-eu/strings.xml     | 10 +++-
 res/values-fa/strings.xml     | 26 ++++++++--
 res/values-fi/strings.xml     | 26 ++++++++--
 res/values-fr/strings.xml     | 26 ++++++++--
 res/values-gl/strings.xml     | 26 ++++++++--
 res/values-hr/strings.xml     |  4 +-
 res/values-hu/strings.xml     |  5 ++
 res/values-in/strings.xml     |  9 +++-
 res/values-it/strings.xml     | 26 ++++++++--
 res/values-ja/strings.xml     | 25 ++++++++--
 res/values-km/strings.xml     | 25 ++++++++--
 res/values-ko/strings.xml     | 16 +++++-
 res/values-lt/strings.xml     | 21 +++++++-
 res/values-nb/strings.xml     | 10 +++-
 res/values-nl/strings.xml     | 26 ++++++++--
 res/values-pl/strings.xml     | 26 ++++++++--
 res/values-pt-rBR/strings.xml | 26 ++++++++--
 res/values-pt/strings.xml     | 10 +++-
 res/values-ru/strings.xml     | 26 ++++++++--
 res/values-sk/strings.xml     | 26 ++++++++--
 res/values-sq/strings.xml     | 26 ++++++++--
 res/values-sr/strings.xml     | 10 +++-
 res/values-sv/strings.xml     | 17 ++++++-
 res/values-ta/strings.xml     |  5 ++
 res/values-te/strings.xml     |  4 +-
 res/values-tr/strings.xml     | 26 ++++++++--
 res/values-uk/strings.xml     | 26 ++++++++--
 res/values-zh-rCN/strings.xml | 26 ++++++++--
 res/values-zh-rTW/strings.xml | 10 +++-
 37 files changed, 655 insertions(+), 129 deletions(-)

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 790bc0447..1ed2a7dce 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -391,17 +391,23 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Qrupun adı \"%1$s\" - dən \"%2$s\" - yə deyişildi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Qrup şəkili dəyişildi. </string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Qrupun şəkili silindi. </string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Üzv %1$s əlavə olundu. </string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$s üzv silindi. </string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Qrup buraxdı.</string>
     <string name="systemmsg_read_receipt_subject">Qəbul olunanları oxuyun</string>
     <string name="systemmsg_cannot_decrypt">Bu mesaj şifresi çözülə bilməz. \n\n • Bu mesaja yalnız cavab vermək və göndərənin mesajı yenidən göndərməsini xahiş edə bilər. \n\n • Bu barədə Delta Chat və ya başqa bir e-poçt proqramını yenidən quraşdırdığınız halda oradan Autocrypt Kurulum Mesajı göndərmək istədiyiniz başqa bir qurğudan istifadə edə bilərsiniz.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s məndən. </string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s ilə %2$s.</string>
     <string name="qrscan_title">Qr kodu skan edin</string>
     <string name="qrscan_hint">QR kodu kamera ilə izləyin</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7812e96e3..a2da02979 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -669,37 +669,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Името на групата е променено от \"%1$s\" на \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Изображението на групата е променено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Изображението на глупата е изтрито.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Добавен е членът %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Членът %1$s е премахнат</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Напуснахте групата.</string>
     <string name="systemmsg_read_receipt_subject">Съобщението е отворено</string>
     <string name="systemmsg_read_receipt_body">Съобщението \"%1$s\", което изпратихте, беше показано на екрана на получателя.\n\nТова не е гаранция, че съдържанието му е прочетено.</string>
     <string name="systemmsg_cannot_decrypt">Това съобщение не може да бъде декриптирано.\n\n• Вероятно вече имате средство за помощ - може просто да отговорите на това съобщение и да поискате от подателя да го изпрати отново.\n\n• В случай, че сте преинсталирали Delta Chat или друга програма за електронна поща на това или друго устройство, бихте могли да изпратите съобщение за настройка на Autocrypt от там.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s от мен</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s от %2$s</string>
     <string name="systemmsg_unknown_sender_for_chat">Неизвестен подател за този чат. Вижте \"информация\" за повече подробности.</string>
     <string name="systemmsg_subject_for_new_contact">Съобщение от %1$s</string>
     <string name="systemmsg_failed_sending_to">Неуспешно изпращане на съобщение до %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Таймерът на изчезващите съобщения е деактивиран.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Таймерът на изчезващите съобщение е установен на %1$sсек.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Таймерът на изчезващите съобщения е установен на 1 минута.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Таймерът на изчезващите съобщения е установен на 1 час.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Таймерът на изчезващите съобщения е установен на 1 ден.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Таймерът на изчезващите съобщения е установен на 1 седмица.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Таймерът на изчезващите съобщения е установен на 4 седмици.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Таймерът на изчезващите съобщения е установен на %1$s минути.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Таймерът на изчезващите съобщения е установен на %1$s часа.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Таймерът на изчезващите съобщения е установен на %1$s дни.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Таймерът на изчезващите съобщения е установен на %1$s седмици.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Защитата на чата е изключена.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Защитата на чата е включена.</string>
 
     <string name="devicemsg_self_deleted">Изтрихте чата \"Записани съобщения\".\n\nℹ️ За да използвате възможността \"Записани съобщения\" отново, създайте нов чат със себе си.</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1685c707b..341dfa849 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -264,7 +264,6 @@
     <string name="ConversationFragment_quoted_message_not_found">No s\'ha trobat el missatge original</string>
     <string name="reply_privately">Respon en privat</string>
     <string name="source_code">Codi Font</string>
-
     <string name="mute_for_one_hour">Silencia 1 hora</string>
     <string name="mute_for_two_hours">Silencia 2 hores</string>
     <string name="mute_for_one_day">Silencia 1 dia</string>
@@ -584,18 +583,24 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nom del grup \"%1$s\" canviat a \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Imatge de grup canviada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Imatge de grup eliminada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Membre %1$s afegit.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Membre %1$s eliminat.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Deixa el grup.</string>
     <string name="systemmsg_read_receipt_subject">Confirmació de lectura</string>
     <string name="systemmsg_read_receipt_body">Confirmació de lectura del missatge \"%1$s\".\n\nVol dir que el missatge s\'ha mostrat al dispositiu del receptor, no necessàriament que s\'hagi llegit.</string>
     <string name="systemmsg_cannot_decrypt">Aquest missatge no es pot desxifrar.\n\n• Proveu de respondre\'l i demanar-li al remitent que us el torni a enviar.\n\n• Si heu reinstal·lat Delta Chat o un altre gestor de correu en aquest dispositiu o en algun altre, proveu d\'enviar un missatge de configuració Autocrypt des d\'allà.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s per mi.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s per %2$s.</string>
     <string name="qrscan_title">Escaneja codi QR</string>
     <string name="qrscan_hint">Poseu la càmera davant del codi QR</string>
diff --git a/res/values-ckb/strings.xml b/res/values-ckb/strings.xml
index e0ca6bf64..ff36d9207 100644
--- a/res/values-ckb/strings.xml
+++ b/res/values-ckb/strings.xml
@@ -502,34 +502,50 @@
     <string name="autocrypt_continue_transfer_title">پەیامی ڕێکخستنی ئۆتۆکریپت</string>
     <string name="autocrypt_continue_transfer_retry">دیسان هەوڵدانەوە</string>
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">ناوی کۆڕ لە \"%1$s\" گۆڕا بۆ \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">وێنەی کۆڕ گۆڕا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">وێنەی کۆڕ سڕاوە.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s زیاد کرا بە کۆڕ.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">ئەندامی %1$s سڕدرایەوە.</string>
     <string name="systemmsg_read_receipt_subject">پەیامەکە کرایەوە</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s لەلایەن منەوە.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s لەلایەن %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">پەیامنێری ئەم وتووێژە نەناسراوە. بۆ وردەکاری زۆرتر سەیری \'زانیارییەکان\' بکە.</string>
     <string name="systemmsg_subject_for_new_contact">پەیام لەلایەن %1$s</string>
     <string name="systemmsg_failed_sending_to">هەناردنی پەیام بۆ %1$s سەرنەکەوت</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">دەمژمێری پەیامە خۆشارەوەکان ناچالاک کرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">دەمژمێری پەیام خۆشارەوەکان لەسەر %1$s چرکە ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">دەمژمێری پەیام خۆشارەوەکان لەسەر 1  خولەک ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">دەمژمێری پەیام خۆشارەوەکان لەسەر 1 سەعات ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">دەمژمێری پەیام خۆشارەوەکان لەسەر 1 ڕۆژ ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">دەمژمێری پەیام خۆشارەوەکان لەسەر 1 حەوتە ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">دەمژمێری پەیام خۆشارەوەکان لەسەر 4 ڕۆژ ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">دەمژمێری پەیام خۆشارەوەکان لەسەر%1$s خولەک ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">دەمژمێری پەیام خۆشارەوەکان لەسەر %1$s سەعات ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">دەمژمێری پەیام خۆشارەوەکان لەسەر %1$s ڕۆژ ڕێکخرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">دەمژمێری پەیام خۆشارەوەکان لەسەر %1$s حەوتە ڕێکخرا.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">پاراستنی وتووێژ ناچالاک کرا.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">پاراستنی وتووێژ چالاک کرا.</string>
 
     <!-- qr code stuff -->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9aa7b152c..71ad5e248 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -577,37 +577,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Názen skupiny změněn z \"%1$s\" na \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Obrázek skupiny změněn.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Obrázek skupiny smazán.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Člen %1$s byl přidán.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Člen %1$s byl odebrán.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Skupina opuštěna.</string>
     <string name="systemmsg_read_receipt_subject">Zpráva otevřena</string>
     <string name="systemmsg_read_receipt_body">Odeslaná zpráva \"%1$s\" byla příjemci zobrazena na jeho přístroji.\n\nNicméně přečtení obsahu není zaručeno.</string>
     <string name="systemmsg_cannot_decrypt">Zprávu nelze dešifrovat.\n\n• Může pomoct jednoduchá odpověď odesílateli s požadavkem o znovuzaslání zprávy.\n\n• Pokud jde o novou instalaci Delta Chatu či jiného e-mailového programu na tomto nebo jiném zařízení, může být nutné poslat si z nich Nastavení Autocryptu.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s ode mě.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s od %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Neznámý odesilatel v tomto hovoru. Více najdeš v Popisu.</string>
     <string name="systemmsg_subject_for_new_contact">Zpráva od %1$s</string>
     <string name="systemmsg_failed_sending_to">Odeslání zprávy pro %1$s selhalo.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Časovač samomazacích zpráv je vypnut.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Časovač samomazacích zpráv je na %1$s s. </string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Časovač samomazacích zpráv na 1 minutu.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Časovač samomazacích zpráv na 1 hodinu.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Časovač samomazacích zpráv na 1 den.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Časovač samomazacích zpráv na 1 týden.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Časovač samomazacích zpráv na 4 týdny.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Samomazací zprávy vyprší po %1$s minutách.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Samomazací zprávy vyprší po %1$s hodinách.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Samomazací zprávy vyprší po %1$s dnech.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Samomazací zprávy vyprší po %1$s týdnech.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Ochrana rozhovoru vypnuta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Ochrana rozhovoru zapnuta.</string>
 
     <!-- qr code stuff -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4f0103616..8d6815af0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -596,37 +596,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Gruppenavn ændret fra \"%1$s\" til \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Gruppebillede ændret.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Gruppebillede slettet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Medlem %1$s tilføjet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Medlem %1$s fjernet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Gruppe forladt.</string>
     <string name="systemmsg_read_receipt_subject">Besked åbnet</string>
     <string name="systemmsg_read_receipt_body">Beskeden \"%1$s\" du har sendt blev vist på modtagerens skærm.\n\nDette er ikke en garanti for at indholdet blev læst.</string>
     <string name="systemmsg_cannot_decrypt">Denne besked kan ikke dekrypteres.\n\n• Det kan måske hjælpe at svare på beskeden og bede afsender sende beskeden igen.\n\n• I tilfælde at Delta Chat eller andet e-mail program på denne enhed eller en anden er blevet gen-installeret bør der sendes en Autocrypt opsætning besked derfra.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s af mig.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s af %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Ukent afsender af denne chat. Se \'info\' for flere detaljer.</string>
     <string name="systemmsg_subject_for_new_contact">Besked fra %1$s</string>
     <string name="systemmsg_failed_sending_to">Mislykket forsøg på afsendelse af besked til %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Tidsudløb for beskeder er deaktiveret.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Tidsudløb for beskeder sat til %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Tidsudløb for beskeder sat til 1 minut.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Tidsudløb for beskeder sat til 1 time.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Tidsudløb for beskeder sat til 1 dag.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Tidsudløb for beskeder sat til 1 uge.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Tidsudløb for beskeder sat til 4 uger.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Beskeder sat til at udløbe efter %1$s minutter.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Beskeder sat til at udløbe efter %1$s timer.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Beskeder sat til at udløbe efter %1$s dage.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Beskeder sat til at udløbe efter %1$s uger.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Chat-beskyttelse slået fra.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Chat-beskyttelse sluttet til.</string>
 
     <!-- qr code stuff -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5d6164c6c..5bebe69e8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -264,6 +264,8 @@
     <string name="ConversationFragment_quoted_message_not_found">Originalnachricht nicht gefunden</string>
     <string name="reply_privately">Privat antworten</string>
     <string name="source_code">Quelltext</string>
+    <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
+    <string name="add_to_home_screen">Zum Startbildschirm hinzufügen</string>
 
     <string name="mute_for_one_hour">Stumm für 1 Stunde</string>
     <string name="mute_for_two_hours">Stumm für 2 Stunden</string>
@@ -710,39 +712,122 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Gruppenname von \"%1$s\" zu \"%2$s\" geändert.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Gruppenbild geändert.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Gruppenbild gelöscht.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s hinzugefügt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$s entfernt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Gruppe verlassen.</string>
     <string name="systemmsg_read_receipt_subject">Empfangsbestätigung</string>
     <string name="systemmsg_read_receipt_body">Ihre Nachricht \"%1$s\" wurde auf dem Empfangsgerät angezeigt.\n\nDas ist keine Garantie dafür, dass sie auch gelesen wurde.</string>
     <string name="systemmsg_cannot_decrypt">Diese Nachricht kann nicht entschlüsselt werden.\n\n• Es könnte bereits helfen, einfach auf diese Nachricht zu antworten und die/den AbsenderIn zu bitten, die Nachricht erneut zu senden.\n\n• Falls Delta Chat oder ein anderes E-Mail-Programm auf diesem oder einem anderen Gerät neu installiert wurde, kann von dort aus eine Autocrypt Setup-Nachricht gesendet werden.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s von mir.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s von %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Absender ist für diesen Chat unbekannt. Siehe \"Info\" für weitere Details,</string>
     <string name="systemmsg_subject_for_new_contact">Nachricht von %1$s</string>
     <string name="systemmsg_failed_sending_to">Nachricht senden an %1$s fehlgeschlagen.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Verschwindende Nachrichten ausgeschaltet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Ablaufzeit verschwindender Nachrichten auf %1$s s festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Ablaufzeit verschwindender Nachrichten auf 1 Minute festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Ablaufzeit verschwindender Nachrichten auf 1 Stunde festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Ablaufzeit verschwindender Nachrichten auf 1 Tag festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Ablaufzeit verschwindender Nachrichten auf 1 Woche festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Ablaufzeit verschwindender Nachrichten auf 4 Wochen festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Ablaufzeit verschwindender Nachrichten auf %1$s Minuten festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Ablaufzeit verschwindender Nachrichten auf %1$s Stunden festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Ablaufzeit verschwindender Nachrichten auf %1$s Tage festgelegt.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Ablaufzeit verschwindender Nachrichten auf %1$s Wochen festgelegt.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Chat-Absicherung ausgeschaltet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Chat-Absicherung eingeschaltet.</string>
 
+    <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name -->
+    <string name="group_name_changed_by_you">Sie haben den Gruppennamen von \"%1$s\" zu \"%2$s\" geändert.</string>
+    <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name, %3$s will be replaced by name and address of the contact who did the action. -->
+    <string name="group_name_changed_by_other">Gruppenname geändert von \"%1$s\" zu \"%2$s\" von %3$s.</string>
+    <string name="group_image_changed_by_you">Sie haben das Gruppenbild geändert.</string>
+    <!-- %1$s will be replaced by name and address of the contact who did the action -->
+    <string name="group_image_changed_by_other">Gruppenbild geändert von %1$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact added to the group -->
+    <string name="add_member_by_you">Sie haben %1$s hinzugefügt.</string>
+    <!-- %1$s will be replaced by name and address of the contact added to the group, %2$s will be replaced by name and address of the contact who did the action -->
+    <string name="add_member_by_other">%1$s hinzugefügt von %2$s.</string>
+    <!-- %1$s will be replaced by name and address of the contact removed from the group -->
+    <string name="remove_member_by_you">Sie haben %1$s entfernt.</string>
+    <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
+    <string name="remove_member_by_other">%1$s entfernt von %2$s.</string>
+    <string name="group_left_by_you">Sie haben die Gruppe verlassen.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="group_left_by_other">Gruppe verlassen von %1$s.</string>
+    <string name="group_image_deleted_by_you">Sie haben das Gruppenbild gelöscht.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="group_image_deleted_by_other">Gruppenbild gelöscht von %1$s.</string>
+    <string name="location_enabled_by_you">Sie haben Standortübertragung aktiviert.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="location_enabled_by_other">Standortübertragung aktiviert von %1$s.</string>
+    <string name="ephemeral_timer_disabled_by_you">Sie haben Verschwindende Nachrichten ausgeschaltet.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_disabled_by_other">Verschwindende Nachrichten ausgeschaltet von %1$s.</string>
+    <!-- %1$s will be replaced by the number of seconds (always >1) the timer is set to -->
+    <string name="ephemeral_timer_seconds_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf %1$s s gesetzt.</string>
+    <!-- %1$s will be replaced by the number of seconds (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_seconds_by_other">Ablaufzeit verschwindender Nachrichten auf %1$s s gesetzt von %2$s.</string>
+    <string name="ephemeral_timer_1_minute_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf 1 Minute gesetzt.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_minute_by_other">Ablaufzeit verschwindender Nachrichten auf 1 MInute gesetzt von %1$s.</string>
+    <string name="ephemeral_timer_1_hour_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf 1 Stunde gesetzt.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_hour_by_other">Ablaufzeit verschwindender Nachrichten auf 1 Stunde gesetzt von %1$s.</string>
+    <string name="ephemeral_timer_1_day_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf 1 Tag gesetzt.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_day_by_other">Ablaufzeit verschwindender Nachrichten auf 1 Tag gesetzt von %1$s.</string>
+    <string name="ephemeral_timer_1_week_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf 1 Woche gesetzt.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_1_week_by_other">Ablaufzeit verschwindender Nachrichten auf 1 Woche gesetzt von %1$s.</string>
+    <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to -->
+    <string name="ephemeral_timer_minutes_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf %1$s Minuten gesetzt.</string>
+    <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_minutes_by_other">Ablaufzeit verschwindender Nachrichten auf %1$s Minuten gesetzt von %2$s.</string>
+    <!-- %1$s will be replaced by the number of hours (always >1) the timer is set to -->
+    <string name="ephemeral_timer_hours_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf %1$s Stunden gesetzt.</string>
+    <!-- %1$s will be replaced by the number of hours (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_hours_by_other">Ablaufzeit verschwindender Nachrichten auf %1$s Stunden gesetzt von %2$s.</string>
+    <!-- %1$s will be replaced by the number of days (always >1) the timer is set to -->
+    <string name="ephemeral_timer_days_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf %1$s Tage gesetzt.</string>
+    <!-- %1$s will be replaced by the number of days (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_days_by_other">Ablaufzeit verschwindender Nachrichten auf %1$s Tage gesetzt von %2$s.</string>
+    <!-- %1$s will be replaced by the number of weeks (always >1) the timer is set to -->
+    <string name="ephemeral_timer_weeks_by_you">Sie haben die Ablaufzeit verschwindender Nachrichten auf %1$s Wochen gesetzt.</string>
+    <!-- %1$s will be replaced by the number of weeks (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
+    <string name="ephemeral_timer_weeks_by_other">Ablaufzeit verschwindender Nachrichten auf %1$s Wochen gesetzt von %2$s.</string>
+    <string name="protection_enabled_by_you">Sie haben die Chat-Absicherung eingeschaltet.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="protection_enabled_by_other">Chat-Absicherung eingeschaltet von %1$s.</string>
+    <string name="protection_disabled_by_you">Sie haben die Chat-Absicherung ausgeschaltet.</string>
+    <!-- %1$s will be replaced by name and address of the contact -->
+    <string name="protection_disabled_by_other">Chat-Absicherung ausgeschaltet von %1$s</string>
+
     <string name="devicemsg_self_deleted">Sie haben den Chat \"Gespeicherte Nachrichten\" gelöscht.\n\nℹ️ Um die Funktion \"Gespeicherte Nachrichten\" erneut zu verwenden, erstellen Sie einfach einen Chat mit sich selbst.</string>
     <!-- %1$s will be replaced by the amount of storage already used, sth. as '500 MB'. If you want to use a percentage sign, type in two of them, eg. %1$s %% -->
     <string name="devicemsg_storage_exceeding">⚠️ Der Speicherplatz Ihres Anbieters ist bald erschöpft; bereits %1$s%% sind verbraucht.\n\nSie können möglicherweise keine Nachrichten mehr empfangen, wenn der Speicherplatz zu 100%% verbraucht ist.\n\n👉 Bitte prüfen Sie, ob Sie alte Daten im Webinterface des Anbieters löschen können, und erwägen Sie, \"Einstellungen / Alte Nachrichten löschen\" zu aktivieren. Den aktuellen Speicherverbrauch können Sie jederzeit unter \"Einstellungen / Verbindung\" überprüfen.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ce091b9d7..d8e21424c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -272,7 +272,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Mensaje original no encontrado</string>
     <string name="reply_privately">Responder en privado</string>
     <string name="source_code">Código fuente</string>
-
     <string name="mute_for_one_hour">Silenciar por 1 hora</string>
     <string name="mute_for_two_hours">Silenciar por 2 horas</string>
     <string name="mute_for_one_day">Silenciar por 1 día</string>
@@ -725,37 +724,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nombre de grupo cambiado de \"%1$s\" a \"%2$s\"</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Imagen de grupo cambiada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Imagen de grupo eliminada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Miembro %1$s añadido.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Miembro %1$s eliminado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Grupo abandonado.</string>
     <string name="systemmsg_read_receipt_subject">Recibo de lectura</string>
     <string name="systemmsg_read_receipt_body">El mensaje \"%1$s\" se mostró en el dispositivo del destinatario, pero no necesariamente que se leyó el contenido.</string>
     <string name="systemmsg_cannot_decrypt">Este mensaje no puede ser descifrado.\n\n• Es posible que sea útil simplemente responderlo y pedirle al remitente que lo envíe nuevamente.\n\n• En caso de que haya reinstalado Delta Chat u otro programa de correo en este u otro dispositivo, puede que quiera enviar un Mensaje de Configuración de Autocrypt desde allí.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s por mi.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s por %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Remitente desconocido. Mira \"info\" para más detalles.</string>
     <string name="systemmsg_subject_for_new_contact">Mensaje de %1$s</string>
     <string name="systemmsg_failed_sending_to">Falla en enviar el mensaje a %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Temporizador de mensajes borrados desactivado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Temporizador del borrado de mensajes dispuesto en %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Temporizador de borrado de mensaje dispuesto en 1 minuto.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Temporizador de borrado de mensaje dispuesto en 1 hora.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Temporizador de borrado de mensaje dispuesto en 1 día.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Temporizador de borrado de mensaje dispuesto en 1 semana.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Temporizador de borrado de mensaje dispuesto en 4 semanas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Temporizador de mensajes borrados dispuesto en %1$s minutos.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Temporizador de mensajes borrados dispuesto a %1$s horas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Temporizador de mensajes borrados dispuestos en %1$s días.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Temporizador de mensajes borrados dispuestos para %1$s semanas.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Protección de chat desactivada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Protección de chat activada.</string>
 
     <string name="devicemsg_self_deleted">Eliminaste los chats de los \"Mensajes guardados\". \n\nℹ️ Para volver a usar los\"Mensajes guardados\", debes crear un chat contigo mismo.</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 753383156..653a4a4ec 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -441,18 +441,24 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Taldearen izena \"%1$s\" izatetik \"%2$s\" izatera aldatu da.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Taldearen irudia aldatuta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Taldearen irudia ezabatuta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s kidea gehituta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$s kidea kenduta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Taldetik aterata.</string>
     <string name="systemmsg_read_receipt_subject">Irakurragiria</string>
     <string name="systemmsg_read_receipt_body">Hau \"%1$s\" mezuaren irakurragiri bat da.\n\nHonek mezua jasotzailearen gailuan bistaratu dela esan nahi du, ez edukia irakurri dela.</string>
     <string name="systemmsg_cannot_decrypt">Ezin da mezu hau deszifratu.\n\n• Mezuari erantzun diezaiokezu eta berriro bidaltzea eskatu.\n\n• Delta Chat berrinstalatu baduzu edo beste posta programa bat instalatu baduzu gailu honetan edo beste batean, AutoCrypt ezarpen mezua handik hona birbidaltzen saiatu zaitezke.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">Nik: %1$s</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%2$s(e)k: %1$s</string>
     <!-- qr code stuff -->
     <string name="qr_code">QR kodea</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c1c120207..7ea9f16d3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -265,7 +265,6 @@
     <string name="ConversationFragment_quoted_message_not_found">پیام اصلی یافت نشد</string>
     <string name="reply_privately">پاسخ دادن به صورت خصوصی</string>
     <string name="source_code">کد منبع</string>
-
     <string name="mute_for_one_hour">ساکت کردن به مدت۱ ساعت</string>
     <string name="mute_for_two_hours">ساکت کردن به مدت ۲ ساعت</string>
     <string name="mute_for_one_day">ساکت کردن به مدت ۱ روز</string>
@@ -723,37 +722,54 @@ https://meet.jit.si/$ROOM
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">اسم گروه از \"%1$s\" به \"%2$s\" تغییر کرد. </string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">تصویر گروه تغییر کرد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">تصویر گروه حذف شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s عضو شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">عضویت %1$sحذف شد. </string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">گروه ترک شد. </string>
     <string name="systemmsg_read_receipt_subject">پیام باز شد</string>
     <string name="systemmsg_read_receipt_body">پیام\"%1$s\" که ارسال کرده بودید در ثفحه گیرنده نمایش داده شد\n\n. تضمینی وجود ندارد که محتوای پیام را خوانده باشد. </string>
     <string name="systemmsg_cannot_decrypt">این پیام را نمی‌توان رمزگشایی کرد.\n\n• ممکن است بهتر باشد که به همین پیام پاسخ داده و از ارسال کننده بخواهید دوباره آن را بفرستد. \n\n• اگر دوباره دلتاچت را نصب کرده‌اید یا از یک ایمیل دیگر هم روی این دستگاه یا دستگاه دیگر استفاده می‌کنید ممکن است لازم باشد یک پیام تنظیمات خودرمز از آن دستگاه ارسال کنید. </string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$sتوسط من</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$sتوسط%2$s</string>
     <string name="systemmsg_unknown_sender_for_chat">فرستنده در این گفت و گو ناشناس است. برای جزئیات بیشتر به \"اطلاعات\" مراجعه کنید.</string>
     <string name="systemmsg_subject_for_new_contact">پیام از%1$s</string>
     <string name="systemmsg_failed_sending_to">ارسال ناموفق پیام به %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">زمان سنج پیام های ناپدید شونده غیرفعال شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">زمان‌سنج پیام ناپدید شونده روی %1$sثانیه تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">زمان سنج پیام های ناپدید شونده برای 1 دقیقه تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">زمان سنج پیام های ناپدید شونده برای 1 ساعت تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">زمان سنج پیام های ناپدید شونده برای 1 روز تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">زمان سنج پیام های ناپدید شونده برای 1 هفته تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">زمان سنج پیام های ناپدید شونده برای 4 هفته تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">زمان‌سنج پیام‌های ناپدید شونده روی %1$s دقیقه تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">زمان‌سنج پیام ناپدید شونده روی %1$s ساعت تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">زمان‌سنج پیام ناپدید شونده روی %1$s روز تنظیم شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">زمان‌سنج پیام ناپدید شونده روی %1$s هفته تنظیم شد.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">محافظت از گفنگو غیرفعال شد.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">محافظت از گفتگو فعال شد.</string>
 
     <string name="devicemsg_self_deleted">شما گفتگوی «پیام‌های ذخیره شده» را پاک کردید. 
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 08ad3700d..3b12e36fd 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -264,7 +264,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Alkuperäistä viestiä ei löydy</string>
     <string name="reply_privately">Vastaa yksityisesti</string>
     <string name="source_code">Lähdekoodi</string>
-
     <string name="mute_for_one_hour">Mykistä 1 tunniksi</string>
     <string name="mute_for_two_hours">Mykistä 2 tunniksi</string>
     <string name="mute_for_one_day">Mykistä 1 päiväksi</string>
@@ -710,37 +709,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Ryhmän nimi vaihdettu: \"%1$s\" --> \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Ryhmän kuva vaihdettu.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Ryhmän kuva poistettu</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Jäsen %1$s lisätty</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Jäsen %1$s poistettu</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Poistuttiin ryhmästä.</string>
     <string name="systemmsg_read_receipt_subject">Viesti avattu</string>
     <string name="systemmsg_read_receipt_body">Lähettämäsi viesti \"%1$s\" näytettiin vastaanottajan näytöllä.\n\nTämä ei takaa, että sisältö luettiin.</string>
     <string name="systemmsg_cannot_decrypt">Viestin salausta ei voi purkaa.\n\n• Pyydä lähettäjää lähettämään viesti uudelleen.\n\n• Jos asensit Delta Chatin tai toisen sähköpostisovelluksen uudelleen tälle tai toiselle laitteelle, Autocrypt-asetusviestin lähettäminen siitä sovelluksesta voi auttaa.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s minun toimestani.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s käyttäjän %2$s toimesta.</string>
     <string name="systemmsg_unknown_sender_for_chat">Tuntematon lähettäjä. Katso \"lisätietoja\".</string>
     <string name="systemmsg_subject_for_new_contact">Viesti lähettäjältä %1$s</string>
     <string name="systemmsg_failed_sending_to">Viestin lähettäminen kohteeseen %1$s epäonnistui.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Katoavien viestien ajastin poistettiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Katoavien viestien ajastin asetettu %1$s sekuntiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Katoavien viestien ajastin asetettu 1 minuuttiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Katoavien viestien ajastin asetettu 1 tuntiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Katoavien viestien ajastin asetettu 1 päivään.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Katoavien viestien ajastin asetettu 1 viikkoon.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Katoavien viestien ajastin asetettu 4 viikkoon.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Katoavien viestien ajastin asetettu %1$s minuuttiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Katoavien viestien ajastin asetettu %1$s tuntiin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Katoavien viestien ajastin asetettu %1$s päivään.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Katoavien viestien ajastin asetettu %1$s viikkoon.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Keskustelusuojaus poistettu</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Keskustelusuojaus käytössä</string>
 
     <string name="devicemsg_self_deleted">Poistit \"Tallennetut viestit\" -keskustelun.\n\nℹ️ Käyttääksesi \"Tallennetut viestit\" -ominaisuutta jälleen, aloita uusi keskustelu itsesi kanssa.</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 678d1f054..4d32729b1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -272,7 +272,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Le message original n\'a pas été trouvé</string>
     <string name="reply_privately">Répondre en privé</string>
     <string name="source_code">Code source</string>
-
     <string name="mute_for_one_hour">Déactiver pour 1 heure</string>
     <string name="mute_for_two_hours">Déactiver pour 2 heures</string>
     <string name="mute_for_one_day">Déactiver pour 1 jour</string>
@@ -725,37 +724,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nom de groupe modifié de \"%1$s\" en \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Image de groupe modifiée.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Image de groupe effacée.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Membre %1$s ajouté.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Membre %1$s retiré.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Groupe quitté.</string>
     <string name="systemmsg_read_receipt_subject">Accusé de lecture</string>
     <string name="systemmsg_read_receipt_body">Ceci est un accusé de lecture pour le message \"%1$s\".\n\nCela signifie que le message a été affiché sur l\'appareil du destinataire, pas forcément que le contenu ait été lu.</string>
     <string name="systemmsg_cannot_decrypt">Ce message ne peut pas être déchiffré.\n\n• Il peut déjà être utile de simplement répondre à ce message et demander à l\'expéditeur de l\'envoyer à nouveau.\n\n• Au cas où vous auriez réinstallé Delta Chat ou un autre programme de messagerie sur cet appareil ou un autre, vous voudrez peut-être envoyer un message de configuration d\'Autocrypt depuis ce dernier.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s par moi.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s sur %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Expéditeur inconnu de cette discussion. Voir « Info » pour plus de détails.</string>
     <string name="systemmsg_subject_for_new_contact">Message de %1$s</string>
     <string name="systemmsg_failed_sending_to">Échec de l\'envoi du message à %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Temporisation des messages éphémères désactivée.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Temporisation des messages éphémères réglée à %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Temporisation des messages éphémères réglée à 1 minute.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Temporisation des messages éphémères réglée à 1 heure.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Temporisation des messages éphémères réglée à 1 journée.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Temporisation des messages éphémères réglée à 1 semaine.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Temporisation des messages éphémères réglée à 4 semaines.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Régler le temps d\'affichage des messages éphémères à %1$s minute(s).</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Régler le temps d\'affichage des messages éphémères à %1$s heure(s).</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Régler le temps d\'affichage des messages éphémères à %1$s jour(s).</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Régler le temps d\'affichage des messages éphémères à %1$s semaine(s).</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Protection de la discussion désactivée.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Protection de la discussion activée.</string>
 
     <string name="devicemsg_self_deleted">Vous avez supprimé la discussion \"Message enregistrés\".\n\nℹ️ Pour de nouveau utiliser la fonctionnalité \"Message enregistrés\", commencez une nouvelle discussion avec vous-même.</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 979ec4318..19100d350 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -264,7 +264,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Non se atopa a mensaxe orixinal</string>
     <string name="reply_privately">Responder de xeito privado</string>
     <string name="source_code">Código Fonte</string>
-
     <string name="mute_for_one_hour">Acalar durante 1 h.</string>
     <string name="mute_for_two_hours">Acalar durante 2 h.</string>
     <string name="mute_for_one_day">Acalar durante 1 día</string>
@@ -710,37 +709,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nome do grupo cambiado de \"%1$s\" a \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Cambiouse a imaxe do grupo.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Imaxe do grupo borrada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Engadeuse a %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Eliminouse a %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Saír do Grupo.</string>
     <string name="systemmsg_read_receipt_subject">Mensaxe aberta</string>
     <string name="systemmsg_read_receipt_body">A mensaxe \"%1$s\" que enviaches mostrouse na pantalla do correspondente.\n\nNon hai garantía de que o contido fose lido.</string>
     <string name="systemmsg_cannot_decrypt">Esta mensaxe non se pode descifrar.\n\n• Podería axudar que respondas a mensaxe pedindo ao remitente que a volte a enviar.\n\n• En caso dunha reinstalación Delta Chat ou outro programa de correo en este ou outro dispositivo igual debes enviar unha Mensaxe de Configuración Autocrypt desde alí.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s por min.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s por %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Remitente descoñecido para esta convers. Mira en \'info\' para saber máis.</string>
     <string name="systemmsg_subject_for_new_contact">Mensaxe de %1$s</string>
     <string name="systemmsg_failed_sending_to">Fallou o envío para %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Desactivada a caducidade para as mensaxes.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">As mensaxes desparecerán após %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">As mensaxes desparecerán após 1 minuto.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">As mensaxes desparecerán após 1 hora.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">As mensaxes desaparecerán após 1 día.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">As mensaxes desaparecerán após 1 semana.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">As mensaxes desaparecerán após 4 semanas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">As mensaxes desaparecerán após %1$s minutos.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">As mensaxes desaparecerán após %1$s horas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">As mensaxes desaparecerán após %1$s días.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">As mensaxes desaparecerán após %1$s semanas.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Protección do chat desactivada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Protección do chat activada.</string>
 
     <string name="devicemsg_self_deleted">Eliminaches o chat \"Mensaxes gardadas\".\n\nℹ️ Para usar \"Mensaxes gardadas\" de novo, crea un novo chat contigo mesmo.</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0d73c566e..2f49a4e19 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -221,9 +221,11 @@
     <string name="pref_show_emails_all">Sve</string>
     <string name="pref_background_default">Zadana pozadina</string>
     <string name="pref_background_default_color">Zadana boja</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Član %1$s dodan.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Član %1$s uklonjen.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s od %2$s.</string>
     <!-- qr code stuff -->
     <string name="qr_code">QR kod</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2ecffc3c9..93391e597 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -267,10 +267,15 @@
     <string name="pref_background_btn_gallery">Galériából</string>
     <string name="pref_show_emails_all">Mind</string>
     <string name="autocrypt_continue_transfer_retry">Újra</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">A csoportkép megváltozott.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">A csoportkép törölve.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s hozzáadva a csoporthoz.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$s eltávolítva a csoportból.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Kiléptél a csoportból.</string>
     <!-- qr code stuff -->
     <string name="qr_code">QR-kód</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a23f52750..a6b843ade 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -505,17 +505,22 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nama grup diganti dari \"%1$s\" ke \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Gambar grup telah diubah.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Gambar grup telah dihapus.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Member %1$s telah ditambahkan.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Member %1$s telah dikeluarkan.</string>
     <string name="systemmsg_read_receipt_subject">Pesan dibuka</string>
     <string name="systemmsg_read_receipt_body">Pesan \"%1$s\" yang Anda kirimkan tampak di layar penerima.\n\nIni bukan jaminan kalau isinya dibaca.</string>
     <string name="systemmsg_cannot_decrypt">Pesan ini tidak bisa dienkripsi.\n\n• Ada baiknya menjawab pesan ini dan meminta pengirimnya untuk kirim ulang.\n\n• Dalam kasus Anda menginstal ulang Delta Chat atau program surel lain di perangkat ini atau perangkat lain, sebaiknya Anda mengirim Pengaturan Pesan Autocrypt dari sana.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s oleh saya.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s oleh %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Pengirim tidak dikenal untuk obrolan ini. Lihat \'info\' untuk lebih jelasnya.</string>
     <string name="systemmsg_subject_for_new_contact">Pesan dari %1$s</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 14d95833e..936602b58 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -272,7 +272,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Messaggio originale non trovato</string>
     <string name="reply_privately">Rispondi in Privato</string>
     <string name="source_code">Codice Sorgente</string>
-
     <string name="mute_for_one_hour">Silenzia per 1 ora</string>
     <string name="mute_for_two_hours">Silenzia per 2 ore</string>
     <string name="mute_for_one_day">Silenzia per 1 giorno</string>
@@ -725,37 +724,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nome del gruppo modificato da \"%1$s\" a \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Immagine gruppo cambiata.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Immagine gruppo eliminata.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Membro %1$s aggiunto.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Membro %1$s rimosso.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Gruppo abbandonato.</string>
     <string name="systemmsg_read_receipt_subject">Ricevuta di lettura</string>
     <string name="systemmsg_read_receipt_body">Questa è una ricevuta di lettura del messaggio \"%1$s\".\n\nCiò significa che il messaggio è stato mostrato nel dispositivo del destinatario, ma non necessariamente che il contenuto è stato letto.</string>
     <string name="systemmsg_cannot_decrypt">Questo messaggio non può essere decrittato.\n\n• Potrebbe essere sufficiente rispondere a questo messaggio e chiedere al mittente di rispedirlo.\n\n• Se hai reinstallato Delta Chat o usi un altro client email dovresti inviare un Messaggio di configurazione Autocrypt dal dispositivo originario.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s da me.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s da %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Mittente sconosciuto per questa chat. Vedi \'info\' per maggiori dettagli.</string>
     <string name="systemmsg_subject_for_new_contact">Messaggio da %1$s</string>
     <string name="systemmsg_failed_sending_to">Impossibile inviare il messaggio a %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Timer scomparsa messaggi disabilitato.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Il timer per la scomparsa dei messaggi è impostato su %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Il timer per la scomparsa dei messaggi è impostato su 1 minuto.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Il timer per la scomparsa dei messaggi è impostato su 1 ora.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Il timer per la scomparsa dei messaggi è impostato su 1 giorno.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Il timer per la scomparsa dei messaggi è impostato su 1 settimana.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Il timer per la scomparsa dei messaggi è impostato su 4 settimane.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Timer di scomparsa dei messaggi impostato su %1$s minuti.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Timer di scomparsa dei messaggi impostato su %1$s ore.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Timer di scomparsa dei messaggi impostato su %1$s giorni.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Timer di scomparsa dei messaggi impostato su %1$s settimane.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Protezione chat disattivata.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Protezione chat abilitata.</string>
 
     <string name="devicemsg_self_deleted">Hai eliminato la chat \"Messaggi salvati\".\n\nℹ️ Per utilizzare nuovamente la funzione \"Messaggi salvati\", crea una nuova chat con te stesso.</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e84d68bf9..b6b71226f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -557,34 +557,51 @@ https://delta.chat</string>
     <string name="autocrypt_continue_transfer_title">自動暗号化設定用ﾒｯｾｰｼﾞ</string>
     <string name="autocrypt_continue_transfer_retry">再試行</string>
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">グループ名を%1$sから%2$sに変更しました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">グループ画像が変わりました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">グループ画像を削除しました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$sが追加されました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$sが退会されました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">グループを退会しました。</string>
     <string name="systemmsg_read_receipt_subject">既読</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">自分から%1$s</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%2$sから%1$s</string>
     <string name="systemmsg_subject_for_new_contact">%1$sさんからのメッセージ</string>
     <string name="systemmsg_failed_sending_to">%1$sさんへのメッセージ送信に失敗しました。</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">消えるメッセージを無効にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">消えるメッセージを%1$s秒にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">消えるメッセージを1分にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">消えるメッセージを1時間にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">消えるメッセージを1日にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">消えるメッセージを1週間にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">消えるメッセージを4週間にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">消えるメッセージを%1$s分にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">消えるメッセージを%1$s時間にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">消えるメッセージを%1$s日にしました。</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">消えるメッセージを%1$s週間にしました。</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">保護が無効です。</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">保護が有効です。</string>
 
     <!-- qr code stuff -->
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index da5fb9f63..ee117c45c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -651,37 +651,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">ឈ្មោះក្រុមត្រូវបានប្តូរពី \"%1$s\" ទៅកាន់ \"%2$s\"</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">រូបភាពក្រុមត្រូវបានប្តូរ</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">រូបភាពក្រុមត្រូវបានលុប</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">សមាជិក %1$s ត្រូវបានបន្ថែម</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">សមាជិក %1$s ត្រូវបានយកចេញ</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">អ្នកត្រូវបានចាកចេញពីក្រុម</string>
     <string name="systemmsg_read_receipt_subject">សារត្រូវបានបើក</string>
     <string name="systemmsg_read_receipt_body">\"%1$s\" សារដែលអ្នកបានផ្ញើត្រូវបានបង្ហាញនៅលើ អេក្រង់របស់អ្នកទទួល\n\nនេះមិនមែនជាការធានាថា មាតិកាត្រួវបានអានទេ។</string>
     <string name="systemmsg_cannot_decrypt">សារនេះមិនអាចត្រូវបានឌិគ្រីប\n\n• វាអាចជួយឆ្លើយតបជំនួសសារនេះ និងសួរអ្នកផ្ញើដើម្បីផ្ញើសារម្តងទៀត\n\n• ក្នុងករណីអ្នកបានតម្លើងសា Delta Chat ម្តងទៀត ឬកម្មវិធីអុីម៉េលមួយទៀត លើឧបករណ៍នេះ ឬឧបករណ៍មួយផ្សេងទៀត អ្នកប្រហែលជាចង់ផ្ញើ សារការតម្លើងអ៊ិនគ្រីបស្វ័យប្រវត្តិ  (ផ្ញើនិងទទួលដោយសម្ងាត់) ពីទីនោះ។</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s ដោយខ្ញុំ</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s ដោយ %2$s</string>
     <string name="systemmsg_unknown_sender_for_chat">មិនស្គាល់អ្នកផ្ញើការសន្ទនានេះ។ មើល \'ពត៌មាន\' សម្រាប់ពត៌មានលំអិត</string>
     <string name="systemmsg_subject_for_new_contact">សារពី %1$s</string>
     <string name="systemmsg_failed_sending_to">បានបរាបានក្នុងការផ្ញើសារទៅ %1$s</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">បានបិទបាត់កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈ</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ %1$s វិនាទី។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ ១នាទី។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ ១ម៉ោង។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ ១ថ្ងៃ។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ ១សប្តាហ៍។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ ៤សប្តាហ៍</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ %1$s នាទី។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ %1$s ម៉ោង។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ %1$s ថ្ងៃ។</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">កម្មវិធីសារដែលនឹងបាត់បន្ទាប់ពីមួយរយៈបាន កំណត់ទៅ %1$s ថ្ងៃ។</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">ការការពារសន្ទនាត្រូវបានបិទ</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">ការការពារសន្ទនាត្រូវបានបើក</string>
 
     <string name="devicemsg_self_deleted">អ្នកបានលុប \"សារដែលបានរក្សាទុក\" សន្ទនា។\n\nℹ️ ដើម្បីប្រើមុខងារ \"សារដែលបានរក្សាទុក\" ជាថ្មីម្តងទៀត សូមបង្កើតសន្ទនាថ្មីជាមួយខ្លួនអ្នក។</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c189662d0..e6b159c57 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -243,7 +243,6 @@
     <string name="ConversationFragment_quoted_message_not_found">원본 메시지를 찾을 수 없음</string>
     <string name="reply_privately">비공개로 응답</string>
     <string name="source_code">소스 코드</string>
-
     <string name="mute_for_one_hour">1시간 동안 알림 일시 끄기</string>
     <string name="mute_for_two_hours">2시간 동안 알림 일시 끄기</string>
     <string name="mute_for_one_day">하루 동안 알림 일시 끄기</string>
@@ -424,24 +423,37 @@
     <!-- autocrypt -->
     <string name="autocrypt">자동암호화</string>
     <string name="autocrypt_send_asm_title">자동 암호화 설정된 메시지 전송</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">그룹 이미지 변경</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">그룹 이미지 삭제</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">그룹이 남았습니다.</string>
     <string name="systemmsg_unknown_sender_for_chat">이 채팅의 발신자를 알 수 없습니다. 자세한 내용은 \'info\'를 확인하세요.</string>
     <string name="systemmsg_failed_sending_to">%1$s에게 메시지를 보내지 못했습니다.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">메시지 타이머를 사용할 수 없습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">메시지 타이머가 %1$s초로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">메시지 타이머가 1분으로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">메시지 타이머가 1시간으로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">메시지 타이머가 1일로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">메시지 타이머가 1주로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">메시지 타이머가 4주로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">메시지 타이머가 %1$s분으로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">메시지 타이머가 %1$s시간으로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">메시지 타이머가 %1$s일로 설정되었습니다.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">메시지 타이머가 %1$s주로 설정되었습니다.</string>
-
     <string name="qrscan_title">QR코드를 스캔하세요</string>
     <string name="qrscan_ask_join_group">\"%1$s\" 그룹에 참여하시겠습니까?</string>
     <string name="qrshow_join_contact_no_connection_toast">인터넷에 연결되어 있지 않아 QR 코드 설정을 수행할 수 없습니다.</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index db59101c4..1aa3c0371 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -605,30 +605,47 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Grupės pavadinimas pasikeitė iš \"%1$s\" į \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Grupės paveikslas pakeistas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Grupės paveikslas ištrintas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Dalyvis %1$s pridėtas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Dalyvis %1$s pašalintas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Išeita iš grupės.</string>
     <string name="systemmsg_read_receipt_subject">Pranešimas apie skaitymą</string>
     <string name="systemmsg_read_receipt_body">Tai yra pranešimas apie žinutės \"%1$s\" skaitymą.\n\nTai reiškia, kad žinutė buvo atvaizduota gavėjo įrenginyje, tačiau neužtikrina, kad jos turinys buvo perskaitytas.</string>
     <string name="systemmsg_cannot_decrypt">Nepavyksta iššifruoti šios žinutės.\n\n• Galima, tiesiog, atsakyti į šią žinutę ir paprašyti siuntėjo dar kartą išsiųsti šią žinutę.\n\n• Tuo atveju, jeigu iš naujo įdiegėte Delta Chat ar kitą el. pašto programą šiame ar kitame įrenginyje, jūs galite pageidauti išsiųsti Autocrypt sąrankos žinutę iš to įrenginio.</string>
     <string name="systemmsg_subject_for_new_contact">Žinutė nuo %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Išnykstančių žinučių laikmatis išjungtas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Išnykstančių žinučių laikmatis nustatytas į %1$s sek.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Išnykstančių žinučių laikmatis nustatytas į 1 minutę.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Išnykstančių žinučių laikmatis nustatytas į 1 valandą.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Išnykstančių žinučių laikmatis nustatytas į 1 dieną.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Išnykstančių žinučių laikmatis nustatytas į 1 savaitę.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Išnykstančių žinučių laikmatis nustatytas į 4 savaites.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Išnykstančių žinučių laikmatis nustatytas į %1$s min.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Išnykstančių žinučių laikmatis nustatytas į %1$s val.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Išnykstančių žinučių laikmatis nustatytas į %1$s d.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Išnykstančių žinučių laikmatis nustatytas į %1$s sav.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Pokalbio apsauga išjungta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Pokalbio apsauga įjungta.</string>
 
     <!-- %1%s will be replaced by date and time in some human-readable format -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 593d6fd7a..89dd9044e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -370,18 +370,24 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Gruppenavn endret fra \"%1$s\" til \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Gruppebilde endret.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Gruppebilde slettet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Medlem %1$s lagt til.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Medlem %1$s fjernet.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Gruppe oppløst.</string>
     <string name="systemmsg_read_receipt_subject">Meldingskvittering</string>
     <string name="systemmsg_read_receipt_body">Dette er en meldingskvittering for meldingen \"%1$s\".\n\nDenne meldingskvitteringen bekrefter bare at meldingen ble vist på mottakerens enhet. Det finnes ingen garanti for at mottakeren har lest meldingsinnholdet.</string>
     <string name="systemmsg_cannot_decrypt">Denne meldingen kan ikke dekrypteres.\n\n• Det kan hjelpe å svare på denne meldingen og spørre avsenderen om å sende den igjen.\n\n• I fall du har reinstallert Delta Chat eller et annet e-postprogram på denne eller en annen enhet, kan du sende en Autocrypt-oppsettsmelding derfra.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s av meg.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s av %2$s.</string>
     <!-- qr code stuff -->
     <string name="qr_code">QR-kode</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 10d42af78..ea26e0363 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -264,7 +264,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Geen oorspronkelijk bericht gevonden</string>
     <string name="reply_privately">Privé beantwoorden</string>
     <string name="source_code">Broncode</string>
-
     <string name="mute_for_one_hour">1 uur lang uitschakelen</string>
     <string name="mute_for_two_hours">2 uur lang uitschakelen</string>
     <string name="mute_for_one_day">1 dag lang uitschakelen</string>
@@ -710,37 +709,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Groepsnaam gewijzigd van \"%1$s\" in \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Groepsafbeelding gewijzigd.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Groepsafbeelding verwijderd.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">‘%1$s’ is toegevoegd.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">‘%1$s’ is verwijderd.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Groep verlaten.</string>
     <string name="systemmsg_read_receipt_subject">Leesbevestiging</string>
     <string name="systemmsg_read_receipt_body">Het door jou verstuurde bericht, “%1$s”, heeft het scherm van de ontvanger bereikt.\n\nDit betekent echter niet dat het ook gelezen is.</string>
     <string name="systemmsg_cannot_decrypt">Dit bericht kan niet worden ontsleuteld.\n\n• Het kan helpen dit bericht te beantwoorden en de afzender te vragen het opnieuw te versturen.\n\n• Als je Delta Chat of een andere e-mailapp opnieuw hebt geïnstalleerd op dit of een ander apparaat, verstuur het instelbericht dan opnieuw.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s door mij.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s door %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Dit gesprek bevat een onbekende afzender. Zie ‘Informatie’ voor meer informatie.</string>
     <string name="systemmsg_subject_for_new_contact">Bericht van %1$s</string>
     <string name="systemmsg_failed_sending_to">Het bericht kan niet worden verstuurd aan %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">De tijdklok van verdwijnende berichten is uitgeschakeld.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">De tijdklok van verdwijnende berichten is ingesteld op %1$s sec.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">De tijdklok van verdwijnende berichten is ingesteld op 1 minuut.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">De tijdklok van verdwijnende berichten is ingesteld op 1 uur.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">De tijdklok van verdwijnende berichten is ingesteld op 1 dag.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">De tijdklok van verdwijnende berichten is ingesteld op 1 week.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">De tijdklok van verdwijnende berichten is ingesteld op 4 weken.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">De tijdklok van verdwijnende berichten is ingesteld op %1$s minuten.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">De tijdklok van verdwijnende berichten is ingesteld op %1$s uur.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">De tijdklok van verdwijnende berichten is ingesteld op %1$s dagen.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">De tijdklok van verdwijnende berichten is ingesteld op %1$s weken.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Gespreksbeveiliging is uitgeschakeld.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Gespreksbeveiliging is ingeschakeld.</string>
 
     <string name="devicemsg_self_deleted">Je hebt het gesprek ‘Opgeslagen berichten’ verwijderd.\n\nℹ️ Als je weer gebruik wilt maken van deze functie, begin dan een nieuw gesprek met jezelf.</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index da54fd126..7708bb83c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -280,7 +280,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Nie znaleziono oryginalnej wiadomości</string>
     <string name="reply_privately">Odpowiedz prywatnie </string>
     <string name="source_code">Kod źródłowy</string>
-
     <string name="mute_for_one_hour">Wyłącz na 1 godzinę</string>
     <string name="mute_for_two_hours">Wyłącz na 2 godziny</string>
     <string name="mute_for_one_day">Wyłącz na 1 dzień</string>
@@ -740,37 +739,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Zmieniono nazwę grupy z \"%1$s\" na \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Zmieniono obraz grupy.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Usunięto obraz grupy.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Dodano członka %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Usunięto członka %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Grupa opuszczona.</string>
     <string name="systemmsg_read_receipt_subject">Potwierdzenie odczytu</string>
     <string name="systemmsg_read_receipt_body">To jest potwierdzenie odczytu dla wiadomości ”%1$s„.\n\nTo potwierdzenie odczytu tylko informuje, że wiadomość została wyświetlona na urządzeniu odbiorcy. Nie ma gwarancji, że odbiorca przeczytał treść wiadomości.</string>
     <string name="systemmsg_cannot_decrypt">Tej wiadomości nie można odszyfrować.\n\n• Możesz teraz pomóc odpowiadając po prostu na tą wiadomość i poprosić nadawcę o ponowne wysłanie wiadomości.\n\n• W przypadku ponownego zainstalowania Delta Chat lub innego programu mailowego na tym lub innym urządzeniu, może być konieczne wysłanie stąd klucza automatycznego szyfrowania.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s przeze mnie.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s przez %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Nieznany nadawca tego czatu. Więcej szczegółów znajdziesz w sekcji „Informacje”.</string>
     <string name="systemmsg_subject_for_new_contact">Wiadomość od %1$s</string>
     <string name="systemmsg_failed_sending_to">Nie udało się wysłać wiadomości do %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Wyłączono zegar znikających wiadomości.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Ustawiono zegar znikających wiadomości na %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Ustawiono zegar znikających wiadomości na 1 minutę.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Ustawiono zegar znikających wiadomości na 1 godzinę.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Ustawiono zegar znikających wiadomości na 1 dzień.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Ustawiono zegar znikających wiadomości na 1 tydzień.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Ustawiono zegar znikających wiadomości na 4 tygodnie.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Ustawiono zegar znikających wiadomości na czas %1$s minut.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Ustawiono zegar znikających wiadomości na czas %1$s godzin.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Ustawiono zegar znikających wiadomości na czas %1$s dni.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Ustawiono zegar znikających wiadomości na czas %1$s tygodni.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Ochrona czatu wyłączona.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Ochrona czatu włączona.</string>
 
     <string name="devicemsg_self_deleted">Usunięto czat „Zapisane wiadomości”.\n\nℹ️ Aby ponownie użyć funkcji „Zapisane wiadomości”, utwórz nowy czat ze sobą.</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 5eccd42c2..10b09b46c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -272,7 +272,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Mensagem original não encontrada</string>
     <string name="reply_privately">Responder em privado</string>
     <string name="source_code">Código Fonte</string>
-
     <string name="mute_for_one_hour">Silenciar por 1 hora</string>
     <string name="mute_for_two_hours">Silenciar por 2 horas</string>
     <string name="mute_for_one_day">Silenciar por 1 dia</string>
@@ -725,37 +724,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Nome do grupo alterado de \"%1$s\" para \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Avatar do grupo modificado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Avatar do grupo apagado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Participante %1$s adicionado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Participante %1$s removido.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Grupo abandonado.</string>
     <string name="systemmsg_read_receipt_subject">Confirmação de leitura</string>
     <string name="systemmsg_read_receipt_body">Confirmação de recebimento da mensagem \"%1$s\".\n\nEsta confirmação somente assegura que a mensagem foi exibida no aparelho do destinatário, mas não há garantia de que ele tenha lido o seu conteúdo.</string>
     <string name="systemmsg_cannot_decrypt">Impossível descriptografar esta mensagem.\n\n• Pode resolver pedir que ela seja reenviada.\n\n• Caso você tenha reinstalado o Delta Chat ou outro programa de e-mail, neste ou noutro dispositivo, será necessário enviar uma \"mensagem de configuração do Autocrypt\".</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s por mim.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s por %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Remetente desconhecido para esta conversa. Veja \'informações\' para mais detalhes.</string>
     <string name="systemmsg_subject_for_new_contact">Mensagem de %1$s</string>
     <string name="systemmsg_failed_sending_to">Falha ao enviar mensagem para %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Temporizador de desaparecimento de mensagens desativado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Temporizador de desaparecimento de mensagens definido para %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Temporizador de desaparecimento de mensagens definido para 1 minuto.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Temporizador de desaparecimento de mensagens definido para 1 hora.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Temporizador de desaparecimento de mensagens definido para 1 dia.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Temporizador de desaparecimento de mensagens definido para 1 semana.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Temporizador de desaparecimento de mensagens definido para 4 semanas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Temporizador de mensagens que desaparecem definido para %1$s minutos.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Temporizador de mensagens que desaparecem definido para %1$s horas.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Temporizador de mensagens que desaparecem definido para %1$s dias.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Temporizador de mensagens que desaparecem definido para %1$s semanas.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Proteção da conversa desligada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Proteção da conversa ligada.</string>
 
     <string name="devicemsg_self_deleted">Você excluiu o bate-papo \"Mensagens salvas\".\n\nℹ️ Para usar o recurso \"Mensagens salvas\" novamente, crie um novo bate-papo com você mesmo. </string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0afe69d51..b37d3a4a0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -323,18 +323,24 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">O nome do grupo mudou de \"%1$s\" para \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Imagem do grupo modificada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Imagem do grupo apagada.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Membro %1$s adicionado.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Membro %1$s removido.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Saíu do grupo.</string>
     <string name="systemmsg_read_receipt_subject">Ler recibos</string>
     <string name="systemmsg_read_receipt_body">Este é um recibo de confirmação de leitura da mensagem \"%1$s\".\n\nEsta mensagem foi exibida no dispositivo do destinatário, não necessariamente que o conteúdo foi lido.</string>
     <string name="systemmsg_cannot_decrypt">Esta mensagem não pode ser descriptada.\n\n • Talvez seja útil simplesmente responder a esta mensagem e solicitar que o remetente envie a mensagem novamente.\n\n • Caso você tenha re-instalado o Delta Chat ou outro programa de e-mail neste ou noutro dispositivo poderá querer enviar uma mensagem de configuração Autocrypt do dispositvo.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s por mim.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s por %2$s.</string>
     <string name="qrscan_title">Fazer scan do código QR</string>
     <string name="qrscan_hint">Coloque sua câmera sobre o código QR</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2c0e7d283..118586b1a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -280,7 +280,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Оригинальное сообщение не найдено</string>
     <string name="reply_privately">Ответить лично</string>
     <string name="source_code">Исходный код</string>
-
     <string name="mute_for_one_hour">1 час</string>
     <string name="mute_for_two_hours">На 2 часа</string>
     <string name="mute_for_one_day">На 1 день</string>
@@ -740,37 +739,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Название группы изменено с «%1$s» на «%2$s».</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Изображение группы изменено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Изображение группы удалено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Добавлен участник %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Участник %1$s удалён.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Группа покинута.</string>
     <string name="systemmsg_read_receipt_subject">Уведомление о прочтении</string>
     <string name="systemmsg_read_receipt_body">Это подтверждение того, что сообщение \"%1$s\" было открыто на устройстве получателя. Данное подтверждение не означает, что сообщение было прочитано.</string>
     <string name="systemmsg_cannot_decrypt">Это сообщение не может быть расшифровано.\n\n• Возможно, поможет просто ответить на это сообщение и попросить отправителя отправить сообщение еще раз.\n\n • В случае, если вы переустановили Delta Chat или другую почтовую программу на этом или другом устройстве, возможно, вы захотите отправить сообщение с параметрами Autocrypt оттуда.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s мной.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s пользователем %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Неизвестный отправитель для данного чата. Смотрите \"информацию\" для подробностей.</string>
     <string name="systemmsg_subject_for_new_contact">Сообщение от %1$s</string>
     <string name="systemmsg_failed_sending_to">Не удалось отправить сообщение %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Таймер исчезающих сообщений отключён.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Таймер исчезающих сообщений установлен на %1$s с.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Таймер исчезающих сообщений установлен на 1 минуту.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Таймер исчезающих сообщений установлен на 1 час.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Таймер исчезающих сообщений установлен на 1 день.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Таймер исчезающих сообщений установлен на 1 неделю.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Таймер исчезающих сообщений установлен на 4 недели.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Таймер исчезающих сообщений установлен на %1$s минут.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Таймер исчезающих сообщений установлен на %1$s часов.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Таймер исчезающих сообщений установлен на %1$s дней.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Таймер исчезающих сообщений установлен на %1$s недель.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Защита чата отключена.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Защита чата включена</string>
 
     <string name="devicemsg_self_deleted">Вы удалили чат \"Сохраненные сообщения\".\n\nℹ️ Чтобы снова использовать функцию \"Сохраненные сообщения\", создайте новый чат с самим собой.</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9c4bdd211..09b1dffa1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -272,7 +272,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Pôvodná správa sa nenašla</string>
     <string name="reply_privately">Odpovedajte súkromne</string>
     <string name="source_code">Zdrojový kód</string>
-
     <string name="mute_for_one_hour">Stíšiť na 1 hodinu</string>
     <string name="mute_for_two_hours">Stíšiť na 2 hodiny</string>
     <string name="mute_for_one_day">Stíšiť na 1 deň</string>
@@ -719,37 +718,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Názov skupiny sa zmenil z „%1$s“ na „%2$s“.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Skupinový obrázok sa zmenil.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Skupinový obrázok bol odstránený.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Člen %1$s pridaný.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Člen %1$s bol odstránený.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Skupina odišla.</string>
     <string name="systemmsg_read_receipt_subject">Správa otvorená</string>
     <string name="systemmsg_read_receipt_body">%1$s Správa, ktorú ste poslali, sa zobrazila na obrazovke príjemcu.\n\nZaručujeme, že obsah nebol prečítaný.</string>
     <string name="systemmsg_cannot_decrypt">Túto správu nie je možné dešifrovať.\n\n• Už by mohlo pomôcť jednoducho odpovedať na túto správu a požiadať odosielateľa, aby správu odoslal znova.\n\n• V prípade, že ste na ňu znova nainštalovali program Delta Chat alebo iný e-mailový program alebo iné zariadenie, z ktorého budete pravdepodobne chcieť odoslať správu o nastavení automatického šifrovania.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s mnou.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$sod%2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Neznámy odosielateľ pre túto konverzáciu. Ďalšie informácie nájdete v časti „Informácie“.</string>
     <string name="systemmsg_subject_for_new_contact">Správa od %1$s</string>
     <string name="systemmsg_failed_sending_to">Správu sa nepodarilo odoslať %1$s .</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Časovač zmiznutia správ je deaktivovaný.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Časovač zmiznutia správ nastavený na %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Časovač zmiznutia správ bol nastavený na 1 minútu.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Časovač zmiznutia správ bol nastavený na 1 hodinu.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Časovač zmiznutia správ nastavený na 1 deň.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Časovač zmiznutia správ nastavený na 1 týždeň.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Časovač zmiznutia správ nastavený na 4 týždne.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Časovač zmiznutia správ bol nastavený na %1$s minúty.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Časovač zmiznutia správ bol nastavený na %1$s hodiny.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Časovač zmiznutia správ nastavený na %1$s dni.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Časovač zmiznutia správ nastavený na %1$s týždne.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Ochrana konverzácií je vypnutá.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Ochrana konverzácií je zapnutá.</string>
 
     <string name="devicemsg_self_deleted">Odstránili ste konverzáciu \"Uložené správy\".\n\nℹ️ Aby ste využili funkciu \"Uložené správy\" znova, vytvorte novú konverzáciu so sebou.</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 201dec9dd..5470c41b9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -262,7 +262,6 @@
     <string name="ConversationFragment_quoted_message_not_found">S’u gjet mesazhi origjinal</string>
     <string name="reply_privately">Përgjigjuni privatisht</string>
     <string name="source_code">Kod Burim</string>
-
     <string name="mute_for_one_hour">Heshtoji për 1 orë</string>
     <string name="mute_for_two_hours">Heshtoji për 2 orë</string>
     <string name="mute_for_one_day">Heshtoji për 1 ditë</string>
@@ -707,37 +706,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Emri i grupit u ndryshua nga \"%1$s\" në \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Figura e grupit ndryshoi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Figura e grupit u fshi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">U shtua anëtari %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">U hoq anëtari %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">U braktis grupi.</string>
     <string name="systemmsg_read_receipt_subject">Dëftesë leximi</string>
     <string name="systemmsg_read_receipt_body">Kjo është dëftesë leximi për mesazhin \"%1$s\".\n\nDo të thotë që mesazhi u shfaq te pajisja e marrësit, jo domosdo që lënda u lexua.</string>
     <string name="systemmsg_cannot_decrypt">Ky mesazh s\’mund të shfshehtëzohet.\n\n• Mundet që të ndihmojë dërgimi thjesht i një përgjigjeje këtij mesazhi dhe t\’i kërkohet dërguesit ta ridërgojë mesazhin.\n\n• Në rast se ri-instaluat Delta Chat-in apo një tjetër program email-esh në këtë apo në një tjetër pajisje, mund të donit të dërgonit një Mesazh Rregullimi Autocrypt-i që prej andej.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s nga unë.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s nga %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Dërgues i panjohur për këtë fjalosje. Për më tepër hollësi, shihni \'info\'.</string>
     <string name="systemmsg_subject_for_new_contact">Mesazh nga %1$s</string>
     <string name="systemmsg_failed_sending_to">S’u arrit të dërgohej mesazh te %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Kohëmatësi për mesazhe që zhduken është i çaktivizuar.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Kohëmatësi i zhdukjes së mesazheve është vënë në %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Kohëmatësi për mesazhe që zhduken është vënë në 1 minutë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Kohëmatësi për mesazhe që zhduken është vënë në 1 orë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Kohëmatësi për mesazhe që zhduken është vënë në 1 ditë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Kohëmatësi për mesazhe që zhduken është vënë në 1 javë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Kohëmatësi për mesazhe që zhduken është vënë në 4 javë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Kohëmatësi për mesazhe që zhduken është vënë në %1$s minuta.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Kohëmatësi për mesazhe që zhduken është vënë në %1$s orë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Kohëmatësi i zhdukjes së mesazheve është vënë në %1$s ditë.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Kohëmatësi për mesazhe që zhduken është vënë në %1$s javë.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Mbrojtja e fjalosjes u çaktivizua.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Mbrojtja e fjalosjes u aktivizua.</string>
 
     <string name="devicemsg_self_deleted">Fshitë fjalosjen “Mesazhe të ruajtur”.\n\nℹ️ Që të përdorni sërish veçorinë “Mesazhe të ruajtur”, krijoni një fjalosje të re me veten tuaj.</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 816061b71..8dbbed548 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -294,15 +294,21 @@
     <string name="autocrypt_continue_transfer_title">Порука поставки за аутошфровање</string>
     <string name="autocrypt_continue_transfer_retry">Покушај поново</string>
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Назив групе је измењен из „%1$s“ у „%2$s“.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Слика групе је промењена.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Слика групе је обрисана.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Члан %1$s је додат.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Члан %1$s је уклоњен.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Група напуштена.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s од мене.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s од стране %2$s.</string>
     <!-- qr code stuff -->
     <string name="qr_code">Бар-кôд</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 44dc9f9ec..a5a4423bf 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -545,29 +545,42 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Gruppnamnet ändrades från \"%1$s\" till \"%2$s\".</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Gruppbilden ändrades.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Gruppbilden togs bort.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Medlemmen %1$s lades till.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Medlemmen %1$s togs bort.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Grupp lämnade.</string>
     <string name="systemmsg_read_receipt_subject">Meddelande öppnat</string>
     <string name="systemmsg_read_receipt_body">\"%1$s\" meddelandet du skickade visades på mottagarens skärm.\n\nDet är ingen garanti för att innehållet har lästs.</string>
     <string name="systemmsg_cannot_decrypt">Meddelandet kan inte avkrypteras.\n\n• Det kanske kan hjälpa, att svara på detta meddelande och be avsändaren skicka det igen.\n\n• Ifall du har ominstallerat Delta Chat eller något annat e-postprogram på denna eller någon annan enhet, kanske du behöver skicka ett nytt Autocryp inställningsmeddelande därifrån.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s av mig.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s av %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Okänd avsändare för denna chatt. Se info för fler detaljer.</string>
     <string name="systemmsg_subject_for_new_contact">Meddelande från %1$s</string>
     <string name="systemmsg_failed_sending_to">Kunde inte skicka meddelande till %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Tiduret för meddelandeborttagning är inaktiverat.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Tiduret för meddelandeborttagning är satt till %1$s s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Tiduret för meddelandeborttagning är satt till 1 minut.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Tiduret för meddelandeborttagning är satt till 1 timma.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Tiduret för meddelandeborttagning är satt till 1 dag.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Tiduret för meddelandeborttagning är satt till 1 vecka.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Tiduret för meddelandeborttagning är satt till 4 veckor.</string>
     <!-- qr code stuff -->
     <string name="qr_code">QR-kod</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f1f8b0c17..111958ca3 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -221,10 +221,15 @@
     <string name="pref_background">அரட்டை பின்புலம்</string>
     <string name="autocrypt_continue_transfer_please_enter_code">மற்ற சாதனத்தில் காணப்படும் அமைப்பு குறியீடை தயவு செய்து உள்ளீடவும்</string>
     <string name="autocrypt_continue_transfer_retry">மீண்டும் முயற்சி செய்யவும்</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">குழு படம் மாற்றப்பட்டது.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">குழு படம் நீக்கப்பட்டது</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added"> %1$s உறுப்பினராக சேர்க்கப்பட்டார்</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">உறுப்பினர் %1$s நீக்கப்பட்டார்</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">குழுவில் இருந்து வெளியேறினது</string>
     <string name="qrscan_fingerprint_label">கைரேகைகள்</string>
     <string name="notify_reply_button">மறுமொழி</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ea710b72a..2e4a115ec 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -188,9 +188,9 @@
     <string name="pref_backup">బ్యాకప్</string>
     <string name="pref_managekeys_export_secret_keys">రహస్య కీలను ఎగుమతి చెయి</string>
     <string name="pref_background">చాట్ నేపధ్యం</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s నా‌ ద్వరా</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s చే %2$s.</string>
     <string name="qrscan_fingerprint_label">ఫింగర్‌ప్రింట్స్</string>
     <string name="notify_reply_button">జవాబు</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 73f5bb24e..379593b47 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -264,7 +264,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Özgün ileti bulunamadı</string>
     <string name="reply_privately">Özel Olarak Yanıtla</string>
     <string name="source_code">Kaynak Kodu</string>
-
     <string name="mute_for_one_hour">1 saatliğine sessize al</string>
     <string name="mute_for_two_hours">2 saatliğine sessize al</string>
     <string name="mute_for_one_day">1 günlüğüne sessize al</string>
@@ -710,37 +709,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">\"%1$s\" grup adı \"%2$s\" olarak değiştirildi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Grup görseli değiştirildi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Grup görseli silindi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">%1$s üyesi eklendi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">%1$s üyesi kaldırıldı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Gruptan ayrılındı.</string>
     <string name="systemmsg_read_receipt_subject">İleti açıldı</string>
     <string name="systemmsg_read_receipt_body">Gönderdiğiniz \"%1$s\" iletisi alıcının ekranında görüntülendi.\n\nBu, içeriğin okunduğunun güvencesi değildir.</string>
     <string name="systemmsg_cannot_decrypt">Bu iletinin şifresi çözülemiyor.\n\n• Bu iletiye basitçe yanıt vermek ve gönderene iletiyi yeniden gönderip gönderemeyeceğini sormak zaten yardımcı olabilir.\n\n• Delta Chat\'i ya da başka bir e-posta programını bu ya da başka bir aygıta yeniden kurduysanız, oradan bir Autocrypt Ayarlama İletisi göndermek isteyebilirsiniz.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">Benim tarafımdan %1$s.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%2$s tarafından %1$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Bu sohbet için bilinmeyen gönderen. Daha fazla ayrıntı için \'bilgi\'ye bakın.</string>
     <string name="systemmsg_subject_for_new_contact">%1$s kişisinden gelen ileti</string>
     <string name="systemmsg_failed_sending_to">%1$s kişisine ileti gönderme başarısız.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Kaybolan iletiler zamanlayıcısı etkisizleştirildi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Kaybolan iletiler zamanlayıcısı %1$s s\'ye ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Kaybolan iletiler zamanlayıcısı 1 dakikaya ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Kaybolan iletiler zamanlayıcısı 1 saate ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Kaybolan iletiler zamanlayıcısı 1 güne ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Kaybolan iletiler zamanlayıcısı 1 haftaya ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Kaybolan iletiler zamanlayıcısı 4 haftaya ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Kaybolan iletiler zamanlayıcısı %1$s dakikaya ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Kaybolan iletiler zamanlayıcısı %1$s saate ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Kaybolan iletiler zamanlayıcısı %1$s güne ayarlandı.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Kaybolan iletiler zamanlayıcısı %1$s haftaya ayarlandı.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Sohbet koruması etkisizleştirildi.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Sohbet koruması etkinleştirildi.</string>
 
     <string name="devicemsg_self_deleted">\"Kaydedilen iletiler\" sohbetini sildiniz.\n\nℹ️ \"Kaydedilen iletiler\" özelliğini yeniden kullanmak için kendinizle yeni bir sohbet oluşturun.</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 717b81bd4..fd570f2c1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -280,7 +280,6 @@
     <string name="ConversationFragment_quoted_message_not_found">Первісне повідомлення не знайдено</string>
     <string name="reply_privately">Відповісти приватно</string>
     <string name="source_code">Вихідний код</string>
-
     <string name="mute_for_one_hour">Відключити сповіщення на 1 годину</string>
     <string name="mute_for_two_hours">Відключити сповіщення на 2 години</string>
     <string name="mute_for_one_day">Відключити сповіщення на 1 день</string>
@@ -740,37 +739,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">Назву групи змінено з «%1$s» на «%2$s».</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">Зображення групи змінено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">Зображення групи видалено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">Додано учасника %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">Видалено учасника %1$s.</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">Ви залишили групу.</string>
     <string name="systemmsg_read_receipt_subject">Сповіщення про прочитання.</string>
     <string name="systemmsg_read_receipt_body">Це підтвердження того, що повідомлення «%1$s» було відкрито на пристрої одержувача. Дане підтвердження не означає, що повідомлення було прочитано.</string>
     <string name="systemmsg_cannot_decrypt">Це повідомлення не може бути розшифроване.\n\n• Можливо, має сенс просто відповісти на нього і попросити відправника повторно відправити повідомлення.\n\n• У випадку, якщо Ви переустановили Delta Chat або іншу поштову програму на цьому або іншому пристрої, Ви, можливо, захочете відправити повідомлення з параметрами Autocrypt звідти.</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">%1$s мною.</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%1$s користувачем %2$s.</string>
     <string name="systemmsg_unknown_sender_for_chat">Невідомий відправник для цього чату. Дивіться \"Інформацію\" для деталей.</string>
     <string name="systemmsg_subject_for_new_contact">Повідомлення від %1$s</string>
     <string name="systemmsg_failed_sending_to">Неможлива надіслати повідомлення до %1$s.</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">Вимкнено таймер зникнення повідомлень</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">Таймер зникнення повідомлень встановлено на %1$s с.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">Таймер зникнення повідомлень встановлено на 1 хвилину.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">Таймер зникнення повідомлень встановлено на 1 годину.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">Таймер зникнення повідомлень встановлено на 1 день.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">Таймер зникнення повідомлень встановлено на 1 тиждень.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">Таймер зникнення повідомлень встановлено на 4 тижні.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">Таймер повідомлень, що зникають встановлено на %1$s хвилин.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">Таймер повідомлень, що зникають встановлено на %1$s годин.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">Таймер повідомлень, що зникають встановлено на %1$s днів.</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">Таймер повідомлень, що зникають встановлено на %1$s тижнів.</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">Захист чату вимкнено.</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">Захист чату увімкнено.</string>
 
     <string name="devicemsg_self_deleted">Ви видалили чат \"Збережені повідомлення\".\n\nℹ️ Аби використовувати функцію \"Збережені повідомлення\" знову, створіть новий чат самі із собою.</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7dff83bd6..35535d98b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -256,7 +256,6 @@
     <string name="ConversationFragment_quoted_message_not_found">原消息未找到</string>
     <string name="reply_privately">私下回复</string>
     <string name="source_code">源代码</string>
-
     <string name="mute_for_one_hour">静音 1 小时</string>
     <string name="mute_for_two_hours">静音 2 小时</string>
     <string name="mute_for_one_day">静音 1 天</string>
@@ -695,37 +694,54 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">已更改群组名称：从“%1$s”更改为\"%2$s\"</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">已更改群组图像</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">已删除群组图像</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">已添加成员 %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">已移除成员 %1$s </string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">已离开群组</string>
     <string name="systemmsg_read_receipt_subject">消息已被打开</string>
     <string name="systemmsg_read_receipt_body">您发送的“%1$s”消息已在接收者的屏幕上显示过。\n\n这并不保证内容已被阅读。</string>
     <string name="systemmsg_cannot_decrypt">此消息无法解密。\n\n• 简单回复此消息并要求发送者重发该消息可能会有所帮助。\n\n• 如果您在此设备或其他设备上重新安装了 Delta Chat 或其他电子邮件程序，则可能需要从别处发送 Autocrypt 设置消息。</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">我 %1$s。</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%2$s %1$s。</string>
     <string name="systemmsg_unknown_sender_for_chat">此聊天发送者未知。查看“信息”来获取更多详情。</string>
     <string name="systemmsg_subject_for_new_contact">来自 %1$s 的消息</string>
     <string name="systemmsg_failed_sending_to">发送消息给 %1$s 失败。</string>
 
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_disabled">已禁用消息定时销毁计时器</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_enabled">设置消息定时销毁计时器为 %1$s 秒</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minute">设置消息定时销毁计时器为 1 分钟</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hour">设置消息定时销毁计时器为 1 小时</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_day">设置消息定时销毁计时器为 1 天</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_week">设置消息定时销毁计时器为 1 周</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_four_weeks">设置消息定时销毁计时器为 4 周</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_minutes">设置消息定时销毁计时器为 %1$s 分钟</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_hours">设置消息定时销毁计时器为 %1$s 小时</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_days">设置消息定时销毁计时器为 %1$s 天</string>
+    <!-- deprecated -->
     <string name="systemmsg_ephemeral_timer_weeks">设置消息定时销毁计时器为 %1$s 周</string>
-
-    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_disabled">已禁用聊天保护</string>
+    <!-- deprecated -->
     <string name="systemmsg_chat_protection_enabled">已启用聊天保护</string>
 
     <string name="devicemsg_self_deleted">您已删除“保存的消息”聊天。\n\nℹ️要再次使用“保存的消息”功能，请创建一个与自己的新聊天。</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ce9089b9f..f2a131529 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -494,18 +494,24 @@
 
 
     <!-- system messages -->
+    <!-- deprecated -->
     <string name="systemmsg_group_name_changed">群組名稱已從 %1$s 更改為 %2$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_changed">已更改群組圖片。</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_image_deleted">已刪除群組圖片。</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_added">已新增成員 %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_member_removed">已移除成員 %1$s</string>
+    <!-- deprecated -->
     <string name="systemmsg_group_left">已退出群組。</string>
     <string name="systemmsg_read_receipt_subject">收執回條</string>
     <string name="systemmsg_read_receipt_body">這是訊息 %1$s 的收執回條，表示本訊息已經顯示在收件人的裝置上了，但不代表收件人已讀。</string>
     <string name="systemmsg_cannot_decrypt">本訊息無法解密。\n\n請試著回覆本訊息，並請發送者重發一遍。\n\n如果你曾經在本裝置或其它裝置重新安裝 Delta Chat 或其它郵件軟體的話，請重新發送AutoCrypt設定訊息。</string>
-    <!-- Translators: %1$s will be replaced by sth. as "ACTION by me". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_me">我%1$s</string>
-    <!-- Translators: %1$s will be replaced by an action and %2$s will be replaced by the name/addr of the person who did it, as "ACTION by MEMBER". -->
+    <!-- deprecated -->
     <string name="systemmsg_action_by_user">%2$s%1$s</string>
     <string name="qrscan_title">掃描QR Code</string>
     <string name="qrscan_hint">請將相機對準 QR Code</string>