Merge branch 'master' into develop

Localazy Download

.github/workflows/build_and_test.yaml

@@ -53,9 +53,9 @@ jobs:
         runs-on: ubuntu-24.04
         if: ${{ !cancelled() }}
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   cache: "yarn"
                   node-version: "lts/*"

.github/workflows/build_linux.yaml

@@ -105,7 +105,7 @@ jobs:
                         }
                       }
 
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-desktop
                   ref: ${{ inputs.ref }}
@@ -122,7 +122,7 @@ jobs:
                   path: |
                       ./.hak
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: .node-version
                   cache: "yarn"

.github/workflows/build_macos.yaml

@@ -75,7 +75,7 @@ jobs:
         runs-on: macos-14 # M1
         environment: ${{ inputs.sign && 'packages.element.io' || '' }}
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-desktop
                   ref: ${{ inputs.ref }}
@@ -105,7 +105,7 @@ jobs:
               with:
                   python-version: "3.13"
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: .node-version
                   cache: "yarn"

.github/workflows/build_prepare.yaml

@@ -54,9 +54,9 @@ jobs:
         outputs:
             nightly-version: ${{ steps.versions.outputs.nightly }}
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: .node-version
                   cache: "yarn"

.github/workflows/build_test.yaml

@@ -36,11 +36,11 @@ jobs:
         name: Test ${{ inputs.project }}
         runs-on: ${{ inputs.runs-on }}
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: ${{ github.repository == 'element-hq/element-web-pro' && 'element-hq/element-desktop' || github.repository }}
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: .node-version
                   cache: "yarn"

.github/workflows/build_windows.yaml

@@ -108,7 +108,7 @@ jobs:
                         }
                       }
 
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-desktop
                   ref: ${{ inputs.ref }}
@@ -148,7 +148,7 @@ jobs:
                   rustup default stable
                   rustup target add ${{ steps.config.outputs.target }}
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: .node-version
                   cache: "yarn"

.github/workflows/dockerbuild.yaml

@@ -19,7 +19,7 @@ jobs:
             contents: read
             packages: write
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
             - name: Set up QEMU
               uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
@@ -52,7 +52,7 @@ jobs:
             - name: Extract metadata for Docker
               id: meta
               if: github.event_name != 'pull_request'
-              uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
+              uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |

.github/workflows/static_analysis.yaml

@@ -9,9 +9,9 @@ jobs:
         name: "Typescript Syntax Check"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: package.json
                   cache: "yarn"
@@ -35,9 +35,9 @@ jobs:
         name: "ESLint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: package.json
                   cache: "yarn"
@@ -53,9 +53,9 @@ jobs:
         name: "Workflow Lint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: package.json
                   cache: "yarn"
@@ -71,9 +71,9 @@ jobs:
         name: "Analyse Dead Code"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+            - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
-            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+            - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
               with:
                   node-version-file: package.json
                   cache: "yarn"

.github/workflows/triage-stale.yml

@@ -12,7 +12,7 @@ jobs:
             issues: write
             pull-requests: write
         steps:
-            - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
+            - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10
               with:
                   operations-per-run: 250
                   days-before-issue-stale: -1

dockerbuild/Dockerfile

@@ -1,6 +1,6 @@
 # Docker image to facilitate building Element Desktop's native bits using a glibc version (2.31)
 # with broader compatibility, down to Debian bullseye & Ubuntu focal.
-FROM rust:bullseye@sha256:4886b155a84b46ad61df6a2249905bea8c61fc1eaa903398713233858ff6306b
+FROM rust:bullseye@sha256:f02c249a0dd84eda8a3403b6fb1a4a59fee86157f1657cb1f8baaf3d89fe2d88
 
 ENV DEBIAN_FRONTEND=noninteractive
 

package.json

@@ -88,7 +88,7 @@
         "app-builder-lib": "26.2.0",
         "chokidar": "^5.0.0",
         "detect-libc": "^2.0.0",
-        "electron": "39.2.3",
+        "electron": "39.2.6",
         "electron-builder": "26.2.0",
         "electron-builder-squirrel-windows": "26.2.0",
         "electron-devtools-installer": "^4.0.0",

src/electron-main.ts

@@ -504,11 +504,18 @@ app.on("ready", async () => {
     });
 
     global.mainWindow.webContents.on("before-input-event", (event: Event, input: Input): void => {
-        const shouldWarnBeforeExit = store.get("warnBeforeExit", true);
         const exitShortcutPressed =
             input.type === "keyDown" && exitShortcuts.some((shortcutFn) => shortcutFn(input, process.platform));
 
-        if (shouldWarnBeforeExit && exitShortcutPressed && global.mainWindow) {
+        // We only care about the exit shortcuts here
+        if (!exitShortcutPressed || !global.mainWindow) return;
+
+        // Prevent the default behaviour
+        event.preventDefault();
+
+        // Let's ask the user if they really want to exit the app
+        const shouldWarnBeforeExit = store.get("warnBeforeExit", true);
+        if (shouldWarnBeforeExit) {
             const shouldCancelCloseRequest =
                 dialog.showMessageBoxSync(global.mainWindow, {
                     type: "question",
@@ -522,11 +529,11 @@ app.on("ready", async () => {
                     defaultId: 1,
                     cancelId: 0,
                 }) === 0;
-
-            if (shouldCancelCloseRequest) {
-                event.preventDefault();
-            }
+            if (shouldCancelCloseRequest) return;
         }
+
+        // Exit the app
+        app.exit();
     });
 
     global.mainWindow.on("closed", () => {

src/i18n/strings/da.json

@@ -0,0 +1,74 @@
+{
+    "action": {
+        "cancel": "Afbryd",
+        "close": "Luk",
+        "close_brand": "Luk %(brand)s",
+        "copy": "Kopiér",
+        "cut": "Klip",
+        "delete": "Slet",
+        "edit": "Rediger",
+        "minimise": "Minimér",
+        "paste": "Indsæt",
+        "paste_match_style": "Indsæt og match stil",
+        "quit": "Luk",
+        "redo": "Omgør",
+        "select_all": "Vælg alle",
+        "show_hide": "Vis/skjul",
+        "undo": "Fortryd",
+        "zoom_in": "Zoom ind",
+        "zoom_out": "Zoom ud"
+    },
+    "common": {
+        "about": "Om",
+        "brand_help": "%(brand)sHjælp",
+        "help": "Hjælp",
+        "no": "Nej",
+        "preferences": "Indstillinger",
+        "yes": "Ja"
+    },
+    "confirm_quit": "Er du sikker på, du vil afslutte?",
+    "edit_menu": {
+        "speech": "Tale",
+        "speech_start_speaking": "Begynd at tale",
+        "speech_stop_speaking": "Stop med at tale"
+    },
+    "file_menu": {
+        "label": "Fil"
+    },
+    "icon_overlay": {
+        "description_error": "Fejl"
+    },
+    "menu": {
+        "hide": "Skjul",
+        "hide_others": "Skjul andre",
+        "services": "Tjenester",
+        "unhide": "Vis"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Tilføj til ordbog",
+        "copy_email": "Kopier e-mailadresse",
+        "copy_image": "Kopier billede",
+        "copy_image_url": "Kopier billed-adresse",
+        "copy_link_url": "Kopier linkadresse",
+        "save_image_as": "Gem billede som...",
+        "save_image_as_error_description": "Billedet kunne ikke gemmes",
+        "save_image_as_error_title": "Kunne ikke gemme billedet"
+    },
+    "store": {
+        "error": {
+            "backend_no_encryption": "Dit system har en understøttet nøglering, men kryptering er ikke tilgængelig.",
+            "unsupported_keyring": "Dit system har en ikke-understøttet nøglering, hvilket betyder at databasen ikke kan åbnes."
+        }
+    },
+    "view_menu": {
+        "actual_size": "Faktisk størrelse",
+        "toggle_developer_tools": "Skift udviklerværktøjer",
+        "toggle_full_screen": "Skift fuld skærm",
+        "view": "Vis"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Bring alt i front",
+        "label": "Vindue",
+        "zoom": "Zoom"
+    }
+}

src/i18n/strings/es.json

@@ -22,7 +22,9 @@
         "about": "Acerca de",
         "brand_help": "Ayuda sobre %(brand)s",
         "help": "Ayuda",
-        "preferences": "Preferencias"
+        "no": "No",
+        "preferences": "Preferencias",
+        "yes": "Sí"
     },
     "confirm_quit": "¿Quieres salir?",
     "edit_menu": {
@@ -57,6 +59,7 @@
     },
     "window_menu": {
         "bring_all_to_front": "Traer todas al primer plano",
-        "label": "Ventana"
+        "label": "Ventana",
+        "zoom": "Acercamiento"
     }
 }

src/i18n/strings/ko.json

@@ -0,0 +1,91 @@
+{
+    "action": {
+        "cancel": "취소",
+        "close": "닫기",
+        "close_brand": "%(brand)s 닫기",
+        "copy": "복사하기",
+        "cut": "잘라내기",
+        "delete": "삭제",
+        "edit": "편집",
+        "minimise": "최소화",
+        "paste": "붙여넣기",
+        "paste_match_style": "붙여넣고 스타일 일치",
+        "quit": "종료",
+        "redo": "되돌리기",
+        "select_all": "전체 선택",
+        "show_hide": "보이기/숨기기",
+        "undo": "실행 취소",
+        "zoom_in": "확대",
+        "zoom_out": "축소"
+    },
+    "common": {
+        "about": "정보",
+        "brand_help": "%(brand)s 도움말",
+        "help": "도움말",
+        "no": "아니오",
+        "preferences": "환경 설정",
+        "yes": "예"
+    },
+    "confirm_quit": "종료하시겠습니까?",
+    "edit_menu": {
+        "speech": "음성",
+        "speech_start_speaking": "말하기 시작하기",
+        "speech_stop_speaking": "말하기 중단하기"
+    },
+    "eol": {
+        "no_more_updates": "현재 지원되지 않는 macOS 버전을 사용 중입니다. %(brand)s 업데이트를 계속 받으시려면 운영 체제를 업그레이드해 주세요.",
+        "title": "시스템이 지원되지 않습니다",
+        "warning": "현재 지원되지 않는 macOS 버전을 사용 중입니다. %(brand)s을(를) 계속 사용하시려면 운영 체제를 업그레이드해야 합니다."
+    },
+    "file_menu": {
+        "label": "파일"
+    },
+    "icon_overlay": {
+        "description_error": "오류",
+        "description_notifications": {
+            "other": "읽지 않은 알림 %(count)s개가 있습니다"
+        }
+    },
+    "menu": {
+        "hide": "숨기기",
+        "hide_others": "다른 사람 숨기기",
+        "services": "서비스",
+        "unhide": "숨기기 취소"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "사전에 추가",
+        "copy_email": "이메일 주소 복사",
+        "copy_image": "이미지 복사",
+        "copy_image_url": "이미지 주소 복사",
+        "copy_link_url": "링크 주소 복사",
+        "save_image_as": "다음으로 이미지 저장...",
+        "save_image_as_error_description": "이미지 저장 실패",
+        "save_image_as_error_title": "이미지 저장 실패"
+    },
+    "store": {
+        "error": {
+            "backend_changed": "데이터를 지우고 다시 로드하시겠습니까?",
+            "backend_changed_detail": "시스템 키링에서 비밀에 접근할 수 없습니다. 변경된 것으로 보입니다.",
+            "backend_changed_title": "데이터베이스 로드에 실패했습니다",
+            "backend_no_encryption": "시스템에 지원되는 키링이 있지만 암호화를 사용할 수 없습니다.",
+            "backend_no_encryption_detail": "Electron이 키링 %(backend)s에서 암호화를 사용할 수 없음을 감지했습니다. 키링이 설치되어 있는지 확인하세요. 이미 설치되어 있다면, 시스템을 재부팅한 후 다시 시도해 주세요. 선택적으로 %(brand)s가 약한 형태의 암호화를 사용하도록 허용할 수 있습니다",
+            "backend_no_encryption_title": "암호화를 지원 안함",
+            "unsupported_keyring": "시스템에 지원되지 않는 키링이 존재하여 데이터베이스를 열 수 없습니다.",
+            "unsupported_keyring_detail": "Electron의 키링 감지 기능이 지원되는 백엔드를 찾지 못했습니다. 명령줄 인수를 사용하여 %(brand)s 를 시작함으로써 백엔드를 수동으로 구성해 볼 수 있습니다. 이는 일회성 작업입니다. 자세한 내용은 %(link)s 를 참조하십시오.",
+            "unsupported_keyring_title": "시스템이 지원되지 않습니다",
+            "unsupported_keyring_use_basic_text": "암호화 수준 낮게 사용",
+            "unsupported_keyring_use_plaintext": "암호화를 사용하지 마십시오"
+        }
+    },
+    "view_menu": {
+        "actual_size": "실제 크기",
+        "toggle_developer_tools": "개발자 도구 전환",
+        "toggle_full_screen": "전체 화면으로 전환",
+        "view": "보기"
+    },
+    "window_menu": {
+        "bring_all_to_front": "모두 맨 앞으로 가져오기",
+        "label": "창",
+        "zoom": "확대/축소"
+    }
+}

src/i18n/strings/pl.json

@@ -73,7 +73,7 @@
             "backend_no_encryption_detail": "Elektron wykrył, że szyfrowanie nie jest dostępne w twoim keyring'u %(backend)s. Upewnij się, że keyring został zainstalowany. Jeśli tak, uruchom ponownie urządzenie i spróbuj ponownie. Opcjonalnie, zezwól %(brand)s, aby korzystał ze słabszego szyfrowania.",
             "backend_no_encryption_title": "Szyfrowanie nie jest obsługiwane",
             "unsupported_keyring": "System zawiera niewspierany keyring, nie można otworzyć bazy danych.",
-            "unsupported_keyring_detail": "Wykrywanie keyringu Electron nie znalazł wspieranego backendu. Możesz spróbować ręcznie ustawić backed, uruchamiając %(brand)s za pomocą wiesza poleceń. Zobacz %(link)s.",
+            "unsupported_keyring_detail": "Wykrywanie breloków firmy Electron nie znalazło obsługiwanego zaplecza. Możesz spróbować ręcznie skonfigurować zaplecze, zaczynając od argumentu %(brand)s wiersza polecenia, operacji jednorazowej. Widzieć%(link)s.",
             "unsupported_keyring_title": "System niewspierany",
             "unsupported_keyring_use_basic_text": "Użyj słabszego szyfrowania",
             "unsupported_keyring_use_plaintext": "Nie używaj szyfrowania"

src/i18n/strings/uk.json

@@ -33,7 +33,9 @@
         "speech_stop_speaking": "Припинити говорити"
     },
     "eol": {
-        "title": "Система не підтримується"
+        "no_more_updates": "Ви використовуєте непідтримувану версію macOS. Оновіть її, щоб отримати оновлення %(brand)s.",
+        "title": "Система не підтримується",
+        "warning": "Ви використовуєте непідтримувану версію macOS. Оновіть систему, щоб забезпечити безперебійну роботу %(brand)s."
     },
     "file_menu": {
         "label": "Файл"