Merge remote-tracking branch 'origin/main' into hoc/channels-encryption-only-qrcodes

Author: Hocuri

.github/workflows/artifacts.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   artifacts-url-comments:
     name: add artifact links to pull request
-    runs-on: windows-2019
+    runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: add artifact links to pull request

.github/workflows/preview-apk.yml

@@ -2,27 +2,27 @@ name: Upload Preview APK
 
 on: pull_request
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   build:
     name: Upload Preview APK
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - uses: Swatinem/rust-cache@v2
         with:
           working-directory: jni/deltachat-core-rust
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
       - uses: android-actions/setup-android@v3
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -35,16 +35,16 @@ jobs:
         with:
           ndk-version: r27
 
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
       - name: Compile core
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
           scripts/install-toolchains.sh && scripts/ndk-make.sh
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Build APK
         run: ./gradlew --no-daemon assembleGplayDebug
 

src/main/res/values/strings.xml

@@ -471,6 +471,8 @@
     <string name="chat_no_messages">No messages.</string>
     <string name="chat_self_talk_subtitle">Messages to Self</string>
     <string name="archive_empty_hint">Archived chats will appear here.</string>
+    <!-- Action to add a message to "Saved Messages". The longer form (instead of "Save" only) is needed esp. on desktop to make clear this is not about saving a file to disk -->
+    <string name="save_message">Save Message</string>
     <string name="saved_messages">Saved Messages</string>
     <string name="saved_messages_explain">• Forward messages here for easy access\n\n• Take notes or voice memos\n\n• Attach media to save them</string>
     <!-- Should match "Saved" from "Saved messages" -->