From 0ee54460ba900b269a6fe35fa061ecaaf98b16c2 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 17 Nov 2025 16:30:01 +0000 Subject: [PATCH 1/6] Update Rust from 1.86.0 to 1.91.1 Next core will require Rust 1.88.0 --- flake.lock | 6 +++--- scripts/rust-toolchain | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 290045b63..457cd5257 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1756197489, - "narHash": "sha256-S16rPaBH1TnMbDyL5NlGSJcYd7wPlOEWTStdBDL7BHw=", + "lastModified": 1763347184, + "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8ec04f46f1edeeed3f870da62191745b93975da7", + "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", "type": "github" }, "original": { diff --git a/scripts/rust-toolchain b/scripts/rust-toolchain index b7844a6ff..8d3947429 100644 --- a/scripts/rust-toolchain +++ b/scripts/rust-toolchain @@ -1 +1 @@ -1.86.0 +1.91.1 From bf9842e414355311701d0e45554f72c7dabc7436 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Nov 2025 15:38:43 +0100 Subject: [PATCH 2/6] we are saying Real-Time as well, so i think that should be upper cased as well, in general we upper case most key words --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 907d34e76..e2ef9aa41 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -814,9 +814,9 @@ 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 - Multi-device Mode + Multi-Device Mode Send background messages for device synchronization. Automatically enabled on adding a second device - Multi-device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling multi-device mode while using the profile on multiple devices will result in missed messages and other problems. + Multi-Device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling Multi-Device Mode while using the profile on multiple devices will result in missed messages and other problems. Move automatically to DeltaChat Folder Chat conversations are moved to avoid cluttering the Inbox Only Fetch from DeltaChat Folder From f221321e6c3e0049045f68f96fc64d364f5d6610 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Nov 2025 15:45:33 +0100 Subject: [PATCH 3/6] add missing comment --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e2ef9aa41..ab63d6845 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -814,6 +814,7 @@ 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 + Multi-Device Mode Send background messages for device synchronization. Automatically enabled on adding a second device Multi-Device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling Multi-Device Mode while using the profile on multiple devices will result in missed messages and other problems. From a48f595cf70fa035c8474fe5c2a64847f769fac4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Nov 2025 15:59:36 +0100 Subject: [PATCH 4/6] 'send background messages' -> 'exchange data' - 'backgound' term is used in many other contextes - 'messages' may also be confused with what the user usually thinks of being a 'message', similar for 'send' --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ab63d6845..2d98c2806 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -814,9 +814,9 @@ 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 - + Multi-Device Mode - Send background messages for device synchronization. Automatically enabled on adding a second device + Exchange data for device synchronization. Automatically enabled on adding a second device Multi-Device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling Multi-Device Mode while using the profile on multiple devices will result in missed messages and other problems. Move automatically to DeltaChat Folder Chat conversations are moved to avoid cluttering the Inbox From df41fa7cba2e1d8354bae660362bf35650acc889 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Nov 2025 16:02:17 +0100 Subject: [PATCH 5/6] showing password is deprected --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2d98c2806..58a8e98af 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -81,7 +81,9 @@ Always Load Remote Images Once Show Warning + Show Password + Hide Password Not now Never From 037a468332bbf84e630eb439d241707a8810c229 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Nov 2025 18:26:01 +0100 Subject: [PATCH 6/6] update wording after discussion --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 58a8e98af..0aa23c82a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -818,7 +818,7 @@ Watch Sent Folder Multi-Device Mode - Exchange data for device synchronization. Automatically enabled on adding a second device + Synchronize your messages with your other devices. Automatically enabled on adding a second device Multi-Device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling Multi-Device Mode while using the profile on multiple devices will result in missed messages and other problems. Move automatically to DeltaChat Folder Chat conversations are moved to avoid cluttering the Inbox