diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index f35f58ea3..159ee327a 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -151,7 +151,6 @@ public class DcHelper {
dcContext.setStockTranslation(11, context.getString(R.string.audio));
dcContext.setStockTranslation(12, context.getString(R.string.file));
dcContext.setStockTranslation(23, context.getString(R.string.gif));
- dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt));
dcContext.setStockTranslation(35, context.getString(R.string.contact_verified));
dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label));
dcContext.setStockTranslation(60, context.getString(R.string.login_error_cannot_login));
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
index 140e4a6bb..b6e541806 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
@@ -210,16 +210,8 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF
notificationController = null;
progressDialog.dismiss();
progressDialog = null;
- String msg = "";
- if (progressWhat == DcContext.DC_IMEX_EXPORT_BACKUP) {
- msg = context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser);
- } else if (progressWhat == DcContext.DC_IMEX_EXPORT_SELF_KEYS) {
- msg = context.getString(R.string.pref_managekeys_secret_keys_exported_to_x, pathAsDisplayedToUser);
- } else if (progressWhat == DcContext.DC_IMEX_IMPORT_SELF_KEYS) {
- msg = context.getString(R.string.pref_managekeys_secret_keys_imported_from_x, pathAsDisplayedToUser);
- }
new AlertDialog.Builder(context)
- .setMessage(msg)
+ .setMessage(context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser))
.setPositiveButton(android.R.string.ok, null)
.show();
}
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
index d43f061e4..7e167a36b 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
@@ -109,15 +109,6 @@ public class QrCodeHandler {
builder.setCancelable(false);
break;
- case DcContext.DC_QR_WEBRTC:
- builder.setMessage(activity.getString(R.string.videochat_instance_from_qr, qrParsed.getText1()));
- builder.setPositiveButton(R.string.ok, (dialog, which) -> {
- dcContext.setConfigFromQr(rawString);
- });
- builder.setNegativeButton(R.string.cancel, null);
- builder.setCancelable(false);
- break;
-
case DcContext.DC_QR_WITHDRAW_VERIFYCONTACT:
case DcContext.DC_QR_WITHDRAW_VERIFYGROUP:
String message = qrParsed.getState() == DcContext.DC_QR_WITHDRAW_VERIFYCONTACT ? activity.getString(R.string.withdraw_verifycontact_explain)
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bb618b43b..289bf4933 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -393,35 +393,6 @@
%1$s, %2$s
-
- Video Chat
-
- Invite %1$s to a video chat?
-
- This requires a compatible app or browser on both ends.
-
- %1$s invited to a video chat.
-
- You sent a video chat invitation.
-
- Tap to Join
-
- Tap to Open
-
- Video Chat Instance
-
- Your Video Chat Instance
-
- Example: https://your-server.org/$ROOM
-
- If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.
-
- Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.
-
- Video chat invitation
-
- You are invited to a video chat, click %1$s to join.
-
Are you sure you want to leave?
@@ -459,7 +430,6 @@
Contacts
Enter name or e-mail address
Type e-mail address above
- No contacts.
@@ -504,9 +474,6 @@
Saved
Save As
Retry to send message
-
- You must be in this group to post a message. To join, ask another member.
- Sending messages in mailing lists is not yet supported
Cannot display this file type: %s
Failed to load attachment
@@ -711,7 +678,7 @@
Please enter a valid e-mail address and a password
Restore from Backup
Backup found at \"%1$s\".\n\nDo you want to import and use all data and settings from it?
- No backups found.\n\nCopy the backup to \"%1$s\" and try again. Alternatively, press \"Start messaging\" to continue with the normal setup process.
+ No backups found.\n\nCopy the backup to \"%1$s\" and try again.
Cannot login as \"%1$s\". Please check if the address and the password are correct.
@@ -796,8 +763,6 @@
Server
Encryption
Manage Keys
- Use System Emoji
- Turn off Delta Chat\'s built-in emoji support
Read System Address Book
Offer to create chats with contacts from the address book.
Chats
@@ -816,18 +781,13 @@
Export all %1$d profiles
Start Backup
Backup written successfully to \"%1$s\".
- Manage Keys
Export Secret Keys
Export secret keys to \"%1$s\"?
- Import Secret Keys
- Import secret keys from \"%1$s\"?\n\n• Existing secret keys will not be deleted\n\n• The last imported key will be used as the new default key unless it has the word \"legacy\" in its filename.
Secret keys written successfully to \"%1$s\".
- Secret keys imported from \"%1$s\".
Wallpaper
Use Default Image
Select From Gallery
- IMAP Folder Handling
If you change this option, make sure, your server and your other clients are configured accordingly.\n\nOtherwise things may not work at all.
Watch Sent Folder
Send Copy to Self
@@ -907,12 +867,7 @@
I understand, delete all these messages
At once after Download
- After 30 seconds
-
- After 1 minute
After 5 minutes
-
- After 30 minutes
After 1 hour
After 1 day
After 1 week
@@ -927,7 +882,6 @@
Prefer End-To-End Encryption
- 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• If you just re-installed Delta Chat then it is best if you re-setup Delta Chat now and choose "Add as second device" or import a backup.
Unknown sender for this chat. See \'info\' for more details.
Message from %1$s
Failed to send message to %1$s.
@@ -948,8 +902,11 @@
You removed member %1$s.
Member %1$s removed by %2$s.
-
- You left.
+
+ You left the group.
+
+ You left the channel.
+ You joined the channel.
Group left by %1$s.
You deleted the group image.
@@ -1039,6 +996,7 @@
QR Invite Code
Scan to join group \"%1$s\"
+ Scan to join channel \"%1$s\"
QR Invite Code
Scan to chat with %1$s
@@ -1165,7 +1123,6 @@
Delivery status: Error
- Encryption padlock
Delivery status: Sending
Delivery status: Draft
Delivery status: Delivered
@@ -1192,8 +1149,6 @@
Disabled in Delta Chat
Disabled in system settings
\"Background App Refresh\" disabled in system settings
-
- Delayed
On average every %1$d minutes
On average every %1$d hours
Checked at %1$s