From b2cdff820abcfd8180f4e44d1d1e6b1522772f4f Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 21 Jul 2025 23:06:26 +0200 Subject: [PATCH] deprecate some stock strings; none of them are in use in core any longer --- .../java/org/thoughtcrime/securesms/connect/DcHelper.java | 5 ----- src/main/res/values/strings.xml | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index 12c2646ba..bc73aff3f 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -155,8 +155,6 @@ public class DcHelper { dcContext.setStockTranslation(24, context.getString(R.string.encrypted_message)); dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt)); 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)); dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label)); dcContext.setStockTranslation(60, context.getString(R.string.login_error_cannot_login)); dcContext.setStockTranslation(66, context.getString(R.string.location)); @@ -190,7 +188,6 @@ public class DcHelper { dcContext.setStockTranslation(112, context.getString(R.string.error_x)); dcContext.setStockTranslation(113, context.getString(R.string.not_supported_by_provider)); dcContext.setStockTranslation(114, context.getString(R.string.messages)); - dcContext.setStockTranslation(115, context.getString(R.string.channel)); dcContext.setStockTranslation(116, context.getString(R.string.part_of_total_used)); dcContext.setStockTranslation(117, context.getString(R.string.secure_join_started)); dcContext.setStockTranslation(118, context.getString(R.string.secure_join_replies)); @@ -236,7 +233,6 @@ public class DcHelper { // cmp. https://github.com/deltachat/deltachat-android/issues/2187 dcContext.setStockTranslation(120, context.getString(R.string.qrshow_join_group_hint).replace("\"", "")); dcContext.setStockTranslation(121, context.getString(R.string.connectivity_not_connected)); - dcContext.setStockTranslation(122, context.getString(R.string.aeap_addr_changed)); dcContext.setStockTranslation(162, context.getString(R.string.multidevice_qr_subtitle)); dcContext.setStockTranslation(163, context.getString(R.string.multidevice_transfer_done_devicemsg)); @@ -251,7 +247,6 @@ public class DcHelper { dcContext.setStockTranslation(176, context.getString(R.string.reaction_by_you)); dcContext.setStockTranslation(177, context.getString(R.string.reaction_by_other)); dcContext.setStockTranslation(190, context.getString(R.string.secure_join_wait)); - dcContext.setStockTranslation(192, context.getString(R.string.secure_join_takes_longer)); dcContext.setStockTranslation(193, context.getString(R.string.donate_device_msg)); } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bcda0cd13..81045cd9b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -569,7 +569,7 @@ Square Grid Send Message - + %1$s changed their address from %2$s to %3$s You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt\'s highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet. @@ -1040,13 +1040,15 @@ Establishing end-to-end encryption, please wait… Could not yet establish guaranteed end-to-end encryption, but you may already send a message. + The contact must be online to proceed.\n\nThis process will continue automatically in background. %1$s introduced. + Cannot establish end-to-end encryption with %1$s. Introduced by %1$s Introduced by me - + Changed setup for %1$s. To guarantee end-to-end-encryption, you can only add contacts with a green checkmark to this group.\n\nYou may meet contacts in person and scan their QR Code to introduce them. Select chat to send the message to