duh

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

.eslintrc-test.js

@@ -2,11 +2,11 @@ module.exports = {
     plugins: ["matrix-org"],
     extends: [".eslintrc.js"],
     parserOptions: {
-        project: ["test/tsconfig.json"],
+        project: ["playwright/tsconfig.json"],
     },
     overrides: [
         {
-            files: ["test/**/*.ts"],
+            files: ["playwright/**/*.ts"],
             extends: ["plugin:matrix-org/typescript"],
             rules: {
                 // Things we do that break the ideal style

.github/CODEOWNERS

@@ -1,4 +1,5 @@
-*                         @vector-im/element-web
-/.github/workflows/**     @vector-im/element-web-app-team
-/package.json             @vector-im/element-web-app-team
-/yarn.lock                @vector-im/element-web-app-team
+*                         @element-hq/element-web-reviewers
+/.github/workflows/**     @element-hq/element-web-team
+/package.json             @element-hq/element-web-team
+/yarn.lock                @element-hq/element-web-team
+/src/i18n/strings

.github/ISSUE_TEMPLATE/bug-desktop.yml

@@ -0,0 +1,76 @@
+name: Bug report for the Element desktop app (not in a browser)
+description: File a bug report if you are using the desktop Element application.
+labels: [T-Defect]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to fill out this bug report!
+
+              Please report security issues by email to security@matrix.org
+    - type: textarea
+      id: reproduction-steps
+      attributes:
+          label: Steps to reproduce
+          description: Please attach screenshots, videos or logs if you can.
+          placeholder: Tell us what you see!
+          value: |
+              1. Where are you starting? What can you see?
+              2. What do you click?
+              3. More steps…
+      validations:
+          required: true
+    - type: textarea
+      id: result
+      attributes:
+          label: Outcome
+          placeholder: Tell us what went wrong
+          value: |
+              #### What did you expect?
+
+              #### What happened instead?
+      validations:
+          required: true
+    - type: input
+      id: os
+      attributes:
+          label: Operating system
+          placeholder: Windows, macOS, Ubuntu, Arch Linux…
+      validations:
+          required: false
+    - type: input
+      id: version
+      attributes:
+          label: Application version
+          description: You can find the version information in Settings -> Help & About.
+          placeholder: e.g. Element version 1.7.34, olm version 3.2.3
+      validations:
+          required: false
+    - type: input
+      id: source
+      attributes:
+          label: How did you install the app?
+          description: Where did you install the app from? Please give a link or a description.
+          placeholder: e.g. From https://element.io/get-started
+      validations:
+          required: false
+    - type: input
+      id: homeserver
+      attributes:
+          label: Homeserver
+          description: |
+              Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
+          placeholder: e.g. matrix.org or Synapse 1.50.0rc1
+      validations:
+          required: false
+    - type: dropdown
+      id: rageshake
+      attributes:
+          label: Will you send logs?
+          description: |
+              Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
+          options:
+              - "Yes"
+              - "No"
+      validations:
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,36 @@
+name: Enhancement request
+description: Do you have a suggestion or feature request?
+labels: [T-Enhancement]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
+    - type: textarea
+      id: usecase
+      attributes:
+          label: Your use case
+          description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
+          placeholder: Tell us what you would like to do!
+          value: |
+              #### What would you like to do?
+
+              #### Why would you like to do it?
+
+              #### How would you like to achieve it?
+      validations:
+          required: true
+    - type: textarea
+      id: alternative
+      attributes:
+          label: Have you considered any alternatives?
+          placeholder: A clear and concise description of any alternative solutions or features you've considered.
+      validations:
+          required: false
+    - type: textarea
+      id: additional-context
+      attributes:
+          label: Additional context
+          placeholder: Is there anything else you'd like to add?
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/please-don-t-file-issues-here---use-the-element-web-project.md

@@ -1,10 +0,0 @@
----
-name: Please don't file issues here - use the element-web project
-about: Please don't file issues here - use the element-web project
-title: Please don't file issues here - use the element-web project
-labels: ''
-assignees: ''
-
----
-
-Please don't file issues here - use the [element-web project](https://github.com/vector-im/element-web/issues/)

.github/labels.yml

@@ -0,0 +1,31 @@
+- name: "A-Install"
+  color: "72A447"
+- name: "A-Seshat"
+  color: "8262BE"
+- name: "A-Update"
+  color: "17BE67"
+- name: "Story"
+  description: "A change to the product that generates user value on its own. Unit of delivery."
+  color: "0BAC47"
+- name: "X-Breaking-Change"
+  color: "ff7979"
+- name: "Z-Arch"
+  color: "D601BE"
+- name: "Z-ARM"
+  color: "5DEC5B"
+- name: "Z-Flatpak"
+  color: "0CA856"
+- name: "Z-Linux"
+  color: "7B4A9C"
+- name: "Z-macOS"
+  color: "500605"
+- name: "Z-Official"
+  color: "1D2B20"
+- name: "Z-Snap"
+  color: "29CD95"
+- name: "Z-Suse"
+  color: "79D07B"
+- name: "Z-Wayland"
+  color: "94C519"
+- name: "Z-Windows"
+  color: "0632DE"

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: element-hq/element-web

.github/workflows/backport.yml

@@ -23,7 +23,7 @@ jobs:
               )
             )
         steps:
-            - uses: tibdex/backport@v2
+            - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2
               with:
                   labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
                   # We can't use GITHUB_TOKEN here or CI won't run on the new PR

.github/workflows/build_and_deploy.yaml

@@ -3,6 +3,9 @@ on:
     # Nightly build
     schedule:
         - cron: "0 9 * * *"
+    # Release build
+    release:
+        types: [published]
     # Manual nightly & release
     workflow_dispatch:
         inputs:
@@ -19,13 +22,8 @@ on:
                 required: true
                 type: boolean
                 default: true
-            windows_32bit:
-                description: Build Windows 32-bit
-                required: true
-                type: boolean
-                default: true
-            windows_64bit:
-                description: Build Windows 64-bit
+            windows:
+                description: Build Windows
                 required: true
                 type: boolean
                 default: true
@@ -39,6 +37,7 @@ on:
                 required: true
                 type: boolean
                 default: true
+run-name: Element ${{ inputs.mode != 'release' && github.event_name != 'release' && 'Nightly' || 'Desktop' }}
 concurrency: ${{ github.workflow }}
 env:
     R2_BUCKET: ${{ vars.R2_BUCKET }}
@@ -46,36 +45,27 @@ jobs:
     prepare:
         uses: ./.github/workflows/build_prepare.yaml
         with:
-            config: element.io/${{ inputs.mode || 'nightly' }}
-            version: ${{ inputs.mode == 'release' && '' || 'develop' }}
-            nightly: ${{ inputs.mode != 'release' }}
+            config: element.io/${{ inputs.mode || (github.event_name == 'release' && 'release') || 'nightly' }}
+            version: ${{ (inputs.mode != 'release' && github.event_name != 'release') && 'develop' || '' }}
+            nightly: ${{ inputs.mode != 'release' && github.event_name != 'release' }}
+            deploy: ${{ inputs.deploy || (github.event_name != 'workflow_dispatch' && github.event.release.prerelease != true) }}
         secrets:
             CF_R2_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
             CF_R2_TOKEN: ${{ secrets.CF_R2_TOKEN }}
 
-    windows_32bit:
-        if: github.event_name != 'workflow_dispatch' || inputs.windows_32bit
+    windows:
+        if: github.event_name != 'workflow_dispatch' || inputs.windows
         needs: prepare
-        name: Windows 32-bit
+        name: Windows ${{ matrix.arch }}
+        strategy:
+            matrix:
+                arch: [ia32, x64]
         uses: ./.github/workflows/build_windows.yaml
         secrets: inherit
         with:
             sign: true
-            deploy-mode: true
-            arch: x86
-            version: ${{ needs.prepare.outputs.win32-x86-version }}
-
-    windows_64bit:
-        if: github.event_name != 'workflow_dispatch' || inputs.windows_64bit
-        needs: prepare
-        name: Windows 64-bit
-        uses: ./.github/workflows/build_windows.yaml
-        secrets: inherit
-        with:
-            sign: true
-            deploy-mode: true
-            arch: x64
-            version: ${{ needs.prepare.outputs.win32-x64-version }}
+            arch: ${{ matrix.arch }}
+            version: ${{ needs.prepare.outputs.nightly-version }}
 
     macos:
         if: github.event_name != 'workflow_dispatch' || inputs.macos
@@ -85,78 +75,170 @@ jobs:
         secrets: inherit
         with:
             sign: true
-            deploy-mode: true
-            base-url: https://packages.element.io/${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
-            version: ${{ needs.prepare.outputs.macos-version }}
+            base-url: https://packages.element.io/${{ needs.prepare.outputs.packages-dir }}
+            version: ${{ needs.prepare.outputs.nightly-version }}
 
-    # We do not put this call into deploy-mode as we do not want it to add to the packages.element.io artifact
-    # We ship this build via reprepro only
     linux:
         if: github.event_name != 'workflow_dispatch' || inputs.linux
         needs: prepare
-        name: Linux (sqlcipher system)
+        name: Linux ${{ matrix.arch }} (sqlcipher ${{ matrix.sqlcipher }})
+        strategy:
+            matrix:
+                arch: [amd64, arm64]
+                sqlcipher: [system, static]
+                exclude:
+                    - arch: arm64
+                      sqlcipher: static
         uses: ./.github/workflows/build_linux.yaml
         with:
-            config: element.io/${{ inputs.mode || 'nightly' }}
-            sqlcipher: system
-            version: ${{ needs.prepare.outputs.linux-version }}
+            arch: ${{ matrix.arch }}
+            config: ${{ needs.prepare.outputs.config }}
+            sqlcipher: ${{ matrix.sqlcipher }}
+            version: ${{ needs.prepare.outputs.nightly-version }}
 
-    # We ship the static build via static tarball only
-    linux_static:
-        if: github.event_name != 'workflow_dispatch' || inputs.linux
-        needs: prepare
-        name: Linux (sqlcipher static)
-        uses: ./.github/workflows/build_linux.yaml
-        with:
-            deploy-mode: true
-            config: element.io/${{ inputs.mode || 'nightly' }}
-            sqlcipher: static
-            version: ${{ needs.prepare.outputs.linux-version }}
-
-    # This deploy job only handles Windows, macOS & linux_static as those are stateless and static.
-    # Linux will be deployed via reprepro after it, but we list it as a dependency to abort if it fails.
     deploy:
         needs:
+            - prepare
             - macos
             - linux
-            - linux_static
-            - windows_32bit
-            - windows_64bit
+            - windows
         runs-on: ubuntu-latest
-        name: Deploy
-        if: github.event_name != 'workflow_dispatch' || (inputs.deploy && (inputs.macos || inputs.windows_32bit || inputs.windows_64bit))
-        environment: packages.element.io
+        name: ${{ needs.prepare.outputs.deploy && 'Deploy' || 'Deploy (dry-run)' }}
+        if: always() && !failure() && !cancelled()
+        environment: ${{ needs.prepare.outputs.deploy && 'packages.element.io' || '' }}
         steps:
             - name: Download artifacts
-              uses: actions/download-artifact@v3
+              uses: actions/download-artifact@v4
+
+            - name: Prepare artifacts for deployment
+              run: |
+                  # Windows
+                  for arch in x64 ia32 arm64
+                  do
+                      if [ -d "win-$arch" ]; then
+                          mkdir -p packages.element.io/{install,update}/win32/$arch
+                          mv win-$arch/squirrel-windows*/*.exe "packages.element.io/install/win32/$arch/"
+                          mv win-$arch/squirrel-windows*/*.nupkg "packages.element.io/update/win32/$arch/"
+                          mv win-$arch/squirrel-windows*/RELEASES "packages.element.io/update/win32/$arch/"
+                      fi
+                  done
+
+                  # macOS
+                  if [ -d macos ]; then
+                      mkdir -p packages.element.io/{install,update}/macos
+                      mv macos/*.dmg packages.element.io/install/macos/
+                      mv macos/*-mac.zip packages.element.io/update/macos/
+                      mv macos/*.json packages.element.io/update/macos/
+                  fi
+
+                  # Linux
+                  if [ -d linux-amd64-sqlcipher-static ]; then
+                      mkdir -p packages.element.io/install/linux/glibc-x86-64
+                      mv linux-amd64-sqlcipher-static/*.tar.gz packages.element.io/install/linux/glibc-x86-64
+                  fi
+
+            # We don't wish to store the installer for every nightly ever, so we only keep the latest
+            - name: "[Nightly] Strip version from installer file"
+              if: needs.prepare.outputs.nightly-version != ''
+              run: |
+                  # Windows
+                  for arch in x64 ia32 arm64
+                  do
+                      [ -d "win-$arch" ] && mv packages.element.io/install/win32/$arch/{*,"Element Nightly Setup"}.exe
+                  done
+
+                  # macOS
+                  [ -d macos ] && mv packages.element.io/install/macos/{*,"Element Nightly"}.dmg
+
+                  # Linux
+                  [ -d linux-amd64-sqlcipher-static ] && mv packages.element.io/install/linux/glibc-x86-64/{*,element-desktop-nightly}.tar.gz
+
+            - name: "[Release] Prepare release latest symlink"
+              if: needs.prepare.outputs.nightly-version == ''
+              run: |
+                  # Windows
+                  for arch in x64 ia32 arm64
+                  do
+                      if [ -d "win-$arch" ]; then
+                          pushd packages.element.io/install/win32/$arch
+                          ln -s "$(find . -type f -iname "*.exe" | xargs -0 -n1 -- basename)" "Element Setup.exe"
+                          popd
+                      fi
+                  done
+
+                  # macOS
+                  if [ -d macos ]; then
+                      pushd packages.element.io/install/macos
+                      ln -s "$(find . -type f -iname "*.dmg" | xargs -0 -n1 -- basename)" "Element.dmg"
+                      popd
+                  fi
+
+                  # Linux
+                  if [ -d linux-amd64-sqlcipher-static ]; then
+                      pushd packages.element.io/install/linux/glibc-x86-64
+                      ln -s "$(find . -type f -iname "*.tar.gz" | xargs -0 -n1 -- basename)" "element-desktop.tar.gz"
+                      popd
+                  fi
+
+            - name: Stash packages.element.io
+              if: ${{ !needs.prepare.outputs.deploy }}
+              uses: actions/upload-artifact@v4
               with:
                   name: packages.element.io
                   path: packages.element.io
 
             - name: Deploy artifacts
+              if: needs.prepare.outputs.deploy
               run: |
                   aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
                   R2_URL: ${{ vars.CF_R2_S3_API }}
-                  DEPLOYMENT_DIR: ${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
+                  DEPLOYMENT_DIR: ${{ needs.prepare.outputs.packages-dir }}
 
             - name: Notify packages.element.io of new files
-              uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
+              if: needs.prepare.outputs.deploy
+              uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: vector-im/packages.element.io
+                  repository: element-hq/packages.element.io
                   event-type: packages-index
 
-    reprepro:
-        needs:
-            - linux
-            # We queue this after the other deploy stage as we want to abort if that fails
-            - deploy
-        name: Run reprepro
-        if: github.event_name != 'workflow_dispatch' || (inputs.deploy && inputs.linux)
-        uses: ./.github/workflows/reprepro.yaml
-        secrets: inherit
-        with:
-            artifact-name: linux-sqlcipher-system
+            - name: Find debs
+              id: deb
+              if: needs.linux.result == 'success'
+              run: |
+                  for arch in amd64 arm64
+                  do
+                      echo "$arch=$(ls linux-$arch-sqlcipher-system/*.deb | tail -n1)" >> $GITHUB_OUTPUT
+                  done
+
+            - name: Stash debs
+              if: ${{ !needs.prepare.outputs.deploy && needs.linux.result == 'success' }}
+              uses: actions/upload-artifact@v4
+              with:
+                  name: debs
+                  path: |
+                      ${{ steps.deb.outputs.amd64 }}
+                      ${{ steps.deb.outputs.arm64 }}
+
+            - name: Publish amd64 deb to packages.element.io
+              uses: element-hq/packages.element.io@master
+              if: needs.prepare.outputs.deploy && needs.linux.result == 'success'
+              with:
+                  file: ${{ steps.deb.outputs.amd64 }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  bucket-api: ${{ vars.CF_R2_S3_API }}
+                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}
+
+            - name: Publish arm64 deb to packages.element.io
+              uses: element-hq/packages.element.io@master
+              if: needs.prepare.outputs.deploy && needs.linux.result == 'success'
+              with:
+                  file: ${{ steps.deb.outputs.arm64 }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  bucket-api: ${{ vars.CF_R2_S3_API }}
+                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}

.github/workflows/build_and_test.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: ./.github/workflows/build_windows.yaml
         strategy:
             matrix:
-                arch: [x64, x86]
+                arch: [x64, ia32]
         with:
             arch: ${{ matrix.arch }}
 
@@ -37,17 +37,17 @@ jobs:
             REGISTRY: ghcr.io
             IMAGE_NAME: ${{ github.repository }}-dockerbuild-pr
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@79adacd43ea069e57037edc891ea8d33013bc3da # v35
+              uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f # v41
               with:
                   files: |
-                      dockerbuild/*
+                      dockerbuild/**
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -63,7 +63,7 @@ jobs:
 
             - name: Build and push Docker image
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: dockerbuild
                   push: true
@@ -73,15 +73,22 @@ jobs:
         needs:
             - fetch
             - linux_docker
-        name: Linux
+        name: "Linux (${{ matrix.arch }}) (sqlcipher: ${{ matrix.sqlcipher }})"
         uses: ./.github/workflows/build_linux.yaml
         strategy:
             matrix:
                 sqlcipher: [system, static]
+                arch: [amd64, arm64]
+                exclude:
+                    # FIXME: This combination yields a broken Seshat at this time
+                    # Errors at launch with `undefined symbol: PKCS5_PBKDF2_HMAC
+                    - arch: arm64
+                      sqlcipher: static
         with:
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
             docker-image: ${{ needs.linux_docker.outputs.docker-image }}
+            arch: ${{ matrix.arch }}
 
     macos:
         needs: fetch
@@ -99,21 +106,26 @@ jobs:
                     - name: macOS Universal
                       os: macos
                       artifact: macos
-                      executable: "./dist/mac-universal/Element.app/Contents/MacOS/Element"
-                      prepare_cmd: "find ./dist/mac-universal/Element.app -type f | perl -lne 'print if -B' | tr '\\n' '\\0' | xargs -0 -n1 chmod 755"
-                    - name: "Linux (sqlcipher: system)"
+                      executable: "/Users/runner/Applications/Element.app/Contents/MacOS/Element"
+                      # We need to mount the DMG and copy the app to the Applications folder as a mounted DMG is
+                      # read-only and thus would not allow us to override the fuses as is required for Playwright.
+                      prepare_cmd: |
+                          hdiutil attach ./dist/*.dmg -mountpoint /Volumes/Element &&
+                          rsync -a /Volumes/Element/Element.app ~/Applications/ &&
+                          hdiutil detach /Volumes/Element
+                    - name: "Linux (amd64) (sqlcipher: system)"
                       os: ubuntu
-                      artifact: linux-sqlcipher-system
-                      executable: "element-desktop"
+                      artifact: linux-amd64-sqlcipher-system
+                      executable: "/opt/Element/element-desktop"
                       prepare_cmd: "sudo apt install ./dist/*.deb"
-                    - name: "Linux (sqlcipher: static)"
+                    - name: "Linux (amd64) (sqlcipher: static)"
                       os: ubuntu
-                      artifact: linux-sqlcipher-static
-                      executable: "element-desktop"
+                      artifact: linux-amd64-sqlcipher-static
+                      executable: "/opt/Element/element-desktop"
                       prepare_cmd: "sudo apt install ./dist/*.deb"
                     - name: Windows (x86)
                       os: windows
-                      artifact: win-x86
+                      artifact: win-ia32
                       executable: "./dist/win-ia32-unpacked/Element.exe"
                     - name: Windows (x64)
                       os: windows
@@ -122,16 +134,17 @@ jobs:
         name: Test ${{ matrix.name }}
         runs-on: ${{ matrix.os }}-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             - name: Install Deps
               run: "yarn install --frozen-lockfile"
 
-            - uses: actions/download-artifact@v3
+            - uses: actions/download-artifact@v4
               with:
                   name: ${{ matrix.artifact }}
                   path: dist
@@ -140,18 +153,26 @@ jobs:
               run: ${{ matrix.prepare_cmd }}
               if: matrix.prepare_cmd
 
+            # We previously disabled the `EnableNodeCliInspectArguments` fuse, but Playwright requires
+            # it to be enabled to test Electron apps, so turn it back on.
+            - name: Set EnableNodeCliInspectArguments fuse enabled
+              run: $RUN_AS npx @electron/fuses write --app ${{ matrix.executable }} EnableNodeCliInspectArguments=on
+              shell: bash
+              env:
+                  # We need sudo on Linux as it is installed in /opt/
+                  RUN_AS: ${{ runner.os == 'Linux' && 'sudo' || '' }}
+
             - name: Run tests
               uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1
               timeout-minutes: 5
               with:
-                  run: "yarn test"
+                  run: "yarn test ${{ runner.os != 'Linux' && '--ignore-snapshots' || '' }}"
               env:
                   ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}
 
-            - name: Upload Artifacts
-              uses: actions/upload-artifact@v3
-              if: always()
+            - name: Upload HTML report
+              uses: actions/upload-artifact@v4
               with:
-                  name: ${{ matrix.artifact }}
-                  path: test_artifacts
-                  retention-days: 1
+                  name: ${{ matrix.artifact }}-test
+                  path: playwright-report
+                  retention-days: 14

.github/workflows/build_linux.yaml

@@ -4,6 +4,10 @@
 on:
     workflow_call:
         inputs:
+            arch:
+                type: string
+                required: true
+                description: "The architecture to build for, one of 'amd64' | 'arm64'"
             config:
                 type: string
                 required: true
@@ -16,26 +20,40 @@ on:
                 type: string
                 required: true
                 description: "How to link sqlcipher, one of 'system' | 'static'"
-            deploy-mode:
-                type: boolean
-                required: false
-                description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones"
             docker-image:
                 type: string
                 required: false
-                description: "The docker image to use for the build, defaults to ghcr.io/vector-im/element-desktop-dockerbuild"
+                description: "The docker image to use for the build, defaults to ghcr.io/element-hq/element-desktop-dockerbuild"
 jobs:
     build:
         runs-on: ubuntu-latest
         container:
-            image: ${{ inputs.docker-image || format('ghcr.io/vector-im/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
+            image: ${{ inputs.docker-image || format('ghcr.io/element-hq/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
         defaults:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: kanga333/variable-mapper@master
+              id: config
+              with:
+                  key: "${{ inputs.arch }}"
+                  export_to: output
+                  map: |
+                      {
+                        "amd64": {
+                          "target": "x86_64-unknown-linux-gnu",
+                          "arch": "x86-64"
+                        },
+                        "arm64": {
+                          "target": "aarch64-unknown-linux-gnu",
+                          "arch": "aarch64",
+                          "build-args": "--arm64"
+                        }
+                      }
 
-            - uses: actions/download-artifact@v3
+            - uses: actions/checkout@v4
+
+            - uses: actions/download-artifact@v4
               with:
                   name: webapp
 
@@ -43,12 +61,13 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
               env:
                   # Workaround for https://github.com/actions/setup-node/issues/317
@@ -58,84 +77,75 @@ jobs:
             - name: Install Deps
               run: "yarn install --frozen-lockfile"
 
+            - name: Prepare for static sqlcipher build
+              if: inputs.sqlcipher == 'static'
+              run: |
+                  echo "SQLCIPHER_BUNDLED=1" >> $GITHUB_ENV
+
+            # Ideally the docker image would be ready for cross-compilation but libsqlcipher-dev is not Multi-Arch compatible
+            # https://unix.stackexchange.com/a/349359
+            - name: Prepare for cross compilation
+              if: steps.cache.outputs.cache-hit != 'true' && inputs.arch == 'arm64'
+              run: |
+                  set -x
+                  dpkg --add-architecture arm64
+                  apt-get -qq update
+                  apt-get -qq install --no-install-recommends crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64
+                  rustup target add aarch64-unknown-linux-gnu
+                  mv dockerbuild/aarch64/.cargo .
+                  cat dockerbuild/aarch64/.env >> $GITHUB_ENV
+
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run: "yarn build:native"
-              env:
-                  SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
+              run: "yarn build:native --target ${{ steps.config.outputs.target }}"
 
             - name: "[Nightly] Resolve version"
-              id: nightly
               if: inputs.version != ''
               run: |
-                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
+                  echo "ED_NIGHTLY=${{ inputs.version }}" >> $GITHUB_ENV
 
             - name: Generate debian files and arguments
-              id: debian
               run: |
                   if [ -f changelog.Debian ]; then
-                      echo "config-args=--deb-changelog changelog.Debian" >> $GITHUB_OUTPUT
+                      echo "ED_DEBIAN_CHANGELOG=changelog.Debian" >> $GITHUB_ENV
                   fi
 
-                  cp "$DIR/control.template" debcontrol
-                  VERSION=${INPUT_VERSION:-$(cat package.json | jq -r .version)}
-                  echo "Version: $VERSION" >> debcontrol
-              env:
-                  DIR: ${{ inputs.config }}
-                  INPUT_VERSION: ${{ inputs.version }}
-
             - name: Build App
               run: |
-                  npx ts-node scripts/generate-builder-config.ts \
-                      ${{ steps.nightly.outputs.config-args }} \
-                      ${{ steps.debian.outputs.config-args }} \
-                      --deb-custom-control=debcontrol
-                  yarn build --publish never -l --config electron-builder.json
+                  yarn build --publish never -l ${{ steps.config.outputs.build-args }}
 
-            - name: Check ldd
+            - name: Check native libraries
               run: |
-                  ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node
-                  if [ "$SQLCIPHER_STATIC" == "1" ]; then
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libsqlcipher.so.0
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libcrypto.so.1.1
+                  set -x
+                  shopt -s globstar
+
+                  FILES=$(file dist/**/*.node)
+                  echo "$FILES"
+
+                  if [ grep -v "$ARCH" ]; then
+                      exit 1
+                  fi
+
+                  LIBS=$(readelf -d dist/**/*.node | grep NEEDED)
+                  echo "$LIBS"
+
+                  set +x
+                  assert_contains_string() { [[ "$1" == *"$2"* ]]; }
+                  ! assert_contains_string "$LIBS" "libcrypto.so.1.1"
+                  if [ "$SQLCIPHER_BUNDLED" == "1" ]; then
+                      ! assert_contains_string "$LIBS" "libsqlcipher.so.0"
                   else
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libsqlcipher.so.0
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libcrypto.so.1.1
+                      assert_contains_string "$LIBS" "libsqlcipher.so.0"
                   fi
               env:
-                  SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
-
-            - name: Stash deb package
-              if: inputs.deploy-mode
-              uses: actions/upload-artifact@v3
-              with:
-                  name: linux-sqlcipher-${{ inputs.sqlcipher }}-deb
-                  path: dist/*.deb
-                  retention-days: 1
-
-            - name: Prepare artifacts for deployment
-              if: inputs.deploy-mode
-              run: |
-                  mv dist _dist
-                  mkdir -p "dist/install/linux/glibc-x86-64/"
-                  mv _dist/*.tar.gz "dist/install/linux/glibc-x86-64"
-
-            # We don't wish to store the tarball for every nightly ever, so we only keep the latest
-            - name: "[Nightly] Strip version from tarball"
-              if: inputs.deploy-mode && inputs.version != ''
-              run: |
-                  mv dist/install/linux/glibc-x86-64/*.tar.gz "dist/install/linux/glibc-x86-64/element-desktop-nightly.tar.gz"
-
-            - name: "[Release] Prepare release latest symlink"
-              if: inputs.deploy-mode && inputs.version == ''
-              shell: bash
-              run: |
-                  ln -s "$(find . -type f -iname "*.tar.gz" | xargs -0 -n1 -- basename)" "element-desktop.tar.gz"
-              working-directory: "dist/install/linux/glibc-x86-64"
+                  ARCH: ${{ steps.config.outputs.arch }}
 
+            # We exclude *-unpacked as it loses permissions and the tarball contains it with correct permissions
             - name: Upload Artifacts
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-sqlcipher-{0}', inputs.sqlcipher) }}
-                  path: dist
+                  name: linux-${{ inputs.arch }}-sqlcipher-${{ inputs.sqlcipher }}
+                  path: |
+                      dist
+                      !dist/*-unpacked/**
                   retention-days: 1

.github/workflows/build_macos.yaml

@@ -23,22 +23,18 @@ on:
                 type: string
                 required: false
                 description: "Whether to sign & notarise the build, requires 'packages.element.io' environment"
-            deploy-mode:
-                type: boolean
-                required: false
-                description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones"
             base-url:
                 type: string
                 required: false
-                description: "The URL to which the output will be deployed, required if deploy-mode is enabled."
+                description: "The URL to which the output will be deployed."
 jobs:
     build:
         runs-on: macos-latest
         environment: ${{ inputs.sign && 'packages.element.io' || '' }}
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/download-artifact@v3
+            - uses: actions/download-artifact@v4
               with:
                   name: webapp
 
@@ -46,20 +42,20 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
             - name: Install Rust
               if: steps.cache.outputs.cache-hit != 'true'
-              uses: actions-rs/toolchain@v1
-              with:
-                  default: true
-                  toolchain: stable
-                  target: aarch64-apple-darwin
+              run: |
+                  rustup toolchain install stable --profile minimal --no-self-update
+                  rustup default stable
+                  rustup target add aarch64-apple-darwin
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             # Does not need branch matching as only analyses this layer
@@ -68,21 +64,23 @@ jobs:
 
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run: "yarn build:native:universal"
+              run: |
+                  # Python 3.12 drops distutils which keytar relies on
+                  pip3 install setuptools
+                  yarn build:native:universal
 
             - name: "[Nightly] Resolve version"
-              id: nightly
               if: inputs.version != ''
               run: |
-                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
+                  echo "ED_NIGHTLY=${{ inputs.version }}" >> $GITHUB_ENV
 
             # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string
             - name: "[Signed] Build App"
               if: inputs.sign != ''
               run: |
-                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }} --notarytool-team-id='${{ secrets.APPLE_TEAM_ID }}'
-                  yarn build:universal --publish never --config electron-builder.json
+                  yarn build:universal --publish never
               env:
+                  ED_NOTARYTOOL_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
                   APPLE_ID: ${{ secrets.APPLE_ID }}
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
                   CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
@@ -91,27 +89,21 @@ jobs:
             - name: Check app was signed & notarised successfully
               if: inputs.sign != ''
               run: |
-                  hdiutil attach dist/*.dmg
-                  codesign -dv --verbose=4 /Volumes/Element*/*.app
-                  spctl -a -vvv -t install /Volumes/Element*/*.app
-                  hdiutil detach /Volumes/Element*
+                  hdiutil attach dist/*.dmg -mountpoint /Volumes/Element
+                  codesign -dv --verbose=4 /Volumes/Element/*.app
+                  spctl -a -vvv -t install /Volumes/Element/*.app
+                  hdiutil detach /Volumes/Element
 
             - name: "[Unsigned] Build App"
               if: inputs.sign == ''
               run: |
-                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }}
-                  yarn build:universal --publish never --config electron-builder.json
+                  yarn build:universal --publish never
               env:
                   CSC_IDENTITY_AUTO_DISCOVERY: false
 
-            - name: Prepare artifacts for deployment
-              if: inputs.deploy-mode
+            - name: Generate releases.json
+              if: inputs.base-url
               run: |
-                  mv dist _dist
-                  mkdir -p dist/install/macos dist/update/macos
-                  mv _dist/*-mac.zip dist/update/macos/
-                  mv _dist/*.dmg dist/install/macos/
-
                   PKG_JSON_VERSION=$(cat package.json | jq -r .version)
                   LATEST=$(find dist -type f -iname "*-mac.zip" | xargs -0 -n1 -- basename)
                   # Encode spaces in the URL as Squirrel.Mac complains about bad JSON otherwise
@@ -128,28 +120,19 @@ jobs:
                         },
                       }],
                     }
-                  ' > dist/update/macos/releases.json
+                  ' > dist/releases.json
                   jq -n --arg url "$URL" '
                     { url: $url }
-                  ' > dist/update/macos/releases-legacy.json
+                  ' > dist/releases-legacy.json
               env:
                   VERSION: ${{ inputs.version }}
 
-            # We don't wish to store the installer for every nightly ever, so we only keep the latest
-            - name: "[Nightly] Strip version from installer file"
-              if: inputs.deploy-mode && inputs.version != ''
-              run: |
-                  mv dist/install/macos/*.dmg "dist/install/macos/Element Nightly.dmg"
-
-            - name: "[Release] Prepare release latest symlink"
-              if: inputs.deploy-mode && inputs.version == ''
-              run: |
-                  ln -s "$(find . -type f -iname "*.dmg" | xargs -0 -n1 -- basename)" "Element.dmg"
-              working-directory: "dist/install/macos"
-
+            # We exclude mac-universal as the unpacked app takes forever to upload and zip and dmg already contains it
             - name: Upload Artifacts
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: ${{ inputs.deploy-mode && 'packages.element.io' || 'macos' }}
-                  path: dist
+                  name: macos
+                  path: |
+                      dist
+                      !dist/mac-universal/**
                   retention-days: 1

.github/workflows/build_prepare.yaml

@@ -15,6 +15,11 @@ on:
                 required: false
                 default: false
                 description: "Whether the build is a Nightly and to calculate the version strings new builds should use"
+            deploy:
+                type: boolean
+                required: false
+                default: false
+                description: "Whether the build should be deployed to production"
         secrets:
             # Required if `nightly` is set
             CF_R2_ACCESS_KEY_ID:
@@ -23,33 +28,32 @@ on:
             CF_R2_TOKEN:
                 required: false
         outputs:
-            macos-version:
-                description: "The version string the next macOS Nightly should use, only output for nightly"
-                value: ${{ jobs.prepare.outputs.macos-version }}
-            linux-version:
-                description: "The version string the next Linux Nightly should use, only output for nightly"
-                value: ${{ jobs.prepare.outputs.linux-version }}
-            win32-x64-version:
-                description: "The version string the next Windows x64 Nightly should use, only output for nightly"
-                value: ${{ jobs.prepare.outputs.win32-x64-version }}
-            win32-x86-version:
-                description: "The version string the next Windows x86 Nightly should use, only output for nightly"
-                value: ${{ jobs.prepare.outputs.win32-x86-version }}
+            nightly-version:
+                description: "The version string the next Nightly should use, only output for nightly"
+                value: ${{ jobs.prepare.outputs.nightly-version }}
+            packages-dir:
+                description: "The directory non-deb packages for this run should live in within packages.element.io"
+                value: ${{ inputs.nightly && 'nightly' || 'desktop' }}
+            # These are just simple pass-throughs of the input to simplify reuse of complex inline conditions
+            config:
+                description: "The relative path to the config file for this run"
+                value: ${{ inputs.config }}
+            deploy:
+                description: "The relative path to the config file for this run"
+                value: ${{ inputs.deploy }}
 jobs:
     prepare:
         name: Prepare
         environment: ${{ inputs.nightly && 'packages.element.io' || '' }}
         runs-on: ubuntu-latest
         outputs:
-            macos-version: ${{ steps.versions.outputs.macos }}
-            linux-version: ${{ steps.versions.outputs.linux }}
-            win32-x64-version: ${{ steps.versions.outputs.win_x64 }}
-            win32-x86-version: ${{ steps.versions.outputs.win_x86 }}
+            nightly-version: ${{ steps.versions.outputs.nightly }}
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             - name: Install Deps
@@ -62,22 +66,26 @@ jobs:
             - name: Generate cache hash files
               run: |
                   yarn run --silent electron --version > electronVersion
-                  cat package.json | jq -c .hakDependencies > hakDependencies.json
+                  cat package.json | jq -c .hakDependencies | sha1sum > hakHash
+                  find hak -type f -print0 | xargs -0 sha1sum >> hakHash
+                  find scripts/hak -type f -print0 | xargs -0 sha1sum >> hakHash
 
-            - name: "[Nightly] Calculate versions"
+            - name: "[Nightly] Calculate version"
               id: versions
               if: inputs.nightly
               run: |
-                  MACOS=$(aws s3 cp s3://$R2_BUCKET/nightly/update/macos/releases.json - --endpoint-url $R2_URL --region auto | jq -r .currentRelease)
-                  echo "macos=$(scripts/generate-nightly-version.ts --latest $MACOS)" >> $GITHUB_OUTPUT
+                  # Find all latest Nightly versions
+                  aws s3 cp s3://$R2_BUCKET/nightly/update/macos/releases.json - --endpoint-url $R2_URL --region auto | jq -r .currentRelease >> VERSIONS
+                  aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p' >> VERSIONS
+                  aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-arm64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p' >> VERSIONS
+                  aws s3 cp s3://$R2_BUCKET/nightly/update/win32/x64/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8- >> VERSIONS
+                  aws s3 cp s3://$R2_BUCKET/nightly/update/win32/ia32/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8- >> VERSIONS
 
-                  LINUX=$(aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p')
-                  echo "linux=$(scripts/generate-nightly-version.ts --latest $LINUX)" >> $GITHUB_OUTPUT
-
-                  WINx64=$(aws s3 cp s3://$R2_BUCKET/nightly/update/win32/x64/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8-)
-                  echo "win_x64=$(scripts/generate-nightly-version.ts --latest $WINx64)" >> $GITHUB_OUTPUT
-                  WINx86=$(aws s3 cp s3://$R2_BUCKET/nightly/update/win32/ia32/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8-)
-                  echo "win_x86=$(scripts/generate-nightly-version.ts --latest $WINx86)" >> $GITHUB_OUTPUT
+                  # Pick the greatest one
+                  VERSION=$(cat VERSIONS | sort -uf | tail -n1)
+                  echo "Found latest nightly version $VERSION"
+                  # Increment it
+                  echo "nightly=$(scripts/generate-nightly-version.ts --latest $VERSION)" >> $GITHUB_OUTPUT
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
@@ -112,7 +120,25 @@ jobs:
                   BODY: ${{ steps.release.outputs.body }}
                   PUBLISHED_AT: ${{ steps.release.outputs.published_at }}
 
-            - uses: actions/upload-artifact@v3
+            - name: "[Nightly] Write summary"
+              if: inputs.nightly
+              run: |
+                  BUNDLE_HASH=$(npx asar l webapp.asar | grep /bundles/ | head -n 1 | sed 's|.*/||')
+                  WEBAPP_VERSION=$(./scripts/get-version.ts)
+                  WEB_VERSION=${WEBAPP_VERSION:0:12}
+                  REACT_VERSION=${WEBAPP_VERSION:19:12}
+                  JS_VERSION=${WEBAPP_VERSION:35:12}
+
+                  echo "### Nightly build ${{ steps.versions.outputs.nightly }}" >> $GITHUB_STEP_SUMMARY
+                  echo "" >> $GITHUB_STEP_SUMMARY
+                  echo "| Component   | Version |" >> $GITHUB_STEP_SUMMARY
+                  echo "| ----------- | ------- |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Bundle Hash | $BUNDLE_HASH |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Element Web | [$WEB_VERSION](https://github.com/element-hq/element-web/commit/$WEB_VERSION) |" >> $GITHUB_STEP_SUMMARY
+                  echo "| React SDK   | [$REACT_VERSION](https://github.com/matrix-org/matrix-react-sdk/commit/$REACT_VERSION) |" >> $GITHUB_STEP_SUMMARY
+                  echo "| JS SDK      | [$JS_VERSION](https://github.com/matrix-org/matrix-js-sdk/commit/$JS_VERSION) |" >> $GITHUB_STEP_SUMMARY
+
+            - uses: actions/upload-artifact@v4
               with:
                   name: webapp
                   retention-days: 1
@@ -120,5 +146,5 @@ jobs:
                       webapp.asar
                       package.json
                       electronVersion
-                      hakDependencies.json
+                      hakHash
                       changelog.Debian

.github/workflows/build_windows.yaml

@@ -14,7 +14,7 @@ on:
             arch:
                 type: string
                 required: true
-                description: "The architecture to build for, one of 'x64' | 'x86' | 'arm64'"
+                description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'"
             version:
                 type: string
                 required: false
@@ -23,10 +23,6 @@ on:
                 type: string
                 required: false
                 description: "Whether to sign & notarise the build, requires 'packages.element.io' environment"
-            deploy-mode:
-                type: boolean
-                required: false
-                description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones"
 jobs:
     build:
         runs-on: windows-latest
@@ -34,7 +30,7 @@ jobs:
         env:
             SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe"
         steps:
-            - uses: kanga333/variable-mapper@master
+            - uses: kanga333/variable-mapper@3681b75f5c6c00162721168fb91ab74925eaebcb
               id: config
               with:
                   key: "${{ inputs.arch }}"
@@ -42,25 +38,23 @@ jobs:
                   map: |
                       {
                         "x64": {
-                          "target": "x86_64-pc-windows-msvc",
-                          "dir": "x64"
+                          "target": "x86_64-pc-windows-msvc"
                         },
                         "arm64": {
                           "target": "aarch64-pc-windows-msvc",
                           "build-args": "--arm64",
-                          "arch": "amd64_arm64",
-                          "dir": "arm64"
+                          "arch": "amd64_arm64"
                         },
-                        "x86": {
+                        "ia32": {
                           "target": "i686-pc-windows-msvc",
                           "build-args": "--ia32",
-                          "dir": "ia32"
+                          "arch": "x86"
                         }
                       }
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/download-artifact@v3
+            - uses: actions/download-artifact@v4
               with:
                   name: webapp
 
@@ -68,12 +62,12 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
             - name: Set up build tools
-              uses: ilammy/msvc-dev-cmd@v1
+              uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
               with:
                   arch: ${{ steps.config.outputs.arch || inputs.arch }}
 
@@ -95,14 +89,14 @@ jobs:
 
             - name: Install Rust
               if: steps.cache.outputs.cache-hit != 'true'
-              uses: actions-rs/toolchain@v1
-              with:
-                  default: true
-                  toolchain: stable
-                  target: ${{ steps.config.outputs.target }}
+              run: |
+                  rustup toolchain install stable --profile minimal --no-self-update
+                  rustup default stable
+                  rustup target add ${{ steps.config.outputs.target }}
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             # Does not need branch matching as only analyses this layer
@@ -116,7 +110,6 @@ jobs:
                   yarn build:native --target ${{ steps.config.outputs.target }}
 
             - name: Install and configure eSigner CKA
-              id: esigner
               if: inputs.sign
               run: |
                   Set-StrictMode -Version 'Latest'
@@ -145,61 +138,36 @@ jobs:
                   # Extract thumbprint and subject name
                   $Thumbprint = $CodeSigningCert.Thumbprint
                   $SubjectName = ($CodeSigningCert.Subject -replace ", ?", "`n" | ConvertFrom-StringData).CN
-                  echo "config-args=--signtool-thumbprint '$Thumbprint' --signtool-subject-name '$SubjectName'" >> $env:GITHUB_OUTPUT
+
+                  echo "ED_SIGNTOOL_THUMBPRINT=$Thumbprint" >> $env:GITHUB_ENV
+                  echo "ED_SIGNTOOL_SUBJECT_NAME=$SubjectName" >> $env:GITHUB_ENV
               env:
                   INSTALL_DIR: C:\Users\runneradmin\eSignerCKA
                   MASTER_KEY_FILE: C:\Users\runneradmin\eSignerCKA\master.key
 
             - name: "[Nightly] Resolve version"
-              id: nightly
               if: inputs.version != ''
               shell: bash
               run: |
-                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
+                  echo "ED_NIGHTLY=${{ inputs.version }}" >> $GITHUB_ENV
+
+            # XXX: For whatever reason if we use `yarn build ...` it freezes, but splitting it into parts it is fine
+            - run: yarn run build:ts
+            - run: yarn run build:res
 
             - name: Build App
               run: |
-                  yarn ts-node scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }} ${{ steps.esigner.outputs.config-args }}
-                  yarn build --publish never -w --config electron-builder.json ${{ steps.config.outputs.build-args }}
+                  yarn electron-builder --publish never -w ${{ steps.config.outputs.build-args }}
 
             - name: Check app was signed successfully
               if: inputs.sign != ''
               run: |
                   . "$env:SIGNTOOL_PATH" verify /pa (get-item ./dist/squirrel-windows*/*.exe)
 
-            - name: Prepare artifacts for deployment
-              if: inputs.deploy-mode
-              shell: bash
-              run: |
-                  mv dist _dist
-                  mkdir -p "dist/install/win32/$DIR/msi" "dist/update/win32/$DIR"
-                  mv _dist/squirrel-windows*/*.exe "dist/install/win32/$DIR"
-                  mv _dist/squirrel-windows*/*.nupkg "dist/update/win32/$DIR/"
-                  mv _dist/squirrel-windows*/RELEASES "dist/update/win32/$DIR/"
-                  # mv _dist/*.msi "dist/install/win32/$DIR/msi/"
-              env:
-                  DIR: ${{ steps.config.outputs.dir }}
-
-            # We don't wish to store the installer for every nightly ever, so we only keep the latest
-            - name: "[Nightly] Strip version from installer file"
-              if: inputs.deploy-mode && inputs.version != ''
-              shell: bash
-              run: |
-                  mv dist/install/win32/$DIR/*.exe "dist/install/win32/$DIR/Element Nightly Setup.exe"
-                  # mv dist/install/win32/$DIR/msi/*.msi "dist/install/win32/$DIR/msi/Element Nightly Setup.msi"
-              env:
-                  DIR: ${{ steps.config.outputs.dir }}
-
-            - name: "[Release] Prepare release latest symlink"
-              if: inputs.deploy-mode && inputs.version == ''
-              shell: bash
-              run: |
-                  ln -s "$(find . -type f -iname "*.exe" | xargs -0 -n1 -- basename)" "Element Setup.exe"
-              working-directory: "dist/install/win32/${{ steps.config.outputs.dir }}"
-
             - name: Upload Artifacts
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('win-{0}', inputs.arch) }}
-                  path: dist
+                  name: win-${{ inputs.arch }}
+                  path: |
+                      dist
                   retention-days: 1

.github/workflows/dockerbuild.yaml

@@ -17,10 +17,10 @@ jobs:
             contents: read
             packages: write
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Log in to the Container registry
-              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -28,14 +28,14 @@ jobs:
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+              uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: dockerbuild
                   push: true

.github/workflows/localazy_download.yaml

@@ -0,0 +1,10 @@
+name: Localazy Download
+on:
+    workflow_dispatch: {}
+    schedule:
+        - cron: "0 6 * * 1,3,5" # Every Monday, Wednesday and Friday at 6am UTC
+jobs:
+    download:
+        uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_download.yaml@main
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/localazy_upload.yaml

@@ -0,0 +1,11 @@
+name: Localazy Upload
+on:
+    push:
+        branches: [develop]
+        paths:
+            - "src/i18n/strings/en_EN.json"
+jobs:
+    upload:
+        uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_upload.yaml@main
+        secrets:
+            LOCALAZY_WRITE_KEY: ${{ secrets.LOCALAZY_WRITE_KEY }}

.github/workflows/release-drafter.yml

@@ -0,0 +1,21 @@
+name: Release Drafter
+on:
+    push:
+        branches: [staging]
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
+concurrency: ${{ github.workflow }}
+jobs:
+    draft:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}

.github/workflows/release-gitflow.yml

@@ -0,0 +1,11 @@
+# Gitflow merge-back master->develop
+name: Merge master -> develop
+on:
+    push:
+        branches: [master]
+concurrency: ${{ github.repository }}-${{ github.workflow }}
+jobs:
+    merge:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Release Process
+on:
+    workflow_dispatch:
+        inputs:
+            mode:
+                description: What type of release
+                required: true
+                default: rc
+                type: choice
+                options:
+                    - rc
+                    - final
+concurrency: ${{ github.workflow }}
+jobs:
+    release:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+            GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        with:
+            final: ${{ inputs.mode == 'final' }}
+            include-changes: element-hq/element-web@$VERSION
+            gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
+            expected-asset-count: 1

.github/workflows/reprepro.yaml

@@ -1,49 +0,0 @@
-on:
-    workflow_call:
-        inputs:
-            artifact-name:
-                type: string
-                required: true
-                description: "The name of the artifact containing the deb to include"
-        secrets:
-            ELEMENT_BOT_TOKEN:
-                required: true
-            CF_R2_ACCESS_KEY_ID:
-                required: true
-            CF_R2_TOKEN:
-                required: true
-# Protect reprepro database using concurrency
-concurrency: reprepro
-jobs:
-    reprepro:
-        name: Deploy debian package
-        environment: packages.element.io
-        runs-on: ubuntu-latest
-        env:
-            R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
-            R2_URL: ${{ vars.CF_R2_S3_API }}
-        steps:
-            - name: Download artifact
-              uses: actions/download-artifact@v3
-              with:
-                  name: ${{ inputs.artifact-name }}
-                  path: dist
-
-            - name: Upload incoming deb
-              id: upload
-              run: |
-                  deb="$(ls *.deb | tail -n1)"
-                  echo "incoming=$deb" >> $GITHUB_OUTPUT
-                  aws s3 cp "$deb" "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto
-              working-directory: dist
-              env:
-                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-
-            - name: Notify packages.element.io of incoming deb
-              uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
-              with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: vector-im/packages.element.io
-                  event-type: reprepro-incoming
-                  client-payload: '{"incoming": "${{ steps.upload.outputs.incoming }}"}'

.github/workflows/static_analysis.yaml

@@ -8,10 +8,11 @@ jobs:
         name: "Typescript Syntax Check"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             # Does not need branch matching as only analyses this layer
@@ -23,16 +24,17 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
-        uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
+        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
 
     js_lint:
         name: "ESLint"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
+                  node-version-file: package.json
                   cache: "yarn"
 
             # Does not need branch matching as only analyses this layer
@@ -41,3 +43,38 @@ jobs:
 
             - name: Run Linter
               run: "yarn run lint:js"
+
+    workflow_lint:
+        name: "Workflow Lint"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  node-version-file: package.json
+                  cache: "yarn"
+
+            # Does not need branch matching as only analyses this layer
+            - name: Install Deps
+              run: "yarn install --frozen-lockfile"
+
+            - name: Run Linter
+              run: "yarn lint:workflows"
+
+    analyse_dead_code:
+        name: "Analyse Dead Code"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  node-version-file: package.json
+                  cache: "yarn"
+
+            - name: Install Deps
+              run: "yarn install --frozen-lockfile"
+
+            - name: Run linter
+              run: "yarn run lint:knip"

.github/workflows/sync-labels.yml

@@ -0,0 +1,21 @@
+name: Sync labels
+on:
+    workflow_dispatch: {}
+    schedule:
+        - cron: "0 2 * * *" # 2am every day
+    push:
+        branches:
+            - develop
+        paths:
+            - .github/labels.yml
+jobs:
+    sync-labels:
+        uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
+        with:
+            LABELS: |
+                element-hq/element-web
+                .github/labels.yml
+            DELETE: true
+            WET: true
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-labelled.yml

@@ -0,0 +1,10 @@
+name: Move labelled issues to correct projects
+
+on:
+    issues:
+        types: [labeled]
+
+jobs:
+    call-triage-labelled:
+        uses: element-hq/element-web/.github/workflows/triage-labelled.yml@develop
+        secrets: inherit

.github/workflows/upgrade_dependencies.yml

@@ -1,8 +0,0 @@
-name: Upgrade Dependencies
-on:
-    workflow_dispatch: {}
-jobs:
-    upgrade:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.prettierignore

@@ -8,6 +8,8 @@
 /CHANGELOG.md
 /package-lock.json
 /yarn.lock
+/playwright/html-report
+/playwright/test-results
 
 **/.idea
 .vscode

README.md

@@ -1,6 +1,6 @@
 ![Build](https://github.com/vector-im/element-desktop/actions/workflows/build.yaml/badge.svg)
 ![Static Analysis](https://github.com/vector-im/element-desktop/actions/workflows/static_analysis.yaml/badge.svg)
-[![Weblate](https://translate.element.io/widgets/element-desktop/-/element-desktop/svg-badge.svg)](https://translate.element.io/engage/element-desktop/)
+[![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement-web%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element-web)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-desktop)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-desktop)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-desktop)
@@ -149,8 +149,6 @@ To add a new translation, head to the [translating doc](https://github.com/vecto
 
 For a developer guide, see the [translating dev doc](https://github.com/vector-im/element-web/blob/develop/docs/translating-dev.md).
 
-[<img src="https://translate.element.io/widgets/element-desktop/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-desktop/?utm_source=widget)
-
 # Report bugs & give feedback
 
 If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.

dockerbuild/Dockerfile

@@ -1,5 +1,5 @@
 # Docker image to facilitate building Element Desktop with native bits using a glibc version with broader compatibility
-FROM buildpack-deps:bionic-curl
+FROM buildpack-deps:buster-curl
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -11,12 +11,12 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
   # python for node-gyp
   # rpm is required for FPM to build rpm package
   # tclsh is required for building SQLite as part of SQLCipher
-  # libsecret-1-dev and libgnome-keyring-dev are required even for prebuild keytar
+  # libsecret-1-dev is required even for prebuild keytar
   apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
-  libsecret-1-dev libgnome-keyring-dev \
+  libsecret-1-dev \
   libopenjp2-tools \
   # Used by github actions \
-  jq grep \
+  jq grep file \
   # Used by seshat (when not SQLCIPHER_STATIC) \
   libsqlcipher-dev && \
   # git-lfs

dockerbuild/aarch64/.cargo/config.toml

@@ -0,0 +1,3 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+rustflags = ["-L/usr/lib/aarch64-linux-gnu"]

dockerbuild/aarch64/.env

@@ -0,0 +1,11 @@
+AS=/usr/bin/aarch64-linux-gnu-as
+STRIP=/usr/bin/aarch64-linux-gnu-strip
+AR=/usr/bin/aarch64-linux-gnu-ar
+CC=/usr/bin/aarch64-linux-gnu-gcc
+CPP=/usr/bin/aarch64-linux-gnu-cpp
+CXX=/usr/bin/aarch64-linux-gnu-g++
+LD=/usr/bin/aarch64-linux-gnu-ld
+FC=/usr/bin/aarch64-linux-gnu-gfortran
+PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+CFLAGS=-L/usr/lib/aarch64-linux-gnu
+RUSTFLAGS=-L/usr/lib/aarch64-linux-gnu

docs/SUMMARY.md

@@ -0,0 +1,17 @@
+# Summary
+
+-   [Introduction](../README.md)
+
+# Build
+
+-   [Native Node modules](native-node-modules.md)
+-   [Windows requirements](windows-requirements.md)
+
+# Distribution
+
+-   [Updates](updates.md)
+-   [Packaging](packaging.md)
+
+# Setup
+
+-   [Config](config.md)

docs/config.md

@@ -0,0 +1,15 @@
+# Configuration
+
+All Element Web options documented [here](https://github.com/vector-im/element-web/blob/develop/docs/config.md) can be used as well as the following:
+
+---
+
+The app contains a configuration file specified at build time using [these instructions](https://github.com/vector-im/element-desktop/#config).
+This config can be overwritten by the end using by creating a `config.json` file at the paths described [here](https://github.com/vector-im/element-desktop/#user-specified-configjson).
+
+After changing the config, the app will need to be exited fully (including via the task tray) and re-started.
+
+---
+
+1. `update_base_url`: Specifies the URL of the update server, see [document](https://github.com/vector-im/element-desktop/blob/develop/docs/updates.md).
+2. `web_base_url`: Specifies the Element Web URL when performing actions such as popout widget. Defaults to `https://app.element.io/`.

docs/native-node-modules.md

@@ -71,9 +71,9 @@ as usual using:
 
 On Windows & macOS we always statically link libsqlcipher for it is not generally available.
 On Linux by default we will use a system package, on debian & ubuntu this is `libsqlcipher0`,
-but this is problematic for some other packages.
-By including `SQLCIPHER_STATIC=1` in the build environment, the build scripts will statically link sqlcipher,
-note that this will want a `libcrypto1.1` shared library available in the system.
+but this is problematic for some other packages, and we found that it may crashes for unknown reasons.
+By including `SQLCIPHER_BUNDLED=1` in the build environment, the build scripts will fully statically
+link sqlcipher, including a static build of OpenSSL.
 
 More info can be found at https://github.com/matrix-org/seshat/issues/102
 and https://github.com/vector-im/element-web/issues/20926.

docs/packaging.md

@@ -0,0 +1,60 @@
+## Packaging nightlies
+
+Element Desktop nightly builds are build automatically by the [Github Actions workflow](https://github.com/vector-im/element-desktop/blob/develop/.github/workflows/build_and_deploy.yaml).
+The schedule is currently set for once a day at 9am UTC. It will deploy to packages.element.io upon completion.
+
+## Triggering a manual nightly build
+
+Simply go to https://github.com/vector-im/element-desktop/actions/workflows/build_and_deploy.yaml
+
+1. Click `Run workflow`
+1. Feel free to make changes to the checkboxes depending on the circumstances
+1. Click the green `Run workflow`
+
+## Packaging releases
+
+**Don't do this for RCs! We don't build Element Desktop for RCs.**
+
+For releasing Element Desktop, we assume the following prerequisites:
+
+-   a tag of `element-desktop` repo with the Element Desktop version to be released set in `package.json`.
+-   an Element Web tarball published to GitHub with a matching version number.
+
+**Both of these are done automatically when you run the release automation.**
+
+Once those are ready, the **manual** release build can be manually invoked using https://github.com/vector-im/element-desktop/actions/workflows/build_and_deploy.yaml
+
+1. Click `Run workflow`
+1. Specify the `master` branch
+1. Switch type to release
+1. Click the green `Run workflow`
+
+### More detail on the github actions
+
+We moved to Github Actions for the following reasons:
+
+1. Removing single point of failure
+2. Improving reliability
+3. Unblocking the packaging on a single individual
+4. Improving parallelism
+
+The Windows builds are signed by SSL.com using their Cloud Key Adapter for eSigner.
+This allows us to use Microsoft's signtool to interface with eSigner and send them a hash of the exe along with
+credentials in exchange for a signed certificate which we attach onto all the relevant files.
+
+The Apple builds are signed using standard code signing means and then notarised to appease GateKeeper.
+
+The Linux builds are distributed via a signed reprepro repository.
+
+The packages.element.io site is a public Cloudflare R2 bucket which is deployed to solely from Github Actions.
+The main bucket in R2 is `packages-element-io` which is a direct mapping of packages.element.io,
+we have a workflow which generates the index.html files there to imitate a public index which Cloudflare does not currently support.
+The reprepro database lives in `packages-element-io-db`.
+There is an additional pair of buckets of same name but appended with `-test` which can be used for testing,
+these land on https://packages-element-io-test.element.io/.
+
+### Debian/Ubuntu Distributions
+
+We used to add a new distribution to match each Debian and Ubuntu release. As of April 2020, we have created a `default` distribution that everyone can use (since the packages have never differed by distribution anyway).
+
+The distribution configuration lives in https://github.com/vector-im/packages.element.io/blob/master/debian/conf/distributions as a canonical source.

docs/windows-requirements.md

@@ -1,6 +1,5 @@
 # Windows
 
-
 ## Requirements to build native modules
 
 We rely on Github Actions `windows-latest` plus a few extra utilities as per [the workflow](https://github.com/vector-im/element-desktop/blob/develop/.github/workflows/build_windows.yaml).

electron-builder.js

@@ -0,0 +1,216 @@
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+const Arch = require("electron-builder").Arch;
+const { flipFuses, FuseVersion, FuseV1Options } = require("@electron/fuses");
+
+// Typescript conversion blocked on https://github.com/electron-userland/electron-builder/issues/7775
+
+/**
+ * This script has different outputs depending on your os platform.
+ *
+ * On Windows:
+ *  Prefixes the nightly version with `0.0.1-nightly.` as it breaks if it is not semver
+ *  Passes $ED_SIGNTOOL_THUMBPRINT and $ED_SIGNTOOL_SUBJECT_NAME to
+ *      build.win.signingHashAlgorithms and build.win.certificateSubjectName respectively if specified.
+ *
+ * On macOS:
+ *   Passes $ED_NOTARYTOOL_TEAM_ID to build.mac.notarize.notarize if specified
+ *
+ * On Linux:
+ *  Replaces spaces in the product name with dashes as spaces in paths can cause issues
+ *  Removes libsqlcipher0 recommended dependency if env SQLCIPHER_BUNDLED is asserted.
+ *  Passes $ED_DEBIAN_CHANGELOG to build.deb.fpm if specified
+ */
+
+const NIGHTLY_APP_ID = "im.riot.nightly";
+const NIGHTLY_DEB_NAME = "element-nightly";
+
+const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"));
+
+/**
+ * @type {import('electron-builder').Configuration}
+ * @see https://www.electron.build/configuration/configuration
+ */
+const config = {
+    appId: "im.riot.app",
+    asarUnpack: "**/*.node",
+    afterPack: async (context) => {
+        if (context.electronPlatformName !== "darwin" || context.arch === Arch.universal) {
+            // Burn in electron fuses for proactive security hardening.
+            // On macOS, we only do this for the universal package, as the constituent arm64 and amd64 packages are embedded within.
+            const ext = {
+                darwin: ".app",
+                win32: ".exe",
+                linux: "",
+            }[context.electronPlatformName];
+
+            let executableName = context.packager.appInfo.productFilename;
+            if (context.electronPlatformName === "linux") {
+                // Linux uses the package name as the executable name
+                executableName = context.packager.appInfo.name;
+            }
+
+            const electronBinaryPath = path.join(context.appOutDir, `${executableName}${ext}`);
+            console.log(`Flipping fuses for: ${electronBinaryPath}`);
+
+            await flipFuses(electronBinaryPath, {
+                version: FuseVersion.V1,
+                resetAdHocDarwinSignature: context.electronPlatformName === "darwin" && context.arch === Arch.universal,
+
+                [FuseV1Options.EnableCookieEncryption]: true,
+                [FuseV1Options.OnlyLoadAppFromAsar]: true,
+
+                [FuseV1Options.RunAsNode]: false,
+                [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
+                [FuseV1Options.EnableNodeCliInspectArguments]: false,
+
+                // Mac app crashes on arm for us when `LoadBrowserProcessSpecificV8Snapshot` is enabled
+                [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: false,
+                // https://github.com/electron/fuses/issues/7
+                [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: false,
+            });
+        }
+    },
+    files: [
+        "package.json",
+        {
+            from: ".hak/hakModules",
+            to: "node_modules",
+        },
+        "lib/**",
+    ],
+    extraResources: [
+        {
+            from: "res/img",
+            to: "img",
+        },
+        "webapp.asar",
+    ],
+    extraMetadata: {
+        name: pkg.name,
+        productName: pkg.productName,
+        description: pkg.description,
+    },
+    linux: {
+        target: ["tar.gz", "deb"],
+        category: "Network;InstantMessaging;Chat",
+        maintainer: "support@element.io",
+        icon: "build/icons",
+        desktop: {
+            MimeType: "x-scheme-handler/element",
+        },
+    },
+    deb: {
+        packageCategory: "net",
+        depends: [
+            "libgtk-3-0",
+            "libnotify4",
+            "libnss3",
+            "libxss1",
+            "libxtst6",
+            "xdg-utils",
+            "libatspi2.0-0",
+            "libuuid1",
+            "libsecret-1-0",
+            "libasound2",
+            "libgbm1",
+            "libc6 (>= 2.28)",
+        ],
+        recommends: ["libsqlcipher0", "element-io-archive-keyring"],
+        fpm: [
+            "--deb-field",
+            "Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
+            "--deb-field",
+            "Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
+        ],
+    },
+    mac: {
+        category: "public.app-category.social-networking",
+        darkModeSupport: true,
+        hardenedRuntime: true,
+        gatekeeperAssess: true,
+        entitlements: "./build/entitlements.mac.plist",
+        icon: "build/icons/icon.icns",
+    },
+    win: {
+        target: ["squirrel"],
+        signingHashAlgorithms: ["sha256"],
+        icon: "build/icons/icon.ico",
+    },
+    directories: {
+        output: "dist",
+    },
+    protocols: [
+        {
+            name: "element",
+            schemes: ["element"],
+        },
+    ],
+};
+
+/**
+ * Allow specifying windows signing cert via env vars
+ * @param {string} process.env.ED_SIGNTOOL_SUBJECT_NAME
+ * @param {string} process.env.ED_SIGNTOOL_THUMBPRINT
+ */
+if (process.env.ED_SIGNTOOL_SUBJECT_NAME && process.env.ED_SIGNTOOL_THUMBPRINT) {
+    config.win.certificateSubjectName = process.env.ED_SIGNTOOL_SUBJECT_NAME;
+    config.win.certificateSha1 = process.env.ED_SIGNTOOL_THUMBPRINT;
+}
+
+/**
+ * Allow specifying macOS notary team id via env var
+ * @param {string} process.env.ED_NOTARYTOOL_TEAM_ID
+ */
+if (process.env.ED_NOTARYTOOL_TEAM_ID) {
+    config.mac.notarize = {
+        teamId: process.env.ED_NOTARYTOOL_TEAM_ID,
+    };
+}
+
+/**
+ * Allow specifying nightly version via env var
+ * @param {string} process.env.ED_NIGHTLY
+ */
+if (process.env.ED_NIGHTLY) {
+    config.deb.fpm = []; // Clear the fpm as the breaks deb fields don't apply to nightly
+
+    config.appId = NIGHTLY_APP_ID;
+    config.extraMetadata.productName += " Nightly";
+    config.extraMetadata.name += "-nightly";
+    config.extraMetadata.description += " (nightly unstable build)";
+    config.deb.fpm.push("--name", NIGHTLY_DEB_NAME);
+
+    let version = process.env.ED_NIGHTLY;
+    if (os.platform() === "win32") {
+        // The windows packager relies on parsing this as semver, so we have to make it look like one.
+        // This will give our update packages really stupid names, but we probably can't change that either
+        // because squirrel windows parses them for the version too. We don't really care: nobody sees them.
+        // We just give the installer a static name, so you'll just see this in the 'about' dialog.
+        // Turns out if you use 0.0.0 here it makes Squirrel windows crash, so we use 0.0.1.
+        version = "0.0.1-nightly." + version;
+    }
+    config.extraMetadata.version = version;
+}
+
+if (os.platform() === "linux") {
+    // Electron crashes on debian if there's a space in the path.
+    // https://github.com/vector-im/element-web/issues/13171
+    config.extraMetadata.productName = config.extraMetadata.productName.replace(/ /g, "-");
+
+    /**
+     * Allow specifying deb changelog via env var
+     * @param {string} process.env.ED_DEB_CHANGELOG
+     */
+    if (process.env.ED_DEBIAN_CHANGELOG) {
+        config.deb.fpm.push(`--deb-changelog=${process.env.ED_DEBIAN_CHANGELOG}`);
+    }
+
+    if (process.env.SQLCIPHER_BUNDLED) {
+        // Remove sqlcipher dependency when using bundled
+        config.deb.recommends = config.deb.recommends?.filter((d) => d !== "libsqlcipher0");
+    }
+}
+
+exports.default = config;

element.io/nightly/config.json

@@ -1,6 +1,14 @@
 {
     "update_base_url": "https://packages.element.io/nightly/update/",
     "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
     "brand": "Element Nightly",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -13,8 +21,8 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "showLabsSettings": true,
-    "roomDirectory": {
+    "show_labs_settings": true,
+    "room_directory": {
         "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
@@ -36,8 +44,8 @@
         "environment": "nightly"
     },
     "posthog": {
-        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.element.io"
+        "project_api_key": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "api_host": "https://posthog.element.io"
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
     "features": {
@@ -45,7 +53,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

element.io/nightly/control.template

@@ -1,12 +0,0 @@
-Package: element-nightly
-License: Apache-2.0
-Vendor: support@element.io
-Architecture: amd64
-Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
-Recommends: libsqlcipher0, element-io-archive-keyring
-Section: net
-Priority: extra
-Homepage: https://element.io/
-Description:
- riot.im A feature-rich client for Matrix.org (nightly unstable build).

element.io/nightly/riot-nightly_2020071502_all/DEBIAN/control

@@ -1,9 +0,0 @@
-Package: riot-nightly
-Version: 2020071502
-Depends: element-nightly
-Maintainer: packages@element.io
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.

element.io/release/config.json

@@ -1,6 +1,14 @@
 {
     "update_base_url": "https://packages.element.io/desktop/update/",
     "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -13,10 +21,10 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "roomDirectory": {
+    "room_directory": {
         "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
-    "showLabsSettings": false,
+    "show_labs_settings": false,
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
@@ -32,8 +40,8 @@
         }
     ],
     "posthog": {
-        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.element.io"
+        "project_api_key": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "api_host": "https://posthog.element.io"
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"

element.io/release/control.template

@@ -1,14 +0,0 @@
-Package: element-desktop
-License: Apache-2.0
-Vendor: support@element.io
-Architecture: amd64
-Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
-Recommends: libsqlcipher0, element-io-archive-keyring
-Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
-Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
-Section: net
-Priority: extra
-Homepage: https://element.io/
-Description:
-  A feature-rich client for Matrix.org

element.io/release/riot-desktop_1.7.0_all/DEBIAN/control

@@ -1,9 +0,0 @@
-Package: riot-desktop
-Version: 1.7.0
-Depends: element-desktop
-Maintainer: packages@element.io
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.

hak/keytar/build.ts

@@ -27,7 +27,7 @@ export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: Dependency
     await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             path.join(moduleInfo.nodeModuleBinDir, "node-gyp" + (hakEnv.isWin() ? ".cmd" : "")),
-            ["rebuild"],
+            ["rebuild", "--arch", hakEnv.getTargetArch()],
             {
                 cwd: moduleInfo.moduleBuildDir,
                 env,

hak/matrix-seshat/build.ts

@@ -14,306 +14,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import path from "path";
 import childProcess from "child_process";
-import mkdirp from "mkdirp";
-import fsExtra from "fs-extra";
 
 import HakEnv from "../../scripts/hak/hakEnv";
 import { DependencyInfo } from "../../scripts/hak/dep";
 
-type WinConfiguration =
-    | "VC-WIN32"
-    | "VC-WIN64A"
-    | "VC-WIN64-ARM"
-    | "VC-WIN64-CLANGASM-ARM"
-    | "VC-CLANG-WIN64-CLANGASM-ARM"
-    | "VC-WIN32-HYBRIDCRT"
-    | "VC-WIN64A-HYBRIDCRT";
-
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.isWin()) {
-        await buildOpenSslWin(hakEnv, moduleInfo);
-        await buildSqlCipherWin(hakEnv, moduleInfo);
-    } else if (hakEnv.wantsStaticSqlCipherUnix()) {
-        await buildSqlCipherUnix(hakEnv, moduleInfo);
-    }
-    await buildMatrixSeshat(hakEnv, moduleInfo);
-}
-
-async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
-
-    let openSslArch: WinConfiguration;
-    switch (hakEnv.getTargetArch()) {
-        case "x64":
-            openSslArch = "VC-WIN64A";
-            break;
-        case "ia32":
-            openSslArch = "VC-WIN32";
-            break;
-        case "arm64":
-            openSslArch = "VC-WIN64-ARM";
-            break;
-    }
-
-    console.log("Building openssl in " + openSslDir);
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn(
-            "perl",
-            [
-                "Configure",
-                "--prefix=" + moduleInfo.depPrefix,
-                // sqlcipher only uses about a tiny part of openssl. We link statically
-                // so will only pull in the symbols we use, but we may as well turn off
-                // as much as possible to save on build time.
-                "no-afalgeng",
-                "no-capieng",
-                "no-cms",
-                "no-ct",
-                "no-deprecated",
-                "no-dgram",
-                "no-dso",
-                "no-ec",
-                "no-ec2m",
-                "no-gost",
-                "no-nextprotoneg",
-                "no-ocsp",
-                "no-sock",
-                "no-srp",
-                "no-srtp",
-                "no-tests",
-                "no-ssl",
-                "no-tls",
-                "no-dtls",
-                "no-shared",
-                "no-aria",
-                "no-camellia",
-                "no-cast",
-                "no-chacha",
-                "no-cmac",
-                "no-des",
-                "no-dh",
-                "no-dsa",
-                "no-ecdh",
-                "no-ecdsa",
-                "no-idea",
-                "no-md4",
-                "no-mdc2",
-                "no-ocb",
-                "no-poly1305",
-                "no-rc2",
-                "no-rc4",
-                "no-rmd160",
-                "no-scrypt",
-                "no-seed",
-                "no-siphash",
-                "no-sm2",
-                "no-sm3",
-                "no-sm4",
-                "no-whirlpool",
-                openSslArch,
-            ],
-            {
-                cwd: openSslDir,
-                stdio: "inherit",
-            },
-        );
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["build_libs"], {
-            cwd: openSslDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["install_dev"], {
-            cwd: openSslDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-}
-
-async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-    const buildDir = path.join(sqlCipherDir, "bld");
-
-    await mkdirp(buildDir);
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["/f", path.join("..", "Makefile.msc"), "libsqlite3.lib", "TOP=.."], {
-            cwd: buildDir,
-            stdio: "inherit",
-            env: Object.assign({}, process.env, {
-                CCOPTS: "-DSQLITE_HAS_CODEC -I" + path.join(moduleInfo.depPrefix, "include"),
-                LTLIBPATHS: "/LIBPATH:" + path.join(moduleInfo.depPrefix, "lib"),
-                LTLIBS: "libcrypto.lib",
-            }),
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await fsExtra.copy(path.join(buildDir, "libsqlite3.lib"), path.join(moduleInfo.depPrefix, "lib", "sqlcipher.lib"));
-
-    await fsExtra.copy(path.join(buildDir, "sqlite3.h"), path.join(moduleInfo.depPrefix, "include", "sqlcipher.h"));
-}
-
-async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-
-    const args = [
-        "--prefix=" + moduleInfo.depPrefix + "",
-        "--enable-tempstore=yes",
-        "--enable-shared=no",
-        "--enable-tcl=no",
-    ];
-
-    if (hakEnv.isMac()) {
-        args.push("--with-crypto-lib=commoncrypto");
-    }
-
-    if (hakEnv.wantsStaticSqlCipherUnix()) {
-        args.push("--enable-tcl=no");
-
-        if (hakEnv.isLinux()) {
-            args.push("--with-pic=yes");
-        }
-    }
-
-    if (!hakEnv.isHost()) {
-        // In the nonsense world of `configure`, it is assumed you are building
-        // a compiler like `gcc`, so the `host` option actually means the target
-        // the build output runs on.
-        args.push(`--host=${hakEnv.getTargetId()}`);
-    }
-
-    const cflags = ["-DSQLITE_HAS_CODEC"];
-
-    if (!hakEnv.isHost()) {
-        // `clang` uses more logical option naming.
-        cflags.push(`--target=${hakEnv.getTargetId()}`);
-    }
-
-    if (cflags.length) {
-        args.push(`CFLAGS=${cflags.join(" ")}`);
-    }
-
-    const ldflags: string[] = [];
-
-    if (hakEnv.isMac()) {
-        ldflags.push("-framework Security");
-        ldflags.push("-framework Foundation");
-    }
-
-    if (ldflags.length) {
-        args.push(`LDFLAGS=${ldflags.join(" ")}`);
-    }
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn(path.join(sqlCipherDir, "configure"), args, {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("make", [], {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("make", ["install"], {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-}
-
-async function buildMatrixSeshat(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    // seshat now uses n-api so we shouldn't need to specify a node version to
-    // build against, but it does seems to still need something in here, so leaving
-    // it for now: we should confirm how much of this it still actually needs.
     const env = hakEnv.makeGypEnv();
 
-    if (!hakEnv.isLinux() || hakEnv.wantsStaticSqlCipherUnix()) {
-        Object.assign(env, {
-            SQLCIPHER_STATIC: 1,
-            SQLCIPHER_LIB_DIR: path.join(moduleInfo.depPrefix, "lib"),
-            SQLCIPHER_INCLUDE_DIR: path.join(moduleInfo.depPrefix, "include"),
-        });
-    }
-
-    if (hakEnv.isLinux() && hakEnv.wantsStaticSqlCipherUnix()) {
-        // Ensure Element uses the statically-linked seshat build, and prevent other applications
-        // from attempting to use this one. Detailed explanation:
-        //
-        // RUSTFLAGS
-        //     An environment variable containing a list of arguments to pass to rustc.
-        // -Clink-arg=VALUE
-        //     A rustc argument to pass a single argument to the linker.
-        // -Wl,
-        //     gcc syntax to pass an argument (from gcc) to the linker (ld).
-        // -Bsymbolic:
-        //     Prefer local/statically linked symbols over those in the environment.
-        //     Prevent overriding native libraries by LD_PRELOAD etc.
-        // --exclude-libs ALL
-        //     Prevent symbols from being exported by any archive libraries.
-        //     Reduces output filesize and prevents being dynamically linked against.
-        env.RUSTFLAGS = "-Clink-arg=-Wl,-Bsymbolic -Clink-arg=-Wl,--exclude-libs,ALL";
-    }
-
-    if (hakEnv.isWin()) {
-        env.RUSTFLAGS = "-Ctarget-feature=+crt-static -Clink-args=libcrypto.lib";
-        // Note that in general, you can specify targets in Rust without having to have
-        // the matching toolchain, however for this, cargo gets confused when building
-        // the build scripts since they run on the host, but vcvarsall.bat sets the c
-        // compiler in the path to be the one for the target, so we just use the matching
-        // toolchain for the target architecture which makes everything happy.
-        env.RUSTUP_TOOLCHAIN = `stable-${hakEnv.getTargetId()}`;
-    }
-
     if (!hakEnv.isHost()) {
         env.CARGO_BUILD_TARGET = hakEnv.getTargetId();
     }
 
-    console.log("Running neon with env", env);
+    console.log("Running yarn install");
     await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn(
-            path.join(moduleInfo.nodeModuleBinDir, "neon" + (hakEnv.isWin() ? ".cmd" : "")),
-            ["build", "--release"],
-            {
-                cwd: moduleInfo.moduleBuildDir,
-                env,
-                stdio: "inherit",
-            },
-        );
+        const proc = childProcess.spawn("yarn" + (hakEnv.isWin() ? ".cmd" : ""), ["install"], {
+            cwd: moduleInfo.moduleBuildDir,
+            env,
+            shell: true,
+            stdio: "inherit",
+        });
+        proc.on("exit", (code) => {
+            code ? reject(code) : resolve();
+        });
+    });
+
+    const buildTarget = hakEnv.wantsStaticSqlCipher() ? "build-bundled" : "build";
+
+    console.log("Running yarn build");
+    await new Promise<void>((resolve, reject) => {
+        const proc = childProcess.spawn("yarn" + (hakEnv.isWin() ? ".cmd" : ""), ["run", buildTarget], {
+            cwd: moduleInfo.moduleBuildDir,
+            env,
+            shell: true,
+            stdio: "inherit",
+        });
         proc.on("exit", (code) => {
             code ? reject(code) : resolve();
         });

hak/matrix-seshat/check.ts

@@ -21,23 +21,6 @@ import HakEnv from "../../scripts/hak/hakEnv";
 import { DependencyInfo } from "../../scripts/hak/dep";
 
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.wantsStaticSqlCipher()) {
-        // of course tcl doesn't have a --version
-        await new Promise<void>((resolve, reject) => {
-            const proc = childProcess.spawn("tclsh", [], {
-                stdio: ["pipe", "ignore", "ignore"],
-            });
-            proc.on("exit", (code) => {
-                if (code !== 0) {
-                    reject("Can't find tclsh - have you installed TCL?");
-                } else {
-                    resolve();
-                }
-            });
-            proc.stdin.end();
-        });
-    }
-
     const tools = [
         ["rustc", "--version"],
         ["python", "--version"], // node-gyp uses python for reasons beyond comprehension
@@ -70,7 +53,7 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
     await new Promise((resolve, reject) => {
         const rustc = childProcess.execFile(
             "rustc",
-            ["--target", hakEnv.getTargetId(), "-o", "tmp", "-"],
+            ["--target", hakEnv.getTargetId(), "--emit=obj", "-o", "tmp", "-"],
             (err, out) => {
                 if (err) {
                     reject(
@@ -86,6 +69,8 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
             },
         );
         rustc.stdin!.write("fn main() {}");
+        rustc.stdout!.pipe(process.stdout);
+        rustc.stderr!.pipe(process.stderr);
         rustc.stdin!.end();
     });
 }

hak/matrix-seshat/fetchDeps.ts

@@ -1,129 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import path from "path";
-import childProcess from "child_process";
-import fs from "fs";
-import fsProm from "fs/promises";
-import tar from "tar";
-import fetch from "node-fetch";
-import { promises as stream } from "stream";
-
-import HakEnv from "../../scripts/hak/hakEnv";
-import { DependencyInfo } from "../../scripts/hak/dep";
-
-async function download(url: string, filename: string): Promise<void> {
-    const resp = await fetch(url);
-    if (!resp.ok) throw new Error(`unexpected response ${resp.statusText}`);
-    if (!resp.body) throw new Error(`unexpected response has no body ${resp.statusText}`);
-    await stream.pipeline(resp.body, fs.createWriteStream(filename));
-}
-
-export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.wantsStaticSqlCipher()) {
-        await getSqlCipher(hakEnv, moduleInfo);
-    }
-
-    if (hakEnv.isWin()) {
-        await getOpenSsl(hakEnv, moduleInfo);
-    }
-}
-
-async function getSqlCipher(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-
-    let haveSqlcipher: boolean;
-    try {
-        await fsProm.stat(sqlCipherDir);
-        haveSqlcipher = true;
-    } catch (e) {
-        haveSqlcipher = false;
-    }
-
-    if (haveSqlcipher) return;
-
-    const sqlCipherTarball = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}.tar.gz`);
-    let haveSqlcipherTar: boolean;
-    try {
-        await fsProm.stat(sqlCipherTarball);
-        haveSqlcipherTar = true;
-    } catch (e) {
-        haveSqlcipherTar = false;
-    }
-    if (!haveSqlcipherTar) {
-        await download(`https://github.com/sqlcipher/sqlcipher/archive/v${version}.tar.gz`, sqlCipherTarball);
-    }
-
-    // Extract the tarball to per-target directories, then we avoid cross-contaiminating archs
-    await tar.x({
-        file: sqlCipherTarball,
-        cwd: moduleInfo.moduleTargetDotHakDir,
-    });
-
-    if (hakEnv.isWin()) {
-        // On Windows, we need to patch the makefile because it forces TEMP_STORE to
-        // default to files (1) but the README specifically says you '*must*' set it
-        // set it to 2 (default to memory).
-        const patchFile = path.join(moduleInfo.moduleHakDir, `sqlcipher-${version}-win.patch`);
-
-        await new Promise<void>((resolve, reject) => {
-            const readStream = fs.createReadStream(patchFile);
-
-            const proc = childProcess.spawn("patch", ["-p1"], {
-                cwd: sqlCipherDir,
-                stdio: ["pipe", "inherit", "inherit"],
-            });
-            proc.on("exit", (code) => {
-                code ? reject(code) : resolve();
-            });
-            readStream.pipe(proc.stdin);
-        });
-    }
-}
-
-async function getOpenSsl(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
-
-    let haveOpenSsl: boolean;
-    try {
-        await fsProm.stat(openSslDir);
-        haveOpenSsl = true;
-    } catch (e) {
-        haveOpenSsl = false;
-    }
-
-    if (haveOpenSsl) return;
-
-    const openSslTarball = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}.tar.gz`);
-    let haveOpenSslTar: boolean;
-    try {
-        await fsProm.stat(openSslTarball);
-        haveOpenSslTar = true;
-    } catch (e) {
-        haveOpenSslTar = false;
-    }
-    if (!haveOpenSslTar) {
-        await download(`https://www.openssl.org/source/openssl-${version}.tar.gz`, openSslTarball);
-    }
-
-    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);
-    await tar.x({
-        file: openSslTarball,
-        cwd: moduleInfo.moduleTargetDotHakDir,
-    });
-}

hak/matrix-seshat/hak.json

@@ -1,13 +1,7 @@
 {
     "scripts": {
         "check": "check.ts",
-        "fetchDeps": "fetchDeps.ts",
         "build": "build.ts"
     },
-    "prune": "native",
-    "copy": "native/index.node",
-    "dependencies": {
-        "openssl": "1.1.1f",
-        "sqlcipher": "4.3.0"
-    }
+    "copy": "index.node"
 }

hak/matrix-seshat/sqlcipher-4.3.0-win.patch

@@ -1,14 +0,0 @@
-diff -Nur sqlcipher-4.3.0-orig/Makefile.msc sqlcipher-4.3.0-mod/Makefile.msc
---- sqlcipher-4.3.0-orig/Makefile.msc	2019-12-20 16:40:26.000000000 +0000
-+++ sqlcipher-4.3.0-mod/Makefile.msc	2020-02-14 11:31:39.000000000 +0000
-@@ -985,8 +985,8 @@
- # default to file, 2 to default to memory, and 3 to force temporary
- # tables to always be in memory.
- #
--TCC = $(TCC) -DSQLITE_TEMP_STORE=1
--RCC = $(RCC) -DSQLITE_TEMP_STORE=1
-+TCC = $(TCC) -DSQLITE_TEMP_STORE=2
-+RCC = $(RCC) -DSQLITE_TEMP_STORE=2
- 
- # Enable/disable loadable extensions, and other optional features
- # based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).

hak/tsconfig.json

@@ -5,10 +5,10 @@
         "target": "es2016",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2019"]
+        "lib": ["es2020"],
     },
     "include": ["../scripts/@types/*.d.ts", "./**/*.ts"],
     "ts-node": {
-        "transpileOnly": true
-    }
+        "transpileOnly": true,
+    },
 }

knip.ts

@@ -0,0 +1,16 @@
+import { KnipConfig } from "knip";
+
+export default {
+    entry: ["src/electron-main.ts", "src/preload.ts", "electron-builder.js", ".eslintrc-*.js", "scripts/**", "hak/**"],
+    project: ["**/*.{js,ts}"],
+    ignoreDependencies: [
+        // Brought in via hak scripts
+        "keytar",
+        "matrix-seshat",
+        // Needed by `electron-builder`
+        "electron-builder-squirrel-windows",
+        // Required for `action-validator`
+        "@action-validator/*",
+    ],
+    ignoreBinaries: ["jq", "scripts/in-docker.sh"],
+} satisfies KnipConfig;

localazy.json

@@ -0,0 +1,37 @@
+{
+    "readKey": "a7688614897667993891-866e2615b0a22e6ccef56aea9b10e815efa3e1296752a7a30bd9925f1a8f33e7",
+
+    "upload": {
+        "type": "json",
+        "keySeparator": "|",
+        "deprecate": "file",
+        "features": ["plural_object", "filter_untranslated"],
+        "files": [
+            {
+                "pattern": "src/i18n/strings/en_EN.json",
+                "file": "element-desktop.json",
+                "lang": "inherited"
+            },
+            {
+                "group": "existing",
+                "pattern": "src/i18n/strings/*.json",
+                "file": "element-desktop.json",
+                "excludes": ["src/i18n/strings/en_EN.json"],
+                "lang": "${autodetectLang}"
+            }
+        ]
+    },
+
+    "download": {
+        "files": [
+            {
+                "conditions": "equals: ${file}, element-desktop.json",
+                "output": "src/i18n/strings/${langLsrUnderscore}.json"
+            }
+        ],
+        "includeSourceLang": "${includeSourceLang|false}",
+        "langAliases": {
+            "en": "en-EN"
+        }
+    }
+}

package.json

@@ -1,181 +1,128 @@
 {
-  "name": "element-desktop",
-  "productName": "Element",
-  "main": "lib/electron-main.js",
-  "version": "1.11.30",
-  "description": "A feature-rich client for Matrix.org",
-  "author": "Element",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/vector-im/element-desktop"
-  },
-  "license": "Apache-2.0",
-  "files": [],
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "i18n": "matrix-gen-i18n",
-    "prunei18n": "matrix-prune-i18n",
-    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-    "mkdirs": "mkdirp packages deploys",
-    "fetch": "yarn run mkdirs && ts-node scripts/fetch-package.ts",
-    "asar-webapp": "asar p webapp webapp.asar",
-    "start": "yarn run build:ts && yarn run build:res && electron .",
-    "lint": "yarn lint:types && yarn lint:js",
-    "lint:js": "yarn lint:js:src && yarn lint:js:test && yarn lint:js:scripts && yarn lint:js:hak",
-    "lint:js:src": "eslint --max-warnings 0 src",
-    "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js test",
-    "lint:js:scripts": "eslint --max-warnings 0 --config .eslintrc-scripts.js scripts",
-    "lint:js:hak": "eslint --max-warnings 0 --config .eslintrc-hak.js hak",
-    "lint:js-fix": "yarn lint:js-fix:src &&yarn lint:js-fix:test && yarn lint:js-fix:scripts && yarn lint:js-fix:hak",
-    "lint:js-fix:src": "eslint --fix --max-warnings 0 src",
-    "lint:js-fix:test": "eslint --fix --max-warnings 0 --config .eslintrc-test.js test",
-    "lint:js-fix:scripts": "eslint --fix --max-warnings 0 --config .eslintrc-scripts.js scripts",
-    "lint:js-fix:hak": "eslint --fix --max-warnings 0 --config .eslintrc-hak.js hak",
-    "lint:types": "yarn lint:types:src && yarn lint:types:test && yarn lint:types:scripts && yarn lint:types:hak",
-    "lint:types:src": "tsc --noEmit",
-    "lint:types:test": "tsc --noEmit -p test/tsconfig.json",
-    "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
-    "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
-    "build:native": "yarn run hak",
-    "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
-    "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
-    "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
-    "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
-    "build": "yarn run build:ts && yarn run build:res && electron-builder",
-    "build:ts": "tsc",
-    "build:res": "ts-node scripts/copy-res.ts",
-    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
-    "docker:build:native": "scripts/in-docker.sh yarn run hak",
-    "docker:build": "scripts/in-docker.sh yarn run build",
-    "docker:install": "scripts/in-docker.sh yarn install",
-    "clean": "rimraf webapp.asar dist packages deploys lib",
-    "hak": "ts-node scripts/hak/index.ts",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@sentry/electron": "^4.3.0",
-    "auto-launch": "^5.0.5",
-    "counterpart": "^0.18.6",
-    "electron-clear-data": "^1.0.5",
-    "electron-store": "^8.0.2",
-    "electron-window-state": "^5.0.3",
-    "minimist": "^1.2.6",
-    "node-fetch": "^2",
-    "png-to-ico": "^2.1.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.18.10",
-    "@babel/preset-env": "^7.18.10",
-    "@babel/preset-typescript": "^7.18.6",
-    "@electron/asar": "^3.2.3",
-    "@electron/notarize": "^1.2.3",
-    "@types/auto-launch": "^5.0.1",
-    "@types/counterpart": "^0.18.1",
-    "@types/detect-libc": "^1.0.0",
-    "@types/jest": "^29.0.0",
-    "@types/minimist": "^1.2.1",
-    "@types/mkdirp": "^1.0.2",
-    "@types/node": "16.18.23",
-    "@types/pacote": "^11.1.1",
-    "@types/tar": "^6.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "allchange": "^1.0.6",
-    "app-builder-lib": "24.0.0",
-    "babel-jest": "^29.0.0",
-    "chokidar": "^3.5.2",
-    "detect-libc": "^1.0.3",
-    "electron": "^24.0.0",
-    "electron-builder": "24.0.0",
-    "electron-builder-squirrel-windows": "24.1.2",
-    "electron-devtools-installer": "^3.2.0",
-    "eslint": "^8.26.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^1.0.0",
-    "eslint-plugin-unicorn": "^46.0.0",
-    "expect-playwright": "^0.8.0",
-    "find-npm-prefix": "^1.0.2",
-    "fs-extra": "^11.0.0",
-    "glob": "^9.0.0",
-    "jest": "^29.0.0",
-    "matrix-web-i18n": "^1.3.0",
-    "mkdirp": "^2.0.0",
-    "node-pre-gyp": "^0.17.0",
-    "pacote": "^15.0.0",
-    "playwright": "^1.25.0",
-    "prettier": "^2.8.1",
-    "rimraf": "^4.4.1",
-    "tar": "^6.1.2",
-    "ts-jest": "^29.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "5.0.3"
-  },
-  "hakDependencies": {
-    "matrix-seshat": "^2.3.3",
-    "keytar": "^7.9.0"
-  },
-  "resolutions": {
-    "@types/node": "16.18.23"
-  },
-  "build": {
-    "appId": "im.riot.app",
-    "asarUnpack": "**/*.node",
-    "files": [
-      "package.json",
-      {
-        "from": ".hak/hakModules",
-        "to": "node_modules"
-      },
-      "lib/**"
-    ],
-    "extraResources": [
-      {
-        "from": "res/img",
-        "to": "img"
-      },
-      "webapp.asar"
-    ],
-    "linux": {
-      "target": [
-        "tar.gz",
-        "deb"
-      ],
-      "category": "Network;InstantMessaging;Chat",
-      "maintainer": "support@element.io"
+    "name": "element-desktop",
+    "productName": "Element",
+    "main": "lib/electron-main.js",
+    "version": "1.11.54",
+    "description": "A feature-rich client for Matrix.org",
+    "author": "Element",
+    "homepage": "https://element.io",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/vector-im/element-desktop"
     },
-    "mac": {
-      "category": "public.app-category.social-networking",
-      "darkModeSupport": true,
-      "gatekeeperAssess": true
+    "license": "Apache-2.0",
+    "files": [],
+    "engines": {
+        "node": ">=18.0.0"
     },
-    "win": {
-      "target": [
-        "squirrel"
-      ]
+    "scripts": {
+        "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
+        "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json",
+        "i18n:lint": "prettier --log-level=silent  --write src/i18n/strings/ --ignore-path /dev/null",
+        "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+        "mkdirs": "mkdirp packages deploys",
+        "fetch": "yarn run mkdirs && ts-node scripts/fetch-package.ts",
+        "asar-webapp": "asar p webapp webapp.asar",
+        "start": "yarn run build:ts && yarn run build:res && electron .",
+        "lint": "yarn lint:types && yarn lint:js && yarn lint:workflows",
+        "lint:js": "yarn lint:js:src && yarn lint:js:test && yarn lint:js:scripts && yarn lint:js:hak && prettier --check .",
+        "lint:js:src": "eslint --max-warnings 0 src",
+        "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js playwright",
+        "lint:js:scripts": "eslint --max-warnings 0 --config .eslintrc-scripts.js scripts",
+        "lint:js:hak": "eslint --max-warnings 0 --config .eslintrc-hak.js hak",
+        "lint:js-fix": "yarn lint:js-fix:src &&yarn lint:js-fix:test && yarn lint:js-fix:scripts && yarn lint:js-fix:hak && prettier --log-level=warn --write .",
+        "lint:js-fix:src": "eslint --fix --max-warnings 0 src",
+        "lint:js-fix:test": "eslint --fix --max-warnings 0 --config .eslintrc-test.js playwright",
+        "lint:js-fix:scripts": "eslint --fix --max-warnings 0 --config .eslintrc-scripts.js scripts",
+        "lint:js-fix:hak": "eslint --fix --max-warnings 0 --config .eslintrc-hak.js hak",
+        "lint:types": "yarn lint:types:src && yarn lint:types:test && yarn lint:types:scripts && yarn lint:types:hak",
+        "lint:types:src": "tsc --noEmit",
+        "lint:types:test": "tsc --noEmit -p playwright/tsconfig.json",
+        "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
+        "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
+        "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'",
+        "lint:knip": "knip",
+        "build:native": "yarn run hak",
+        "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
+        "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
+        "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
+        "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
+        "build": "yarn run build:ts && yarn run build:res && electron-builder",
+        "build:ts": "tsc",
+        "build:res": "ts-node scripts/copy-res.ts",
+        "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild dockerbuild",
+        "docker:build:native": "scripts/in-docker.sh yarn run hak",
+        "docker:build": "scripts/in-docker.sh yarn run build",
+        "docker:install": "scripts/in-docker.sh yarn install",
+        "clean": "rimraf webapp.asar dist packages deploys lib",
+        "hak": "ts-node scripts/hak/index.ts",
+        "test": "playwright test",
+        "test:open": "yarn test --ui",
+        "test:screenshots:build": "docker build playwright -t element-desktop-playwright --platform linux/amd64",
+        "test:screenshots:run": "docker run --rm --network host -v $(pwd):/work/element-desktop -v /var/run/docker.sock:/var/run/docker.sock --platform linux/amd64 -it element-desktop-playwright"
     },
-    "directories": {
-      "output": "dist"
+    "dependencies": {
+        "@sentry/electron": "^4.3.0",
+        "auto-launch": "^5.0.5",
+        "counterpart": "^0.18.6",
+        "electron-clear-data": "^1.0.5",
+        "electron-store": "^8.0.2",
+        "electron-window-state": "^5.0.3",
+        "minimist": "^1.2.6",
+        "node-fetch": "^2",
+        "png-to-ico": "^2.1.1",
+        "uuid": "^9.0.0"
     },
-    "protocols": [
-      {
-        "name": "element",
-        "schemes": [
-          "element"
-        ]
-      }
-    ]
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "testMatch": [
-      "<rootDir>/test/**/*-test.[jt]s?(x)"
-    ],
-    "setupFilesAfterEnv": [
-      "expect-playwright"
-    ]
-  }
+    "devDependencies": {
+        "@action-validator/cli": "^0.5.3",
+        "@action-validator/core": "^0.5.3",
+        "@babel/core": "^7.18.10",
+        "@babel/preset-env": "^7.18.10",
+        "@babel/preset-typescript": "^7.18.6",
+        "@electron/asar": "^3.2.3",
+        "@electron/fuses": "^1.7.0",
+        "@playwright/test": "1.40.1",
+        "@types/auto-launch": "^5.0.1",
+        "@types/counterpart": "^0.18.1",
+        "@types/minimist": "^1.2.1",
+        "@types/mkdirp": "^1.0.2",
+        "@types/node": "18.19.8",
+        "@types/pacote": "^11.1.1",
+        "@types/tar": "^6.1.3",
+        "@types/uuid": "^9.0.2",
+        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/parser": "^6.0.0",
+        "app-builder-lib": "24.11.0",
+        "chokidar": "^3.5.2",
+        "detect-libc": "^2.0.0",
+        "electron": "^28.0.0",
+        "electron-builder": "24.9.1",
+        "electron-builder-squirrel-windows": "24.11.0",
+        "electron-devtools-installer": "^3.2.0",
+        "eslint": "^8.26.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-import": "^2.25.4",
+        "eslint-plugin-matrix-org": "^1.0.0",
+        "eslint-plugin-unicorn": "^50.0.0",
+        "find-npm-prefix": "^1.0.2",
+        "glob": "^10.0.0",
+        "knip": "^4.0.1",
+        "matrix-web-i18n": "^3.1.3",
+        "mkdirp": "^3.0.0",
+        "node-pre-gyp": "^0.17.0",
+        "pacote": "^17.0.0",
+        "prettier": "^3.0.0",
+        "rimraf": "^5.0.0",
+        "tar": "^6.1.2",
+        "ts-node": "^10.9.1",
+        "typescript": "5.3.3"
+    },
+    "hakDependencies": {
+        "matrix-seshat": "^3.0.1",
+        "keytar": "^7.9.0"
+    },
+    "resolutions": {
+        "@types/node": "18.19.8"
+    }
 }

playwright.config.ts

@@ -0,0 +1,33 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { defineConfig } from "@playwright/test";
+
+export default defineConfig({
+    use: {
+        viewport: { width: 1280, height: 720 },
+        video: "retain-on-failure",
+        trace: "on-first-retry",
+    },
+    testDir: "playwright/e2e",
+    outputDir: "playwright/test-results",
+    workers: 1,
+    retries: process.env.CI ? 2 : 0,
+    reporter: [["html", { outputFolder: "playwright/html-report" }]],
+    snapshotDir: "playwright/snapshots",
+    snapshotPathTemplate: "{snapshotDir}/{testFilePath}/{arg}-{platform}{ext}",
+    timeout: 10 * 1000,
+});

playwright/.gitignore

@@ -0,0 +1,5 @@
+/test-results/
+/html-report/
+# Only commit snapshots from Linux
+/snapshots/**/*.png
+!/snapshots/**/*-linux.png

playwright/Dockerfile

@@ -0,0 +1,10 @@
+FROM mcr.microsoft.com/playwright:v1.41.0-jammy
+
+WORKDIR /work/element-desktop
+
+RUN apt-get update && apt-get -y install xvfb
+
+USER 1000:1000
+
+COPY docker-entrypoint.sh /opt/docker-entrypoint.sh
+ENTRYPOINT ["bash", "/opt/docker-entrypoint.sh"]

playwright/docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+echo "Starting Xvfb"
+Xvfb :99 -ac &
+sleep 2
+
+export DISPLAY=:99
+
+npx playwright test --update-snapshots --reporter line $1

playwright/e2e/launch/launch.spec.ts

@@ -0,0 +1,26 @@
+/*
+Copyright 2022 - 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { test, expect } from "../../element-desktop-test";
+
+test.describe("App launch", () => {
+    test("should launch and render the welcome view successfully", async ({ page }) => {
+        await page.locator("#matrixchat").waitFor();
+        await page.locator(".mx_Welcome").waitFor();
+        await expect(page).toHaveURL("vector://vector/webapp/#/welcome");
+        await expect(page).toHaveScreenshot();
+    });
+});

playwright/element-desktop-test.ts

@@ -0,0 +1,57 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { _electron as electron, test as base, expect as baseExpect, type ElectronApplication } from "@playwright/test";
+import fs from "node:fs/promises";
+import path from "node:path";
+import os from "node:os";
+
+export const test = base.extend<{ app: ElectronApplication; tmpDir: string }>({
+    // eslint-disable-next-line no-empty-pattern
+    tmpDir: async ({}, use) => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "element-desktop-tests-"));
+        console.log("Using temp profile directory: ", tmpDir);
+        await use(tmpDir);
+        await fs.rm(tmpDir, { recursive: true });
+    },
+    app: async ({ tmpDir }, use) => {
+        const args = ["--profile-dir", tmpDir];
+
+        const executablePath = process.env["ELEMENT_DESKTOP_EXECUTABLE"];
+        if (!executablePath) {
+            // Unpackaged mode testing
+            args.unshift("./lib/electron-main.js");
+        }
+
+        const app = await electron.launch({
+            env: process.env,
+            executablePath,
+            args,
+        });
+
+        await app.firstWindow();
+        await use(app);
+    },
+    page: async ({ app }, use) => {
+        const window = await app.firstWindow();
+        await use(window);
+        await app.close().catch((e) => {
+            console.error(e);
+        });
+    },
+});
+
+export const expect = baseExpect;

playwright/tsconfig.json

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "target": "es2017",
+        "module": "es2022",
+        "lib": ["ESNext", "es2021", "dom"],
+    },
+    "include": ["**/*.ts"],
+}

scripts/copy-res.ts

@@ -28,11 +28,11 @@ fs.mkdirSync("lib/i18n/strings", { recursive: true });
 type Translations = Record<string, Record<string, string> | string>;
 
 function genLangFile(file: string, dest: string): void {
-    const inTrs: Record<string, string> = {};
+    const translations: Translations = {};
     [file].forEach(function (f) {
         if (fs.existsSync(f)) {
             try {
-                Object.assign(inTrs, JSON.parse(fs.readFileSync(f).toString()));
+                Object.assign(translations, JSON.parse(fs.readFileSync(f).toString()));
             } catch (e) {
                 console.error("Failed: " + f, e);
                 throw e;
@@ -40,7 +40,6 @@ function genLangFile(file: string, dest: string): void {
         }
     });
 
-    const translations = weblateToCounterpart(inTrs);
     const json = JSON.stringify(translations, null, 4);
     const filename = path.basename(file);
 
@@ -50,46 +49,6 @@ function genLangFile(file: string, dest: string): void {
     }
 }
 
-/*
- * Convert translation key from weblate format
- * (which only supports a single level) to counterpart
- * which requires object values for 'count' translations.
- *
- * eg.
- *     "there are %(count)s badgers|one": "a badger",
- *     "there are %(count)s badgers|other": "%(count)s badgers"
- *   becomes
- *     "there are %(count)s badgers": {
- *         "one": "a badger",
- *         "other": "%(count)s badgers"
- *     }
- */
-function weblateToCounterpart(inTrs: Record<string, string>): Translations {
-    const outTrs: Translations = {};
-
-    for (const key of Object.keys(inTrs)) {
-        const keyParts = key.split("|", 2);
-        if (keyParts.length === 2) {
-            let obj = outTrs[keyParts[0]];
-            if (obj === undefined) {
-                obj = outTrs[keyParts[0]] = {};
-            } else if (typeof obj === "string") {
-                // This is a transitional edge case if a string went from singular to pluralised and both still remain
-                // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
-                obj = outTrs[keyParts[0]] = {
-                    other: inTrs[key],
-                };
-                console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
-            }
-            obj[keyParts[1]] = inTrs[key];
-        } else {
-            outTrs[key] = inTrs[key];
-        }
-    }
-
-    return outTrs;
-}
-
 /*
  watch the input files for a given language,
  regenerate the file, and regenerating languages.json with the new filename

scripts/fetch-package.ts

@@ -12,7 +12,7 @@ import riotDesktopPackageJson from "../package.json";
 import { setPackageVersion } from "./set-version";
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
-const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
+const PACKAGE_URL_PREFIX = "https://github.com/element-hq/element-web/releases/download/";
 const DEVELOP_TGZ_URL = "https://develop.element.io/develop.tar.gz";
 const ASAR_PATH = "webapp.asar";
 

scripts/generate-builder-config.ts

@@ -1,128 +0,0 @@
-#!/usr/bin/env -S npx ts-node
-
-/**
- * Script to generate electron-builder.json config files for builds which don't match package.json, e.g. nightlies
- * This script has different outputs depending on your os platform.
- *
- * On Windows:
- *  Prefixes the nightly version with `0.0.1-nightly.` as it breaks if it is not semver
- *
- * On macOS:
- *   Passes --notarytool-team-id to build.mac.notarize.notarize if specified
- *
- * On Linux:
- *  Replaces spaces in the product name with dashes as spaces in paths can cause issues
- *  Passes --deb-custom-control to build.deb.fpm if specified
- */
-
-import parseArgs from "minimist";
-import fsProm from "fs/promises";
-import * as os from "os";
-import { Configuration } from "app-builder-lib";
-
-const ELECTRON_BUILDER_CFG_FILE = "electron-builder.json";
-
-const NIGHTLY_APP_ID = "im.riot.nightly";
-const NIGHTLY_APP_NAME = "element-desktop-nightly";
-
-const argv = parseArgs<{
-    "nightly"?: string;
-    "signtool-thumbprint"?: string;
-    "signtool-subject-name"?: string;
-    "notarytool-team-id"?: string;
-    "deb-custom-control"?: string;
-    "deb-changelog"?: string;
-}>(process.argv.slice(2), {
-    string: [
-        "nightly",
-        "deb-custom-control",
-        "deb-changelog",
-        "signtool-thumbprint",
-        "signtool-subject-name",
-        "notarytool-team-id",
-    ],
-});
-
-type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
-
-interface PackageBuild extends DeepWriteable<Omit<Configuration, "extraMetadata">> {
-    extraMetadata?: {
-        productName?: string;
-        name?: string;
-        version?: string;
-    };
-}
-
-interface Package {
-    build: PackageBuild;
-    productName: string;
-}
-
-async function main(): Promise<number | void> {
-    // Electron builder doesn't overlay with the config in package.json, so load it here
-    const pkg: Package = JSON.parse(await fsProm.readFile("package.json", "utf8"));
-
-    const cfg: PackageBuild = {
-        ...pkg.build,
-        extraMetadata: {
-            productName: pkg.productName,
-        },
-    };
-
-    if (argv.nightly) {
-        cfg.appId = NIGHTLY_APP_ID;
-        cfg.extraMetadata!.productName += " Nightly";
-        cfg.extraMetadata!.name = NIGHTLY_APP_NAME;
-
-        let version = argv.nightly;
-        if (os.platform() === "win32") {
-            // The windows packager relies on parsing this as semver, so we have to make it look like one.
-            // This will give our update packages really stupid names, but we probably can't change that either
-            // because squirrel windows parses them for the version too. We don't really care: nobody sees them.
-            // We just give the installer a static name, so you'll just see this in the 'about' dialog.
-            // Turns out if you use 0.0.0 here it makes Squirrel windows crash, so we use 0.0.1.
-            version = "0.0.1-nightly." + version;
-        }
-        cfg.extraMetadata!.version = version;
-    }
-
-    if (argv["signtool-thumbprint"] && argv["signtool-subject-name"]) {
-        cfg.win!.signingHashAlgorithms = ["sha256"];
-        cfg.win!.certificateSubjectName = argv["signtool-subject-name"];
-        cfg.win!.certificateSha1 = argv["signtool-thumbprint"];
-    }
-
-    if (argv["notarytool-team-id"]) {
-        cfg.mac!.notarize = {
-            teamId: argv["notarytool-team-id"],
-        };
-    }
-
-    if (os.platform() === "linux") {
-        // Electron crashes on debian if there's a space in the path.
-        // https://github.com/vector-im/element-web/issues/13171
-        cfg.extraMetadata!.productName = cfg.extraMetadata!.productName!.replace(/ /g, "-");
-
-        cfg.deb = {
-            fpm: [],
-        };
-
-        if (argv["deb-custom-control"]) {
-            cfg.deb.fpm!.push(`--deb-custom-control=${argv["deb-custom-control"]}`);
-        }
-        if (argv["deb-changelog"]) {
-            cfg.deb.fpm!.push(`--deb-changelog=${argv["deb-changelog"]}`);
-        }
-    }
-
-    await fsProm.writeFile(ELECTRON_BUILDER_CFG_FILE, JSON.stringify(cfg, null, 4));
-}
-
-main()
-    .then((ret) => {
-        process.exit(ret!);
-    })
-    .catch((e) => {
-        console.error(e);
-        process.exit(1);
-    });

scripts/get-version.ts

@@ -0,0 +1,25 @@
+#!/usr/bin/env -S npx ts-node
+
+/*
+ * Checks for the presence of a webapp, inspects its version and prints it
+ */
+
+import { versionFromAsar } from "./set-version";
+
+async function main(): Promise<number> {
+    const version = await versionFromAsar();
+    console.log(version);
+
+    return 0;
+}
+
+if (require.main === module) {
+    main()
+        .then((ret) => {
+            process.exit(ret);
+        })
+        .catch((e) => {
+            console.error(e);
+            process.exit(1);
+        });
+}

scripts/hak/README.md

@@ -62,7 +62,6 @@ Hak is divided into lifecycle stages, in order:
 
 -   fetch - Download and extract the source of the dependency
 -   link - Link the copy of the dependency into your node_modules directory
--   fetchDeps - Fetch & extract any native dependencies required to build the module.
 -   build - The Good Stuff. Configure and build any native dependencies, then the module itself.
 -   copy - Copy the built artifact from the module build directory to the module output directory.
 

scripts/hak/clean.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import path from "path";
-import rimraf from "rimraf";
+import { rimraf } from "rimraf";
 
 import { DependencyInfo } from "./dep";
 import HakEnv from "./hakEnv";

scripts/hak/copy.ts

@@ -17,9 +17,9 @@ limitations under the License.
 import path from "path";
 import fsProm from "fs/promises";
 import childProcess from "child_process";
-import rimraf from "rimraf";
+import { rimraf } from "rimraf";
 import { glob } from "glob";
-import mkdirp from "mkdirp";
+import { mkdirp } from "mkdirp";
 
 import HakEnv from "./hakEnv";
 import { DependencyInfo } from "./dep";

scripts/hak/fetchDeps.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import mkdirp from "mkdirp";
+import { mkdirp } from "mkdirp";
 
 import { DependencyInfo } from "./dep";
 import HakEnv from "./hakEnv";

scripts/hak/hakEnv.ts

@@ -41,7 +41,10 @@ export default class HakEnv {
     public runtimeVersion?: string;
     public dotHakDir: string;
 
-    public constructor(public readonly projectRoot: string, targetId: TargetId | null) {
+    public constructor(
+        public readonly projectRoot: string,
+        targetId: TargetId | null,
+    ) {
         const target = targetId ? TARGETS[targetId] : getHost();
 
         if (!target) {
@@ -81,6 +84,10 @@ export default class HakEnv {
         return this.target.platform === "linux";
     }
 
+    public isFreeBSD(): boolean {
+        return this.target.platform === "freebsd";
+    }
+
     public getTargetArch(): Arch {
         return this.target.arch;
     }
@@ -101,11 +108,7 @@ export default class HakEnv {
         });
     }
 
-    public wantsStaticSqlCipherUnix(): boolean {
-        return this.isMac() || process.env.SQLCIPHER_STATIC == "1";
-    }
-
     public wantsStaticSqlCipher(): boolean {
-        return this.isWin() || this.wantsStaticSqlCipherUnix();
+        return !(this.isLinux() || this.isFreeBSD()) || process.env.SQLCIPHER_BUNDLED == "1";
     }
 }

scripts/hak/index.ts

@@ -24,17 +24,17 @@ import { DependencyInfo } from "./dep";
 const GENERALCOMMANDS = ["target"];
 
 // These can only be run on specific modules
-const MODULECOMMANDS = ["check", "fetch", "link", "fetchDeps", "build", "copy", "clean"];
+const MODULECOMMANDS = ["check", "fetch", "link", "build", "copy", "clean"];
 
 // Shortcuts for multiple commands at once (useful for building universal binaries
 // because you can run the fetch/fetchDeps/build for each arch and then copy/link once)
 const METACOMMANDS: Record<string, string[]> = {
-    fetchandbuild: ["check", "fetch", "fetchDeps", "build"],
+    fetchandbuild: ["check", "fetch", "build"],
     copyandlink: ["copy", "link"],
 };
 
 // Scripts valid in a hak.json 'scripts' section
-const HAKSCRIPTS = ["check", "fetch", "fetchDeps", "build"];
+const HAKSCRIPTS = ["check", "fetch", "build"];
 
 async function main(): Promise<void> {
     const prefix = await findNpmPrefix(process.cwd());
@@ -113,7 +113,7 @@ async function main(): Promise<void> {
 
     let cmds: string[];
     if (process.argv.length < 3) {
-        cmds = ["check", "fetch", "fetchDeps", "build", "copy", "link"];
+        cmds = ["check", "fetch", "build", "copy", "link"];
     } else if (METACOMMANDS[process.argv[2]]) {
         cmds = METACOMMANDS[process.argv[2]];
     } else {

scripts/hak/target.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { GLIBC, MUSL, family as processLibC } from "detect-libc";
+import { GLIBC, MUSL, familySync as processLibC } from "detect-libc";
 
 // We borrow Rust's target naming scheme as a way of expressing all target
 // details in a single string.
@@ -26,6 +26,9 @@ export type TargetId =
     | "i686-pc-windows-msvc"
     | "x86_64-pc-windows-msvc"
     | "aarch64-pc-windows-msvc"
+    | "i686-unknown-freebsd"
+    | "x86_64-unknown-freebsd"
+    | "aarch64-unknown-freebsd"
     | "i686-unknown-linux-musl"
     | "i686-unknown-linux-gnu"
     | "x86_64-unknown-linux-musl"
@@ -36,7 +39,7 @@ export type TargetId =
     | "powerpc64le-unknown-linux-gnu";
 
 // Values are expected to match those used in `process.platform`.
-export type Platform = "darwin" | "linux" | "win32";
+export type Platform = "darwin" | "freebsd" | "linux" | "win32";
 
 // Values are expected to match those used in `process.arch`.
 export type Arch = "arm64" | "ia32" | "x64" | "ppc64" | "universal";
@@ -58,7 +61,7 @@ export type WindowsTarget = Target & {
 
 export type LinuxTarget = Target & {
     platform: "linux";
-    libC: typeof processLibC;
+    libC: typeof GLIBC | typeof MUSL;
 };
 
 export type UniversalTarget = Target & {
@@ -106,6 +109,24 @@ const aarch64WindowsMsvc: WindowsTarget = {
     vcVarsArch: "arm64",
 };
 
+const i686UnknownFreebsd: Target = {
+    id: "i686-unknown-freebsd",
+    platform: "freebsd",
+    arch: "ia32",
+};
+
+const x8664UnknownFreebsd: Target = {
+    id: "x86_64-unknown-freebsd",
+    platform: "freebsd",
+    arch: "x64",
+};
+
+const aarch64UnknownFreebsd: Target = {
+    id: "aarch64-unknown-freebsd",
+    platform: "freebsd",
+    arch: "arm64",
+};
+
 const x8664UnknownLinuxGnu: LinuxTarget = {
     id: "x86_64-unknown-linux-gnu",
     platform: "linux",
@@ -171,6 +192,10 @@ export const TARGETS: Record<TargetId, Target> = {
     "i686-pc-windows-msvc": i686PcWindowsMsvc,
     "x86_64-pc-windows-msvc": x8664PcWindowsMsvc,
     "aarch64-pc-windows-msvc": aarch64WindowsMsvc,
+    // FreeBSD
+    "i686-unknown-freebsd": i686UnknownFreebsd,
+    "x86_64-unknown-freebsd": x8664UnknownFreebsd,
+    "aarch64-unknown-freebsd": aarch64UnknownFreebsd,
     // Linux
     "i686-unknown-linux-musl": i686UnknownLinuxMusl,
     "i686-unknown-linux-gnu": i686UnknownLinuxGnu,
@@ -187,7 +212,7 @@ export function getHost(): Target | undefined {
         (target) =>
             target.platform === process.platform &&
             target.arch === process.arch &&
-            (process.platform !== "linux" || (target as LinuxTarget).libC === processLibC),
+            (process.platform !== "linux" || (target as LinuxTarget).libC === processLibC()),
     );
 }
 

scripts/in-docker.sh

@@ -11,6 +11,7 @@ fi
 # Taken from https://www.electron.build/multi-platform-build#docker
 # Pass through any vars prefixed with INDOCKER_, removing the prefix
 docker run --rm -ti \
+ --platform linux/amd64 \
  --env-file <(env | grep -E '^INDOCKER_' | sed -e 's/^INDOCKER_//') \
  --env ELECTRON_CACHE="/root/.cache/electron" \
  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \

scripts/tsconfig.json

@@ -7,10 +7,10 @@
         "module": "commonjs",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2019", "dom"]
+        "lib": ["es2020", "dom"],
     },
     "include": ["../src/@types", "./**/*.ts"],
     "ts-node": {
-        "transpileOnly": true
-    }
+        "transpileOnly": true,
+    },
 }

src/displayMediaCallback.ts

@@ -0,0 +1,29 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Streams } from "electron";
+
+type DisplayMediaCallback = (streams: Streams) => void;
+
+let displayMediaCallback: DisplayMediaCallback | null;
+
+export const getDisplayMediaCallback = (): DisplayMediaCallback | null => {
+    return displayMediaCallback;
+};
+
+export const setDisplayMediaCallback = (callback: DisplayMediaCallback | null): void => {
+    displayMediaCallback = callback;
+};

src/electron-main.ts

@@ -19,7 +19,7 @@ limitations under the License.
 
 // Squirrel on windows starts the app with various flags as hooks to tell us when we've been installed/uninstalled etc.
 import "./squirrelhooks";
-import { app, BrowserWindow, Menu, autoUpdater, protocol, dialog, Input } from "electron";
+import { app, BrowserWindow, Menu, autoUpdater, protocol, dialog, Input, Event, session } from "electron";
 import * as Sentry from "@sentry/electron/main";
 import AutoLaunch from "auto-launch";
 import path from "path";
@@ -39,6 +39,8 @@ import webContentsHandler from "./webcontents-handler";
 import * as updater from "./updater";
 import { getProfileFromDeeplink, protocolInit } from "./protocol";
 import { _t, AppLocalization } from "./language-helper";
+import { setDisplayMediaCallback } from "./displayMediaCallback";
+import { setupMacosTitleBar } from "./macos-titlebar";
 
 const argv = minimist(process.argv, {
     alias: { help: "h" },
@@ -163,10 +165,13 @@ async function loadConfig(): Promise<void> {
             // Rip out all the homeserver options from the vector config
             global.vectorConfig = Object.keys(global.vectorConfig)
                 .filter((k) => !homeserverProps.includes(<any>k))
-                .reduce((obj, key) => {
-                    obj[key] = global.vectorConfig[key];
-                    return obj;
-                }, {} as Omit<Partial<(typeof global)["vectorConfig"]>, keyof typeof homeserverProps>);
+                .reduce(
+                    (obj, key) => {
+                        obj[key] = global.vectorConfig[key];
+                        return obj;
+                    },
+                    {} as Omit<Partial<(typeof global)["vectorConfig"]>, keyof typeof homeserverProps>,
+                );
         }
 
         global.vectorConfig = Object.assign(global.vectorConfig, localConfig);
@@ -258,7 +263,8 @@ global.appQuitting = false;
 const exitShortcuts: Array<(input: Input, platform: string) => boolean> = [
     (input, platform): boolean => platform !== "darwin" && input.alt && input.key.toUpperCase() === "F4",
     (input, platform): boolean => platform !== "darwin" && input.control && input.key.toUpperCase() === "Q",
-    (input, platform): boolean => platform === "darwin" && input.meta && input.key.toUpperCase() === "Q",
+    (input, platform): boolean =>
+        platform === "darwin" && input.meta && !input.control && input.key.toUpperCase() === "Q",
 ];
 
 const warnBeforeExit = (event: Event, input: Input): void => {
@@ -271,12 +277,12 @@ const warnBeforeExit = (event: Event, input: Input): void => {
             dialog.showMessageBoxSync(global.mainWindow, {
                 type: "question",
                 buttons: [
-                    _t("Cancel"),
-                    _t("Close %(brand)s", {
+                    _t("action|cancel"),
+                    _t("action|close_brand", {
                         brand: global.vectorConfig.brand || "Element",
                     }),
                 ],
-                message: _t("Are you sure you want to quit?"),
+                message: _t("confirm_quit"),
                 defaultId: 1,
                 cancelId: 0,
             }) === 0;
@@ -453,6 +459,9 @@ app.on("ready", async () => {
         // https://www.electronjs.org/docs/faq#the-font-looks-blurry-what-is-this-and-what-can-i-do
         backgroundColor: "#fff",
 
+        titleBarStyle: process.platform === "darwin" ? "hidden" : "default",
+        trafficLightPosition: { x: 9, y: 8 },
+
         icon: global.trayConfig.icon_path,
         show: false,
         autoHideMenuBar: global.store.get("autoHideMenuBar", true),
@@ -471,6 +480,10 @@ app.on("ready", async () => {
     });
     global.mainWindow.loadURL("vector://vector/webapp/");
 
+    if (process.platform === "darwin") {
+        setupMacosTitleBar(global.mainWindow);
+    }
+
     // Handle spellchecker
     // For some reason spellCheckerEnabled isn't persisted, so we have to use the store here
     global.mainWindow.webContents.session.setSpellCheckerEnabled(global.store.get("spellCheckerEnabled", true));
@@ -532,6 +545,11 @@ app.on("ready", async () => {
         store: global.store,
         components: [(): void => tray.initApplicationMenu(), (): void => Menu.setApplicationMenu(buildMenuTemplate())],
     });
+
+    session.defaultSession.setDisplayMediaRequestHandler((_, callback) => {
+        global.mainWindow?.webContents.send("openDesktopCapturerSourcePicker");
+        setDisplayMediaCallback(callback);
+    });
 });
 
 app.on("window-all-closed", () => {

src/i18n/strings/ar.json

@@ -1,47 +0,0 @@
-{
-    "File": "ملف",
-    "Close": "أغلِق",
-    "Actual Size": "المقاس الفعلي",
-    "View": "منظور",
-    "Select All": "حدّد الكل",
-    "Delete": "احذف",
-    "Copy": "انسخ",
-    "Edit": "تحرير",
-    "Cancel": "ألغِ",
-    "Bring All to Front": "ضَع الكل في المقدّمة",
-    "Speech": "نطق",
-    "Add to dictionary": "أضِف إلى القاموس",
-    "The image failed to save": "فشل حفظ الصورة",
-    "Failed to save image": "فشل حفظ الصورة",
-    "Save image as...": "احفظ الصورة كَ‍...",
-    "Copy link address": "انسخ عنوان الرابط",
-    "Copy email address": "انسخ عنوان البريد الإلكتروني",
-    "Copy image": "انسخ الصورة",
-    "Zoom": "تقريب",
-    "Stop Speaking": "أوقِف النطق",
-    "Start Speaking": "ابدأ النطق",
-    "Unhide": "اعرض",
-    "Hide Others": "أخفِ البقية",
-    "Hide": "أخفِ",
-    "Services": "الخدمات",
-    "About": "عن",
-    "Element Help": "مساعدة Element",
-    "Help": "مساعدة",
-    "Minimize": "صغّر",
-    "Window": "نافذة",
-    "Toggle Developer Tools": "فعّل/عطّل أدوات المطوّرين",
-    "Toggle Full Screen": "فعّل/عطّل ملء الشاشة",
-    "Preferences": "التفضيلات",
-    "Zoom In": "قرّب",
-    "Zoom Out": "بعّد",
-    "Paste and Match Style": "ألصِق وطابِق النمط",
-    "Paste": "ألصِق",
-    "Cut": "قصّ",
-    "Redo": "أعِد",
-    "Undo": "تراجَع",
-    "Quit": "غادِر",
-    "Show/Hide": "اعرض/أخفِ",
-    "Are you sure you want to quit?": "أمتأكّد من الإغلاق؟",
-    "Copy image address": "انسخ عنوان (رابط) الصورة",
-    "Close %(brand)s": "اغلاق %(brand)s"
-}

src/i18n/strings/basefile.json

@@ -1 +0,0 @@
-{}

src/i18n/strings/be.json

@@ -1,45 +0,0 @@
-{
-    "Add to dictionary": "Дадаць у слоўнік",
-    "The image failed to save": "Не атрымалася захаваць малюнак",
-    "Failed to save image": "Не атрымалася захаваць малюнак",
-    "Save image as...": "Захаваць малюнак як...",
-    "Copy link address": "Скапіраваць спасылку",
-    "Copy email address": "Скапіраваць адрас пошты",
-    "Copy image": "Скапіраваць малюнак",
-    "File": "Файл",
-    "Bring All to Front": "Вынесці ўсё наперад",
-    "Zoom": "Маштаб",
-    "Stop Speaking": "Перастаць гаварыць",
-    "Start Speaking": "Гаварыць",
-    "Speech": "Голас",
-    "Unhide": "Паказаць",
-    "Hide Others": "Схаваць іншыя",
-    "Hide": "Схаваць",
-    "Services": "Сервісы",
-    "About": "Аб праграме",
-    "Element Help": "Даведка Element",
-    "Help": "Даведка",
-    "Close": "Зачыніць",
-    "Minimize": "Згарнуць",
-    "Window": "Акно",
-    "Toggle Developer Tools": "Пераключэнне інструментаў распрацоўніка",
-    "Toggle Full Screen": "Пераключэнне на ўвесь экран",
-    "Preferences": "Параметры",
-    "Zoom Out": "Паменшыць",
-    "Zoom In": "Павялічыць",
-    "Actual Size": "Фактычны Памер",
-    "View": "Прагляд",
-    "Select All": "Выбраць усё",
-    "Delete": "Выдаліць",
-    "Paste and Match Style": "Уставіць і супаставіць стыль",
-    "Paste": "Уставіць",
-    "Copy": "Капіяваць",
-    "Cut": "Выразаць",
-    "Redo": "Паўтарыць",
-    "Undo": "Адмяніць",
-    "Edit": "Змяніць",
-    "Quit": "Выйсці",
-    "Show/Hide": "Паказаць / схаваць",
-    "Are you sure you want to quit?": "Вы ўпэўненыя, што хочаце выйсці?",
-    "Cancel": "Адмена"
-}

src/i18n/strings/bg.json

@@ -1,46 +0,0 @@
-{
-    "Add to dictionary": "Добави към речника",
-    "The image failed to save": "Изображението не успя да се запази",
-    "Failed to save image": "Неуспешно запазване на изображението",
-    "Save image as...": "Запази изображението като...",
-    "Copy link address": "Копирай линка",
-    "Copy image address": "Копирай адреса на изображението",
-    "Copy email address": "Копирай имейл адрес",
-    "Copy image": "Копирай изображение",
-    "File": "Файл",
-    "Bring All to Front": "Покажи всички най-отгоре",
-    "Zoom": "Мащабирай",
-    "Stop Speaking": "Спри да говориш",
-    "Start Speaking": "Започни да говориш",
-    "Speech": "Говор",
-    "Unhide": "Покажи",
-    "Hide Others": "Скрий Останалите",
-    "Hide": "Скрий",
-    "Services": "Услуги",
-    "About": "Относно",
-    "Element Help": "Помощ за Елемент",
-    "Help": "Помощ",
-    "Close": "Затвори",
-    "Minimize": "Минимизирай",
-    "Window": "Прозорец",
-    "Toggle Developer Tools": "Превключи инструментите за разработчици",
-    "Toggle Full Screen": "Превключи на Цял екран",
-    "Preferences": "Предпочитания",
-    "Zoom Out": "Намали",
-    "Zoom In": "Увеличи",
-    "Actual Size": "Действителен Размер",
-    "View": "Преглед",
-    "Select All": "Избери Всичко",
-    "Delete": "Изтрий",
-    "Paste and Match Style": "Постави и Използвай текущия стил",
-    "Paste": "Постави",
-    "Copy": "Копирай",
-    "Cut": "Изрежи",
-    "Redo": "Върни",
-    "Undo": "Отмени",
-    "Edit": "Редактирай",
-    "Quit": "Напусни",
-    "Show/Hide": "Покажи/Скрий",
-    "Are you sure you want to quit?": "Сигурен ли си че искаш да напуснеш?",
-    "Cancel": "Отказ"
-}

src/i18n/strings/bn.json

@@ -1,46 +0,0 @@
-{
-    "Are you sure you want to quit?": "তুমি কি আসলেই বের হতে চাও?",
-    "Cancel": "বাতিল",
-    "Save image as...": "ছবি সংরক্ষণের ধরন...",
-    "Failed to save image": "ছবি সংরক্ষণ ব্যর্থ",
-    "The image failed to save": "ছবি সংরক্ষণ ব্যর্থ",
-    "Add to dictionary": "অভিধানে যোগ করি",
-    "Copy link address": "সংযোগের ঠিকানা অনুলিপি করো",
-    "Copy image address": "ছবির ঠিকানা অনুলিপি করো",
-    "Copy email address": "ইমেইল ঠিকানা অনুলিপি করো",
-    "Copy image": "ছবি অনুলিপি করো",
-    "File": "নথি",
-    "Bring All to Front": "সবকিছু সামনে আনো",
-    "Zoom": "বড় করা",
-    "Stop Speaking": "কথা বন্ধ করো",
-    "Start Speaking": "কথা শুরু করো",
-    "Speech": "বাচন",
-    "Unhide": "দেখাও",
-    "Hide Others": "অন্যগুলো লুকাও",
-    "Hide": "লুকাও",
-    "Services": "সেবা",
-    "About": "আমাদের সম্পর্কে",
-    "Element Help": "এলিমেন্ট সাহায্য",
-    "Help": "সাহায্য",
-    "Close": "বন্ধ",
-    "Minimize": "সংকোচন",
-    "Window": "জানালা",
-    "Toggle Developer Tools": "ডেভেলপার সরঞ্জামাদি",
-    "Toggle Full Screen": "পূর্ণ পর্দা করো/বের হও",
-    "Preferences": "পছন্দসমূহ",
-    "Zoom Out": "ছোট করো",
-    "Zoom In": "বড়ো করো",
-    "Actual Size": "আসল আকার",
-    "View": "দেখো",
-    "Select All": "সব নির্বাচন",
-    "Delete": "অপসারণ",
-    "Paste and Match Style": "লেপন ও একই ধরনে",
-    "Paste": "লেপন",
-    "Copy": "অনুলিপি",
-    "Cut": "কাটো",
-    "Redo": "পুন",
-    "Undo": "ফিরত",
-    "Edit": "সম্পাদনা",
-    "Quit": "প্রস্থান",
-    "Show/Hide": "দেখাও/লুকাও"
-}

src/i18n/strings/ca.json

@@ -1,45 +0,0 @@
-{
-    "Add to dictionary": "Afegeix al diccionari",
-    "The image failed to save": "S'ha fallat en desar la imatge",
-    "Failed to save image": "S'ha fallat en desar la imatge",
-    "Save image as...": "Anomena i desa la imatge...",
-    "Copy link address": "Copia l'adreça de l'enllaç",
-    "Copy email address": "Copia l'adreça de correu electrònic",
-    "Copy image": "Copia la imatge",
-    "File": "Fitxer",
-    "Bring All to Front": "Porta-ho tot al davant",
-    "Zoom": "Escala",
-    "Stop Speaking": "Para la veu",
-    "Start Speaking": "Comença la veu",
-    "Speech": "Veu",
-    "Unhide": "Deixa d'amagar",
-    "Hide Others": "Amaga les altres",
-    "Hide": "Amaga",
-    "Services": "Serveis",
-    "About": "Quant a",
-    "Element Help": "Ajuda sobre l'Element",
-    "Help": "Ajuda",
-    "Close": "Tanca",
-    "Minimize": "Minimitza",
-    "Window": "Finestra",
-    "Toggle Developer Tools": "Commuta les eines per a desenvolupadors",
-    "Toggle Full Screen": "Commuta la pantalla completa",
-    "Preferences": "Preferències",
-    "Zoom Out": "Allunya",
-    "Zoom In": "Apropia",
-    "Actual Size": "Mida real",
-    "View": "Visualitza",
-    "Select All": "Selecciona-ho tot",
-    "Delete": "Suprimeix",
-    "Paste and Match Style": "Enganxa i fes coincidir l'estil",
-    "Paste": "Enganxa",
-    "Copy": "Copia",
-    "Cut": "Retalla",
-    "Redo": "Refés",
-    "Undo": "Desfés",
-    "Edit": "Edita",
-    "Quit": "Surt",
-    "Show/Hide": "Mostra/Amaga",
-    "Are you sure you want to quit?": "Esteu segur que voleu sortir?",
-    "Cancel": "Cancel·la"
-}

src/i18n/strings/cs.json

@@ -1,47 +1,63 @@
 {
-    "Add to dictionary": "Přidat do slovníku",
-    "Failed to save image": "Chyba při ukládání obrázku",
-    "The image failed to save": "Obrázek se nepodařilo uložit",
-    "Save image as...": "Uložit obrázek jako...",
-    "Copy link address": "Kopírovat adresu odkazu",
-    "Copy image address": "Kopírovat adresu obrázku",
-    "Copy email address": "Kopírovat e-mailovou adresu",
-    "Copy image": "Kopírovat obrázek",
-    "File": "Soubor",
-    "Bring All to Front": "Přenést vše do popředí",
-    "Zoom": "Lupa",
-    "Stop Speaking": "Zastavit nahrávání hlasu",
-    "Start Speaking": "Spustit nahrávání hlasu",
-    "Speech": "Řeč",
-    "Unhide": "Zrušit skrytí",
-    "Hide Others": "Skrýt ostatní",
-    "Hide": "Skrýt",
-    "Services": "Služby",
-    "About": "O aplikaci",
-    "Element Help": "Nápověda aplikace Element",
-    "Help": "Nápověda",
-    "Close": "Zavřít",
-    "Minimize": "Minimalizovat",
-    "Window": "Okno",
-    "Toggle Developer Tools": "Přepnout zobrazení nástrojů pro vývojáře",
-    "Toggle Full Screen": "Přepnout zobrazení celé obrazovky",
-    "Preferences": "Předvolby",
-    "Zoom Out": "Oddálit",
-    "Zoom In": "Přiblížit",
-    "Actual Size": "Aktuální velikost",
-    "View": "Zobrazit",
-    "Select All": "Vybrat vše",
-    "Delete": "Smazat",
-    "Paste and Match Style": "Vložit a přizpůsobit styl",
-    "Paste": "Vložit",
-    "Copy": "Kopírovat",
-    "Cut": "Vyjmout",
-    "Redo": "Znovu",
-    "Undo": "Zpět",
-    "Edit": "Úpravy",
-    "Quit": "Ukončit",
-    "Show/Hide": "Zobrazit/Skrýt",
-    "Are you sure you want to quit?": "Opravdu chcete ukončit aplikaci?",
-    "Close %(brand)s": "Zavřít %(brand)s",
-    "Cancel": "Zrušit"
+    "action": {
+        "cancel": "Storno",
+        "close": "Zavřít",
+        "close_brand": "Zavřít %(brand)s",
+        "copy": "Zkopírovat",
+        "cut": "Vyjmout",
+        "delete": "Smazat",
+        "edit": "Upravit",
+        "minimise": "Minimalizovat",
+        "paste": "Vložit",
+        "paste_match_style": "Vložit a přizpůsobit styl",
+        "quit": "Ukončit",
+        "redo": "Znovu",
+        "select_all": "Vybrat vše",
+        "show_hide": "Zobrazit/Skrýt",
+        "undo": "Zpět",
+        "zoom_in": "Přiblížit",
+        "zoom_out": "Oddálit"
+    },
+    "common": {
+        "about": "O",
+        "brand_help": "%(brand)s nápověda",
+        "help": "Nápověda",
+        "preferences": "Předvolby"
+    },
+    "confirm_quit": "Opravdu chcete ukončit aplikaci?",
+    "edit_menu": {
+        "speech": "Řeč",
+        "speech_start_speaking": "Spustit nahrávání hlasu",
+        "speech_stop_speaking": "Zastavit nahrávání hlasu"
+    },
+    "file_menu": {
+        "label": "Soubor"
+    },
+    "menu": {
+        "hide": "Skrýt",
+        "hide_others": "Skrýt ostatní",
+        "services": "Služby",
+        "unhide": "Zrušit skrytí"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Přidat do slovníku",
+        "copy_email": "Kopírovat e-mailovou adresu",
+        "copy_image": "Kopírovat obrázek",
+        "copy_image_url": "Kopírovat adresu obrázku",
+        "copy_link_url": "Kopírovat adresu odkazu",
+        "save_image_as": "Uložit obrázek jako...",
+        "save_image_as_error_description": "Obrázek se nepodařilo uložit",
+        "save_image_as_error_title": "Chyba při ukládání obrázku"
+    },
+    "view_menu": {
+        "actual_size": "Aktuální velikost",
+        "toggle_developer_tools": "Přepnout zobrazení nástrojů pro vývojáře",
+        "toggle_full_screen": "Přepnout zobrazení celé obrazovky",
+        "view": "Zobrazit"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Přenést vše do popředí",
+        "label": "Okno",
+        "zoom": "Lupa"
+    }
 }

src/i18n/strings/de.json

@@ -1,47 +0,0 @@
-{
-    "Speech": "Sprache",
-    "Paste and Match Style": "Einfügen und Formatierung beibehalten",
-    "Stop Speaking": "Aufnahme beenden",
-    "Start Speaking": "Aufnahme starten",
-    "Services": "Dienste",
-    "Are you sure you want to quit?": "Wirklich beenden?",
-    "Add to dictionary": "Wörterbuch hinzufügen",
-    "The image failed to save": "Das Bild konnte nicht gespeichert werden",
-    "Failed to save image": "Bild kann nicht gespeichert werden",
-    "Save image as...": "Bild speichern unter...",
-    "Copy link address": "Link-Adresse kopieren",
-    "Copy email address": "Email-Adresse kopieren",
-    "Copy image": "Bild kopieren",
-    "File": "Datei",
-    "Bring All to Front": "Alles in den Vordergrund",
-    "Zoom": "Zoom",
-    "Unhide": "Wieder anzeigen",
-    "Hide Others": "Andere verstecken",
-    "Hide": "Verstecken",
-    "About": "Über",
-    "Element Help": "Hilfe zu Element",
-    "Help": "Hilfe",
-    "Close": "Schließen",
-    "Minimize": "Minimieren",
-    "Window": "Fenster",
-    "Toggle Developer Tools": "Developer-Tools an/aus",
-    "Toggle Full Screen": "Vollbildschirm an/aus",
-    "Preferences": "Einstellungen",
-    "Zoom Out": "Verkleinern",
-    "Zoom In": "Vergrößern",
-    "Actual Size": "Tatsächliche Größe",
-    "View": "Ansicht",
-    "Select All": "Alles auswählen",
-    "Delete": "Löschen",
-    "Paste": "Einfügen",
-    "Copy": "Kopieren",
-    "Cut": "Ausschneiden",
-    "Redo": "Wiederherstellen",
-    "Undo": "Rückgängig",
-    "Edit": "Bearbeiten",
-    "Quit": "Beenden",
-    "Show/Hide": "Anzeigen/Ausblenden",
-    "Cancel": "Abbrechen",
-    "Copy image address": "Bild-Adresse kopieren",
-    "Close %(brand)s": "%(brand)s schließen"
-}

src/i18n/strings/de_DE.json

@@ -0,0 +1,63 @@
+{
+    "action": {
+        "cancel": "Abbrechen",
+        "close": "Schließen",
+        "close_brand": "%(brand)s schließen",
+        "copy": "Kopieren",
+        "cut": "Ausschneiden",
+        "delete": "Löschen",
+        "edit": "Bearbeiten",
+        "minimise": "Minimieren",
+        "paste": "Einfügen",
+        "paste_match_style": "Einfügen und Formatierung beibehalten",
+        "quit": "Beenden",
+        "redo": "Wiederherstellen",
+        "select_all": "Alles auswählen",
+        "show_hide": "Anzeigen/Ausblenden",
+        "undo": "Rückgängig",
+        "zoom_in": "Vergrößern",
+        "zoom_out": "Verkleinern"
+    },
+    "common": {
+        "about": "Über",
+        "brand_help": "%(brand)s Hilfe",
+        "help": "Hilfe",
+        "preferences": "Einstellungen"
+    },
+    "confirm_quit": "Wirklich beenden?",
+    "edit_menu": {
+        "speech": "Sprache",
+        "speech_start_speaking": "Aufnahme starten",
+        "speech_stop_speaking": "Aufnahme beenden"
+    },
+    "file_menu": {
+        "label": "Datei"
+    },
+    "menu": {
+        "hide": "Verstecken",
+        "hide_others": "Andere verstecken",
+        "services": "Dienste",
+        "unhide": "Wieder anzeigen"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Wörterbuch hinzufügen",
+        "copy_email": "Email-Adresse kopieren",
+        "copy_image": "Bild kopieren",
+        "copy_image_url": "Bild-Adresse kopieren",
+        "copy_link_url": "Link-Adresse kopieren",
+        "save_image_as": "Bild speichern unter...",
+        "save_image_as_error_description": "Das Bild konnte nicht gespeichert werden",
+        "save_image_as_error_title": "Bild kann nicht gespeichert werden"
+    },
+    "view_menu": {
+        "actual_size": "Tatsächliche Größe",
+        "toggle_developer_tools": "Developer-Tools an/aus",
+        "toggle_full_screen": "Vollbildschirm an/aus",
+        "view": "Ansicht"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Alles in den Vordergrund",
+        "label": "Fenster",
+        "zoom": "Zoomen"
+    }
+}

src/i18n/strings/el.json

@@ -1,46 +1,63 @@
 {
-    "Are you sure you want to quit?": "Είστε βέβαιος ότι θέλετε να εγκαταλείψετε;",
-    "Zoom": "Ζουμ",
-    "Unhide": "Εμφάνιση",
-    "Window": "Παράθυρο",
-    "Toggle Developer Tools": "Άνοιγμα Εργαλείων Προγραμματιστή",
-    "Toggle Full Screen": "Εναλλαγή σε Πλήρη Οθόνη",
-    "Copy email address": "Αντιγραφή διεύθυνσης email",
-    "File": "Αρχείο",
-    "Bring All to Front": "Μεταφορά Όλων στο Προσκήνιο",
-    "Stop Speaking": "Τερματίστε να μιλάτε",
-    "Start Speaking": "Ξεκινήστε να μιλάτε",
-    "Speech": "Ομιλία",
-    "Hide Others": "Απόκρυψη Άλλων",
-    "Hide": "Απόκρυψη",
-    "Services": "Υπηρεσίες",
-    "About": "Σχετικά με",
-    "Element Help": "Βοήθεια για το Element",
-    "Help": "Βοήθεια",
-    "Close": "Κλείσιμο",
-    "Minimize": "Ελαχιστοποίηση",
-    "Preferences": "Προτιμήσεις",
-    "Zoom Out": "Σμίκρυνση",
-    "Zoom In": "Μεγέθυνση",
-    "Actual Size": "Πραγματικό Μέγεθος",
-    "View": "Προβολή",
-    "Select All": "Επιλογή Όλων",
-    "Delete": "Διαγραφή",
-    "Paste and Match Style": "Επικόλληση και Ταίριασμα Στυλ",
-    "Paste": "Επικόλληση",
-    "Copy": "Αντιγραφή",
-    "Cut": "Αποκοπή",
-    "Redo": "Επανάληψη",
-    "Undo": "Αναίρεση",
-    "Edit": "Επεξεργασία",
-    "Quit": "Κλείσιμο",
-    "Show/Hide": "Eμφάνιση/Απόκρυψη",
-    "Cancel": "Ακύρωση",
-    "Add to dictionary": "Προσθήκη στο λεξικό",
-    "The image failed to save": "Η αποθήκευση της εικόνας απέτυχε",
-    "Failed to save image": "Αποτυχία αποθήκευσης εικόνας",
-    "Save image as...": "Αποθήκευση εικόνας ως...",
-    "Copy link address": "Αντιγραφή διεύθυνσης συνδέσμου",
-    "Copy image address": "Αντιγραφή διεύθυνσης εικόνας",
-    "Copy image": "Αντιγραφή εικόνας"
+    "action": {
+        "cancel": "Ακύρωση",
+        "close": "Κλείσιμο",
+        "close_brand": "Κλείσιμο %(brand)s",
+        "copy": "Αντιγραφή",
+        "cut": "Αποκοπή",
+        "delete": "Διαγραφή",
+        "edit": "Επεξεργασία",
+        "minimise": "Ελαχιστοποίηση",
+        "paste": "Επικόλληση",
+        "paste_match_style": "Επικόλληση και Ταίριασμα Στυλ",
+        "quit": "Κλείσιμο",
+        "redo": "Επανάληψη",
+        "select_all": "Επιλογή Όλων",
+        "show_hide": "Eμφάνιση/Απόκρυψη",
+        "undo": "Αναίρεση",
+        "zoom_in": "Μεγέθυνση",
+        "zoom_out": "Σμίκρυνση"
+    },
+    "common": {
+        "about": "Σχετικά με",
+        "brand_help": "%(brand)s Υποστήριξη",
+        "help": "Βοήθεια",
+        "preferences": "Προτιμήσεις"
+    },
+    "confirm_quit": "Είστε βέβαιος ότι θέλετε να εγκαταλείψετε;",
+    "edit_menu": {
+        "speech": "Ομιλία",
+        "speech_start_speaking": "Ξεκινήστε να μιλάτε",
+        "speech_stop_speaking": "Τερματίστε να μιλάτε"
+    },
+    "file_menu": {
+        "label": "Αρχείο"
+    },
+    "menu": {
+        "hide": "Απόκρυψη",
+        "hide_others": "Απόκρυψη Άλλων",
+        "services": "Υπηρεσίες",
+        "unhide": "Εμφάνιση"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Προσθήκη στο λεξικό",
+        "copy_email": "Αντιγραφή διεύθυνσης email",
+        "copy_image": "Αντιγραφή εικόνας",
+        "copy_image_url": "Αντιγραφή διεύθυνσης εικόνας",
+        "copy_link_url": "Αντιγραφή διεύθυνσης συνδέσμου",
+        "save_image_as": "Αποθήκευση εικόνας ως...",
+        "save_image_as_error_description": "Η αποθήκευση της εικόνας απέτυχε",
+        "save_image_as_error_title": "Αποτυχία αποθήκευσης εικόνας"
+    },
+    "view_menu": {
+        "actual_size": "Πραγματικό Μέγεθος",
+        "toggle_developer_tools": "Άνοιγμα Εργαλείων Προγραμματιστή",
+        "toggle_full_screen": "Εναλλαγή σε Πλήρη Οθόνη",
+        "view": "Προβολή"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Μεταφορά Όλων στο Προσκήνιο",
+        "label": "Παράθυρο",
+        "zoom": "Ζουμ"
+    }
 }

src/i18n/strings/en_EN.json

@@ -1,47 +1,63 @@
 {
-    "Cancel": "Cancel",
-    "Close %(brand)s": "Close %(brand)s",
-    "Are you sure you want to quit?": "Are you sure you want to quit?",
-    "Show/Hide": "Show/Hide",
-    "Quit": "Quit",
-    "Edit": "Edit",
-    "Undo": "Undo",
-    "Redo": "Redo",
-    "Cut": "Cut",
-    "Copy": "Copy",
-    "Paste": "Paste",
-    "Paste and Match Style": "Paste and Match Style",
-    "Delete": "Delete",
-    "Select All": "Select All",
-    "View": "View",
-    "Actual Size": "Actual Size",
-    "Zoom In": "Zoom In",
-    "Zoom Out": "Zoom Out",
-    "Preferences": "Preferences",
-    "Toggle Full Screen": "Toggle Full Screen",
-    "Toggle Developer Tools": "Toggle Developer Tools",
-    "Window": "Window",
-    "Minimize": "Minimize",
-    "Close": "Close",
-    "Help": "Help",
-    "Element Help": "Element Help",
-    "About": "About",
-    "Services": "Services",
-    "Hide": "Hide",
-    "Hide Others": "Hide Others",
-    "Unhide": "Unhide",
-    "Speech": "Speech",
-    "Start Speaking": "Start Speaking",
-    "Stop Speaking": "Stop Speaking",
-    "Zoom": "Zoom",
-    "Bring All to Front": "Bring All to Front",
-    "File": "File",
-    "Copy image": "Copy image",
-    "Copy email address": "Copy email address",
-    "Copy image address": "Copy image address",
-    "Copy link address": "Copy link address",
-    "Save image as...": "Save image as...",
-    "Failed to save image": "Failed to save image",
-    "The image failed to save": "The image failed to save",
-    "Add to dictionary": "Add to dictionary"
+    "action": {
+        "cancel": "Cancel",
+        "close": "Close",
+        "close_brand": "Close %(brand)s",
+        "copy": "Copy",
+        "cut": "Cut",
+        "delete": "Delete",
+        "edit": "Edit",
+        "minimise": "Minimize",
+        "paste": "Paste",
+        "paste_match_style": "Paste and Match Style",
+        "quit": "Quit",
+        "redo": "Redo",
+        "select_all": "Select All",
+        "show_hide": "Show/Hide",
+        "undo": "Undo",
+        "zoom_in": "Zoom In",
+        "zoom_out": "Zoom Out"
+    },
+    "common": {
+        "about": "About",
+        "brand_help": "%(brand)s Help",
+        "help": "Help",
+        "preferences": "Preferences"
+    },
+    "confirm_quit": "Are you sure you want to quit?",
+    "edit_menu": {
+        "speech": "Speech",
+        "speech_start_speaking": "Start Speaking",
+        "speech_stop_speaking": "Stop Speaking"
+    },
+    "file_menu": {
+        "label": "File"
+    },
+    "menu": {
+        "hide": "Hide",
+        "hide_others": "Hide Others",
+        "services": "Services",
+        "unhide": "Unhide"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Add to dictionary",
+        "copy_email": "Copy email address",
+        "copy_image": "Copy image",
+        "copy_image_url": "Copy image address",
+        "copy_link_url": "Copy link address",
+        "save_image_as": "Save image as...",
+        "save_image_as_error_description": "The image failed to save",
+        "save_image_as_error_title": "Failed to save image"
+    },
+    "view_menu": {
+        "actual_size": "Actual Size",
+        "toggle_developer_tools": "Toggle Developer Tools",
+        "toggle_full_screen": "Toggle Full Screen",
+        "view": "View"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Bring All to Front",
+        "label": "Window",
+        "zoom": "Zoom"
+    }
 }

src/i18n/strings/en_US.json

@@ -1,45 +0,0 @@
-{
-    "Close": "Close",
-    "Add to dictionary": "Add to dictionary",
-    "The image failed to save": "The image failed to save",
-    "Failed to save image": "Failed to save image",
-    "Save image as...": "Save image as...",
-    "Copy link address": "Copy link address",
-    "Copy email address": "Copy email address",
-    "Copy image": "Copy image",
-    "File": "File",
-    "Bring All to Front": "Bring All to Front",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Stop Speaking",
-    "Start Speaking": "Start Speaking",
-    "Speech": "Speech",
-    "Unhide": "Unhide",
-    "Hide Others": "Hide Others",
-    "Hide": "Hide",
-    "Services": "Services",
-    "About": "About",
-    "Element Help": "Element Help",
-    "Help": "Help",
-    "Minimize": "Minimize",
-    "Window": "Window",
-    "Toggle Developer Tools": "Toggle Developer Tools",
-    "Toggle Full Screen": "Toggle Full Screen",
-    "Preferences": "Preferences",
-    "Zoom Out": "Zoom Out",
-    "Zoom In": "Zoom In",
-    "Actual Size": "Actual Size",
-    "View": "View",
-    "Select All": "Select All",
-    "Delete": "Delete",
-    "Paste and Match Style": "Paste and Match Style",
-    "Paste": "Paste",
-    "Copy": "Copy",
-    "Cut": "Cut",
-    "Redo": "Redo",
-    "Undo": "Undo",
-    "Edit": "Edit",
-    "Quit": "Quit",
-    "Show/Hide": "Show/Hide",
-    "Are you sure you want to quit?": "Are you sure you want to quit?",
-    "Cancel": "Cancel"
-}

src/i18n/strings/eo.json

@@ -1,34 +1,50 @@
 {
-    "The image failed to save": "La bildo malsukcesis elŝutiĝi",
-    "Failed to save image": "Malsukcesis elŝuti bildon",
-    "Stop Speaking": "Ĉesi Paroli",
-    "Start Speaking": "Ekparoli",
-    "Unhide": "Malkaŝi",
-    "Hide Others": "Kaŝi Aliajn",
-    "Hide": "Kaŝi",
-    "About": "Informilo",
-    "Element Help": "Element-a Helpo",
-    "Help": "Helpo",
-    "Toggle Developer Tools": "Baskuligi Programistajn Ilojn",
-    "Preferences": "Preferoj",
-    "View": "Vidi",
-    "Delete": "Forigi",
-    "Redo": "Refari",
-    "Undo": "Malfari",
-    "Edit": "Redakti",
-    "Show/Hide": "Montri/Kaŝi",
-    "Cancel": "Nuligi",
-    "Copy link address": "Kopiu ligilon de la bildo",
-    "Copy image address": "Kopiu adreson de la bildo",
-    "Copy email address": "Kopiu retadreson",
-    "Copy image": "Kopiu bildon",
-    "File": "Dosiero",
-    "Minimize": "Minimumigi",
-    "Window": "Fenestro",
-    "Select All": "Elekti Ĉiujn",
-    "Paste": "Enmeti",
-    "Copy": "Kopiu",
-    "Cut": "Tranĉi",
-    "Are you sure you want to quit?": "Ĉu vi certas, ke vi volas ĉesi?",
-    "Close %(brand)s": "Fermu %(brand)s"
+    "action": {
+        "cancel": "Nuligi",
+        "close": "Fermi",
+        "close_brand": "Fermu %(brand)s",
+        "copy": "Kopii",
+        "cut": "Tranĉi",
+        "delete": "Forigi",
+        "edit": "Redakti",
+        "minimise": "Minimumigi",
+        "paste": "Enmeti",
+        "redo": "Refari",
+        "select_all": "Elekti Ĉiujn",
+        "show_hide": "Montri/Kaŝi",
+        "undo": "Malfari"
+    },
+    "common": {
+        "about": "Prio",
+        "help": "Helpo",
+        "preferences": "Agordoj"
+    },
+    "confirm_quit": "Ĉu vi certas, ke vi volas ĉesi?",
+    "edit_menu": {
+        "speech_start_speaking": "Ekparoli",
+        "speech_stop_speaking": "Ĉesi Paroli"
+    },
+    "file_menu": {
+        "label": "Dosiero"
+    },
+    "menu": {
+        "hide": "Kaŝi",
+        "hide_others": "Kaŝi Aliajn",
+        "unhide": "Malkaŝi"
+    },
+    "right_click_menu": {
+        "copy_email": "Kopiu retadreson",
+        "copy_image": "Kopiu bildon",
+        "copy_image_url": "Kopiu adreson de la bildo",
+        "copy_link_url": "Kopiu ligilon de la bildo",
+        "save_image_as_error_description": "La bildo malsukcesis elŝutiĝi",
+        "save_image_as_error_title": "Malsukcesis elŝuti bildon"
+    },
+    "view_menu": {
+        "toggle_developer_tools": "Baskuligi Programistajn Ilojn",
+        "view": "Vidi"
+    },
+    "window_menu": {
+        "label": "Fenestro"
+    }
 }

src/i18n/strings/es.json

@@ -1,47 +1,62 @@
 {
-    "Add to dictionary": "Añadir al diccionario",
-    "The image failed to save": "La imagen no se ha podido guardar",
-    "Failed to save image": "No se ha podido guardar la imagen",
-    "Save image as...": "Guardar imagen como...",
-    "Copy link address": "Copiar dirección de enlace",
-    "Copy email address": "Copiar dirección de correo",
-    "Copy image": "Copiar imagen",
-    "File": "Archivo",
-    "Bring All to Front": "Traer todas al primer plano",
-    "Zoom": "Zoom",
-    "Start Speaking": "Empezar a hablar",
-    "Stop Speaking": "Parar de hablar",
-    "Speech": "Dictado",
-    "Unhide": "Mostrar",
-    "Hide Others": "Ocultar otros",
-    "Hide": "Ocultar",
-    "Services": "Servicios",
-    "About": "Acerca de",
-    "Element Help": "Ayuda de Element",
-    "Help": "Ayuda",
-    "Close": "Cerrar",
-    "Minimize": "Minimizar",
-    "Window": "Ventana",
-    "Toggle Developer Tools": "Abrir/cerrar herramientas de desarrollo",
-    "Toggle Full Screen": "Entrar/salir de pantalla completa",
-    "Preferences": "Preferencias",
-    "Zoom Out": "Alejar",
-    "Zoom In": "Acercar",
-    "Actual Size": "Tamaño real",
-    "View": "Ver",
-    "Select All": "Seleccionar todo",
-    "Delete": "Eliminar",
-    "Paste and Match Style": "Pegar manteniendo estilo",
-    "Paste": "Pegar",
-    "Copy": "Copiar",
-    "Cut": "Cortar",
-    "Redo": "Rehacer",
-    "Undo": "Deshacer",
-    "Edit": "Editar",
-    "Quit": "Salir",
-    "Show/Hide": "Ver/Ocultar",
-    "Are you sure you want to quit?": "¿Quieres salir?",
-    "Cancel": "Cancelar",
-    "Copy image address": "Copiar dirección de la imagen",
-    "Close %(brand)s": "Cerrar %(brand)s"
+    "action": {
+        "cancel": "Cancelar",
+        "close": "Cerrar",
+        "close_brand": "Cerrar %(brand)s",
+        "copy": "Copiar",
+        "cut": "Cortar",
+        "delete": "Borrar",
+        "edit": "Editar",
+        "minimise": "Minimizar",
+        "paste": "Pegar",
+        "paste_match_style": "Pegar manteniendo estilo",
+        "quit": "Salir",
+        "redo": "Rehacer",
+        "select_all": "Seleccionar todo",
+        "show_hide": "Ver/Ocultar",
+        "undo": "Deshacer",
+        "zoom_in": "Acercar",
+        "zoom_out": "Alejar"
+    },
+    "common": {
+        "about": "Acerca de",
+        "brand_help": "Ayuda sobre %(brand)s",
+        "help": "Ayuda",
+        "preferences": "Preferencias"
+    },
+    "confirm_quit": "¿Quieres salir?",
+    "edit_menu": {
+        "speech": "Dictado",
+        "speech_start_speaking": "Empezar a hablar",
+        "speech_stop_speaking": "Parar de hablar"
+    },
+    "file_menu": {
+        "label": "Archivo"
+    },
+    "menu": {
+        "hide": "Ocultar",
+        "hide_others": "Ocultar otros",
+        "services": "Servicios",
+        "unhide": "Mostrar"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Añadir al diccionario",
+        "copy_email": "Copiar dirección de correo",
+        "copy_image": "Copiar imagen",
+        "copy_image_url": "Copiar dirección de la imagen",
+        "copy_link_url": "Copiar dirección de enlace",
+        "save_image_as": "Guardar imagen como...",
+        "save_image_as_error_description": "La imagen no se ha podido guardar",
+        "save_image_as_error_title": "No se ha podido guardar la imagen"
+    },
+    "view_menu": {
+        "actual_size": "Tamaño real",
+        "toggle_developer_tools": "Abrir/cerrar herramientas de desarrollo",
+        "toggle_full_screen": "Entrar/salir de pantalla completa",
+        "view": "Ver"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Traer todas al primer plano",
+        "label": "Ventana"
+    }
 }

src/i18n/strings/et.json

@@ -1,47 +1,63 @@
 {
-    "Element Help": "Rakenduse Element abiteave",
-    "About": "Rakenduse teave",
-    "The image failed to save": "Seda pilti ei õnnestunud salvestada",
-    "Add to dictionary": "Lisa sõnastikku",
-    "Failed to save image": "Pildi salvestamine ei õnnestunud",
-    "Save image as...": "Salvesta pilt kui...",
-    "Copy link address": "Kopeeri lingi aadress",
-    "Copy email address": "Kopeeri e-posti aadress",
-    "Copy image": "Kopeeri pilt",
-    "File": "Fail",
-    "Bring All to Front": "Too kõik esiplaanile",
-    "Zoom": "Suumi",
-    "Stop Speaking": "Lõpeta rääkimine",
-    "Start Speaking": "Alusta rääkimist",
-    "Speech": "Kõne",
-    "Unhide": "Näita uuesti",
-    "Hide Others": "Peida muud",
-    "Hide": "Peida",
-    "Services": "Teenused",
-    "Help": "Abiteave",
-    "Close": "Sulge",
-    "Minimize": "Vähenda",
-    "Window": "Aken",
-    "Toggle Developer Tools": "Arendaja töövahendid sisse/välja",
-    "Toggle Full Screen": "Täisekraanivaade sisse/välja",
-    "Preferences": "Seadistused",
-    "Zoom Out": "Vähenda",
-    "Zoom In": "Suurenda",
-    "Actual Size": "Näita tavasuuruses",
-    "View": "Vaata",
-    "Select All": "Vali kõik",
-    "Delete": "Kustuta",
-    "Paste and Match Style": "Aseta kasutades sama stiili",
-    "Paste": "Aseta",
-    "Copy": "Kopeeri",
-    "Cut": "Lõika",
-    "Redo": "Tee uuesti",
-    "Undo": "Võta tagasi",
-    "Edit": "Muuda",
-    "Quit": "Välju",
-    "Show/Hide": "Näita/peida",
-    "Are you sure you want to quit?": "Kas sa kindlasti soovid rakendusest väljuda?",
-    "Cancel": "Tühista",
-    "Copy image address": "Kopeeri pildi aadress",
-    "Close %(brand)s": "Sulge %(brand)s"
+    "action": {
+        "cancel": "Loobu",
+        "close": "Sulge",
+        "close_brand": "Sulge %(brand)s",
+        "copy": "Kopeeri",
+        "cut": "Lõika",
+        "delete": "Kustuta",
+        "edit": "Muuda",
+        "minimise": "Vähenda",
+        "paste": "Aseta",
+        "paste_match_style": "Aseta kasutades sama stiili",
+        "quit": "Välju",
+        "redo": "Tee uuesti",
+        "select_all": "Vali kõik",
+        "show_hide": "Näita/peida",
+        "undo": "Võta tagasi",
+        "zoom_in": "Suurenda",
+        "zoom_out": "Vähenda"
+    },
+    "common": {
+        "about": "Rakenduse teave",
+        "brand_help": "%(brand)s abiteave",
+        "help": "Abiteave",
+        "preferences": "Eelistused"
+    },
+    "confirm_quit": "Kas sa kindlasti soovid rakendusest väljuda?",
+    "edit_menu": {
+        "speech": "Kõne",
+        "speech_start_speaking": "Alusta rääkimist",
+        "speech_stop_speaking": "Lõpeta rääkimine"
+    },
+    "file_menu": {
+        "label": "Fail"
+    },
+    "menu": {
+        "hide": "Peida",
+        "hide_others": "Peida muud",
+        "services": "Teenused",
+        "unhide": "Näita uuesti"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Lisa sõnastikku",
+        "copy_email": "Kopeeri e-posti aadress",
+        "copy_image": "Kopeeri pilt",
+        "copy_image_url": "Kopeeri pildi aadress",
+        "copy_link_url": "Kopeeri lingi aadress",
+        "save_image_as": "Salvesta pilt kui...",
+        "save_image_as_error_description": "Seda pilti ei õnnestunud salvestada",
+        "save_image_as_error_title": "Pildi salvestamine ei õnnestunud"
+    },
+    "view_menu": {
+        "actual_size": "Näita tavasuuruses",
+        "toggle_developer_tools": "Arendaja töövahendid sisse/välja",
+        "toggle_full_screen": "Täisekraanivaade sisse/välja",
+        "view": "Näita"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Too kõik esiplaanile",
+        "label": "Aken",
+        "zoom": "Suumi"
+    }
 }

src/i18n/strings/fa.json

@@ -1,47 +1,62 @@
 {
-    "Paste and Match Style": "جای‌گذاری و تطبیق سَبک",
-    "Add to dictionary": "افزودن به لغت‌نامه",
-    "The image failed to save": "تصویر ذخیره نشد",
-    "Failed to save image": "ذخیرهٔ تصویر شکست خورد",
-    "Save image as...": "ذخیرهٔ تصویر به عنوان...",
-    "Copy link address": "رونوشت نشانی پیوند",
-    "Copy image address": "رونوشت نشانی تصویر",
-    "Copy email address": "رونوشت نشانی رایانامه",
-    "Copy image": "رونوشت تصویر",
-    "File": "پرونده",
-    "Bring All to Front": "همه را به جلو بیاورید",
-    "Zoom": "بزرگنمایی",
-    "Speech": "صحبت کردن",
-    "Stop Speaking": "صحبت کردن را تمام کنید",
-    "Start Speaking": "صحبت کردن را شروع کنید",
-    "Unhide": "آشکار",
-    "Hide Others": "پنهان کردن دیگران",
-    "Hide": "پنهان",
-    "Services": "خدمات",
-    "About": "درباره",
-    "Element Help": "راهنمای المنت",
-    "Help": "راهنما",
-    "Close": "بستن",
-    "Minimize": "کمینه",
-    "Window": "پنجره",
-    "Toggle Developer Tools": "تغییر وضعیت ابزارهای توسعه‌دهنده",
-    "Toggle Full Screen": "تغییر وضعیت تمام‌صفحه",
-    "Preferences": "ترجیحات",
-    "Zoom Out": "بزرگنمایی به خارج",
-    "Zoom In": "بزرگنمایی به داخل",
-    "Actual Size": "اندازهٔ واقعی",
-    "View": "دیدن",
-    "Select All": "گزینش همه",
-    "Delete": "حذف",
-    "Paste": "جای‌گذاری",
-    "Copy": "رونوشت",
-    "Cut": "برش",
-    "Redo": "انجام دوباره",
-    "Undo": "بازگردانی",
-    "Edit": "ویرایش",
-    "Quit": "خروج",
-    "Show/Hide": "نمایش/پنهان",
-    "Are you sure you want to quit?": "آیا مطمئنید که می‌خواهید خارج شوید؟",
-    "Cancel": "لغو",
-    "Close %(brand)s": "بستن %(brand)s"
+    "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": "درباره",
+        "help": "راهنما",
+        "preferences": "ترجیحات"
+    },
+    "confirm_quit": "آیا مطمئنید که می‌خواهید خارج شوید؟",
+    "edit_menu": {
+        "speech": "صحبت کردن",
+        "speech_start_speaking": "صحبت کردن را شروع کنید",
+        "speech_stop_speaking": "صحبت کردن را تمام کنید"
+    },
+    "file_menu": {
+        "label": "پرونده"
+    },
+    "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": "ذخیرهٔ تصویر شکست خورد"
+    },
+    "view_menu": {
+        "actual_size": "اندازهٔ واقعی",
+        "toggle_developer_tools": "تغییر وضعیت ابزارهای توسعه‌دهنده",
+        "toggle_full_screen": "تغییر وضعیت تمام‌صفحه",
+        "view": "مشاهده"
+    },
+    "window_menu": {
+        "bring_all_to_front": "همه را به جلو بیاورید",
+        "label": "پنجره",
+        "zoom": "بزرگنمایی"
+    }
 }

src/i18n/strings/fi.json

@@ -1,47 +1,62 @@
 {
-    "Paste": "Liitä",
-    "Paste and Match Style": "Liitä ja sovita tyyli",
-    "Add to dictionary": "Lisää sanakirjaan",
-    "The image failed to save": "Kuvan tallennus epäonnistui",
-    "Failed to save image": "Kuvan tallennus epäonnistui",
-    "Save image as...": "Tallenna kuva nimellä...",
-    "Copy link address": "Kopioi linkin osoite",
-    "Copy email address": "Kopioi sähköpostiosoite",
-    "Copy image": "Kopioi kuva",
-    "File": "Tiedosto",
-    "Bring All to Front": "Tuo kaikki eteen",
-    "Zoom": "Suurennus",
-    "Stop Speaking": "Lopeta puhe",
-    "Start Speaking": "Aloita puhe",
-    "Speech": "Puhe",
-    "Unhide": "Palauta näkyviin",
-    "Hide Others": "Piilota muut",
-    "Hide": "Piilota",
-    "Services": "Palvelut",
-    "About": "Tietoja",
-    "Element Help": "Elementin ohjeet",
-    "Help": "Apua",
-    "Close": "Sulje",
-    "Minimize": "Pienennä",
-    "Window": "Ikkuna",
-    "Toggle Developer Tools": "Näytä tai piilota kehittäjätyökalut",
-    "Toggle Full Screen": "Vaihda koko näytön tilaa",
-    "Preferences": "Asetukset",
-    "Zoom Out": "Pienennä",
-    "Zoom In": "Suurenna",
-    "Actual Size": "Alkuperäinen koko",
-    "View": "Näytä",
-    "Select All": "Valitse kaikki",
-    "Delete": "Poista",
-    "Copy": "Kopioi",
-    "Cut": "Leikkaa",
-    "Redo": "Tee uudestaan",
-    "Undo": "Peru",
-    "Edit": "Muokkaa",
-    "Quit": "Lopeta",
-    "Show/Hide": "Näytä/piilota",
-    "Are you sure you want to quit?": "Haluatko varmasti poistua?",
-    "Cancel": "Peruuta",
-    "Copy image address": "Kopioi kuvan osoite",
-    "Close %(brand)s": "Sulje %(brand)s"
+    "action": {
+        "cancel": "Peruuta",
+        "close": "Sulje",
+        "close_brand": "Sulje %(brand)s",
+        "copy": "Kopioi",
+        "cut": "Leikkaa",
+        "delete": "Poista",
+        "edit": "Muokkaa",
+        "minimise": "Pienennä",
+        "paste": "Liitä",
+        "paste_match_style": "Liitä ja sovita tyyli",
+        "quit": "Lopeta",
+        "redo": "Tee uudestaan",
+        "select_all": "Valitse kaikki",
+        "show_hide": "Näytä/piilota",
+        "undo": "Peru",
+        "zoom_in": "Suurenna",
+        "zoom_out": "Pienennä"
+    },
+    "common": {
+        "about": "Tietoa",
+        "help": "Ohje",
+        "preferences": "Valinnat"
+    },
+    "confirm_quit": "Haluatko varmasti poistua?",
+    "edit_menu": {
+        "speech": "Puhe",
+        "speech_start_speaking": "Aloita puhe",
+        "speech_stop_speaking": "Lopeta puhe"
+    },
+    "file_menu": {
+        "label": "Tiedosto"
+    },
+    "menu": {
+        "hide": "Piilota",
+        "hide_others": "Piilota muut",
+        "services": "Palvelut",
+        "unhide": "Palauta näkyviin"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Lisää sanakirjaan",
+        "copy_email": "Kopioi sähköpostiosoite",
+        "copy_image": "Kopioi kuva",
+        "copy_image_url": "Kopioi kuvan osoite",
+        "copy_link_url": "Kopioi linkin osoite",
+        "save_image_as": "Tallenna kuva nimellä...",
+        "save_image_as_error_description": "Kuvan tallennus epäonnistui",
+        "save_image_as_error_title": "Kuvan tallennus epäonnistui"
+    },
+    "view_menu": {
+        "actual_size": "Alkuperäinen koko",
+        "toggle_developer_tools": "Näytä tai piilota kehittäjätyökalut",
+        "toggle_full_screen": "Vaihda koko näytön tilaa",
+        "view": "Näytä"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Tuo kaikki eteen",
+        "label": "Ikkuna",
+        "zoom": "Suurennus"
+    }
 }

src/i18n/strings/fr.json

@@ -1,47 +1,63 @@
 {
-    "Undo": "Annuler",
-    "Edit": "Modifier",
-    "Quit": "Quitter",
-    "Show/Hide": "Afficher/Masquer",
-    "Are you sure you want to quit?": "Êtes-vous sûr de vouloir quitter ?",
-    "Cancel": "Annuler",
-    "Unhide": "Dé-masquer",
-    "Hide Others": "Masquer les autres",
-    "Hide": "Masquer",
-    "Services": "Services",
-    "About": "À propos",
-    "Element Help": "Aide d’Element",
-    "Help": "Aide",
-    "Close": "Fermer",
-    "Minimize": "Minimiser",
-    "Window": "Fenêtre",
-    "Toggle Developer Tools": "Basculer les outils de développement",
-    "Toggle Full Screen": "Basculer le plein écran",
-    "Preferences": "Préférences",
-    "Zoom Out": "Dé-zoomer",
-    "Zoom In": "Zoomer",
-    "Actual Size": "Taille réelle",
-    "View": "Afficher",
-    "Select All": "Tout sélectionner",
-    "Delete": "Supprimer",
-    "Paste and Match Style": "Copier avec le style de destination",
-    "Paste": "Coller",
-    "Copy": "Copier",
-    "Cut": "Couper",
-    "Speech": "Dictée",
-    "Add to dictionary": "Ajouter au dictionnaire",
-    "The image failed to save": "L’image n’a pas pu être sauvegardée",
-    "Failed to save image": "Échec de la sauvegarde de l’image",
-    "Save image as...": "Enregistrer l’image sous…",
-    "Copy link address": "Copier l’adresse du lien",
-    "Copy email address": "Copier l’adresse e-mail",
-    "Copy image": "Copier l’image",
-    "File": "Fichier",
-    "Bring All to Front": "Tout amener au premier plan",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Arrêter la dictée",
-    "Start Speaking": "Commencer la dictée",
-    "Copy image address": "Copier l'adresse de l'image",
-    "Redo": "Refaire",
-    "Close %(brand)s": "Fermer %(brand)s"
+    "action": {
+        "cancel": "Annuler",
+        "close": "Fermer",
+        "close_brand": "Fermer %(brand)s",
+        "copy": "Copier",
+        "cut": "Couper",
+        "delete": "Supprimer",
+        "edit": "Modifier",
+        "minimise": "Minimiser",
+        "paste": "Coller",
+        "paste_match_style": "Copier avec le style de destination",
+        "quit": "Quitter",
+        "redo": "Refaire",
+        "select_all": "Tout sélectionner",
+        "show_hide": "Afficher/Masquer",
+        "undo": "Annuler",
+        "zoom_in": "Zoomer",
+        "zoom_out": "Dé-zoomer"
+    },
+    "common": {
+        "about": "À propos",
+        "brand_help": "Aide de %(brand)s",
+        "help": "Aide",
+        "preferences": "Préférences"
+    },
+    "confirm_quit": "Êtes-vous sûr de vouloir quitter ?",
+    "edit_menu": {
+        "speech": "Dictée",
+        "speech_start_speaking": "Commencer la dictée",
+        "speech_stop_speaking": "Arrêter la dictée"
+    },
+    "file_menu": {
+        "label": "Fichier"
+    },
+    "menu": {
+        "hide": "Masquer",
+        "hide_others": "Masquer les autres",
+        "services": "Services",
+        "unhide": "Dé-masquer"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Ajouter au dictionnaire",
+        "copy_email": "Copier l’adresse e-mail",
+        "copy_image": "Copier l’image",
+        "copy_image_url": "Copier l'adresse de l'image",
+        "copy_link_url": "Copier l’adresse du lien",
+        "save_image_as": "Enregistrer l’image sous…",
+        "save_image_as_error_description": "L’image n’a pas pu être sauvegardée",
+        "save_image_as_error_title": "Échec de la sauvegarde de l’image"
+    },
+    "view_menu": {
+        "actual_size": "Taille réelle",
+        "toggle_developer_tools": "Basculer les outils de développement",
+        "toggle_full_screen": "Basculer le plein écran",
+        "view": "Afficher"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Tout amener au premier plan",
+        "label": "Fenêtre",
+        "zoom": "Zoom"
+    }
 }

src/i18n/strings/fy.json

@@ -1,45 +0,0 @@
-{
-    "Copy image": "Ofbylding kopiearje",
-    "Speech": "Spraak",
-    "View": "Byld",
-    "Paste and Match Style": "Plakke en lit stilen oerienkomme",
-    "Add to dictionary": "Oan wurdlist tafoegje",
-    "The image failed to save": "It is net slagge de ôfbylding te bewarjen",
-    "Failed to save image": "Ofbylding bewarjen mislearre",
-    "Save image as...": "Ofbylding bewarje as…",
-    "Copy link address": "Keppeling kopiearje",
-    "Copy email address": "E-mailadres kopiearje",
-    "File": "Bestân",
-    "Bring All to Front": "Alles nei foaren bringe",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Stopje mei praten",
-    "Start Speaking": "Begjin mei praten",
-    "Unhide": "Wer toane",
-    "Hide Others": "Oare ferbergje",
-    "Hide": "Ferbergje",
-    "Services": "Tsjinsten",
-    "About": "Oer",
-    "Element Help": "Element help",
-    "Help": "Help",
-    "Close": "Slute",
-    "Minimize": "Minimalisearje",
-    "Window": "Finster",
-    "Toggle Developer Tools": "Untwikkelersark yn-/útskeakelje",
-    "Toggle Full Screen": "Folslein skerm yn-/útskeakelje",
-    "Preferences": "Foarkarren",
-    "Zoom Out": "Utzoome",
-    "Zoom In": "Ynzoome",
-    "Actual Size": "Werklike grutte",
-    "Select All": "Alles selektearje",
-    "Delete": "Fuortsmite",
-    "Paste": "Plakke",
-    "Copy": "Kopiearje",
-    "Cut": "Knippe",
-    "Redo": "Opnij útfiere",
-    "Undo": "Ungedien meitsje",
-    "Edit": "Bewurkje",
-    "Quit": "Ofslute",
-    "Show/Hide": "Toane/Ferbergje",
-    "Are you sure you want to quit?": "Binne jo der wis fan dat jo ôfslute wolle?",
-    "Cancel": "Annulearje"
-}

src/i18n/strings/gl.json

@@ -1,45 +1,60 @@
 {
-    "Add to dictionary": "Engadir ao dicionario",
-    "The image failed to save": "Non se gardou a imaxe",
-    "Failed to save image": "Fallou o gardado da imaxe",
-    "Save image as...": "Gardar imaxe como...",
-    "Copy link address": "Copiar enderezo da ligazón",
-    "Copy email address": "Copiar enderezo de email",
-    "Copy image": "Copiar imaxe",
-    "File": "Ficheiro",
-    "Bring All to Front": "Traer todo á fronte",
-    "Zoom": "Aumento",
-    "Stop Speaking": "Deixa de falar",
-    "Start Speaking": "Comeza a falar",
-    "Speech": "Falar",
-    "Unhide": "Desagochar",
-    "Hide Others": "Agochar outras",
-    "Hide": "Agochar",
-    "Services": "Servizos",
-    "About": "Acerca de",
-    "Element Help": "Axuda de Element",
-    "Help": "Axuda",
-    "Close": "Pechar",
-    "Minimize": "Minimizar",
-    "Window": "Ventá",
-    "Toggle Developer Tools": "Activar ferramentas de desenvolvemento",
-    "Toggle Full Screen": "Activar pantalla completa",
-    "Preferences": "Preferencias",
-    "Zoom Out": "Diminuir",
-    "Zoom In": "Aumentar",
-    "Actual Size": "Tamaño real",
-    "View": "Ver",
-    "Select All": "Elexir todo",
-    "Delete": "Eliminar",
-    "Paste and Match Style": "Pegar e imitar estilo",
-    "Paste": "Pegar",
-    "Copy": "Copiar",
-    "Cut": "Cortar",
-    "Redo": "Refacer",
-    "Undo": "Desfacer",
-    "Edit": "Editar",
-    "Quit": "Saír",
-    "Show/Hide": "Mostrar/Agochar",
-    "Are you sure you want to quit?": "Tes a certeza de que queres saír?",
-    "Cancel": "Cancelar"
+    "action": {
+        "cancel": "Cancelar",
+        "close": "Pechar",
+        "copy": "Copiar",
+        "cut": "Cortar",
+        "delete": "Eliminar",
+        "edit": "Editar",
+        "minimise": "Minimizar",
+        "paste": "Pegar",
+        "paste_match_style": "Pegar e imitar estilo",
+        "quit": "Saír",
+        "redo": "Refacer",
+        "select_all": "Elexir todo",
+        "show_hide": "Mostrar/Agochar",
+        "undo": "Desfacer",
+        "zoom_in": "Aumentar",
+        "zoom_out": "Diminuir"
+    },
+    "common": {
+        "about": "Acerca de",
+        "help": "Axuda",
+        "preferences": "Preferencias"
+    },
+    "confirm_quit": "Tes a certeza de que queres saír?",
+    "edit_menu": {
+        "speech": "Falar",
+        "speech_start_speaking": "Comeza a falar",
+        "speech_stop_speaking": "Deixa de falar"
+    },
+    "file_menu": {
+        "label": "Ficheiro"
+    },
+    "menu": {
+        "hide": "Agochar",
+        "hide_others": "Agochar outras",
+        "services": "Servizos",
+        "unhide": "Desagochar"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Engadir ao dicionario",
+        "copy_email": "Copiar enderezo de email",
+        "copy_image": "Copiar imaxe",
+        "copy_link_url": "Copiar enderezo da ligazón",
+        "save_image_as": "Gardar imaxe como...",
+        "save_image_as_error_description": "Non se gardou a imaxe",
+        "save_image_as_error_title": "Fallou o gardado da imaxe"
+    },
+    "view_menu": {
+        "actual_size": "Tamaño real",
+        "toggle_developer_tools": "Activar ferramentas de desenvolvemento",
+        "toggle_full_screen": "Activar pantalla completa",
+        "view": "Vista"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Traer todo á fronte",
+        "label": "Ventá",
+        "zoom": "Aumento"
+    }
 }

src/i18n/strings/he.json

@@ -1,46 +1,61 @@
 {
-    "Actual Size": "גודל ממשי",
-    "Add to dictionary": "הוסף למילון",
-    "The image failed to save": "שמירת התמונה נכשלה",
-    "Failed to save image": "נכשל בשמירת התמונה",
-    "Save image as...": "שמור תמונה בשם...",
-    "Copy link address": "העתק קישור",
-    "Copy email address": "העתק כתובת אימייל",
-    "Copy image": "העתק תמונה",
-    "File": "קובץ",
-    "Bring All to Front": "הבא הכל לחזית",
-    "Zoom": "גודל תצוגה",
-    "Stop Speaking": "הפסק לדבר",
-    "Start Speaking": "התחל לדבר",
-    "Speech": "דיבור",
-    "Unhide": "בטל הסתרה",
-    "Hide Others": "הסתר אחרים",
-    "Hide": "הסתר",
-    "Services": "שרותים",
-    "About": "אודות",
-    "Element Help": "עזרה של אלמנט",
-    "Help": "עזרה",
-    "Close": "סגור",
-    "Minimize": "מזער",
-    "Window": "חלון",
-    "Toggle Developer Tools": "הפעל כלי מפתחים",
-    "Toggle Full Screen": "הפעל מצב מסך מלא",
-    "Preferences": "העדפות",
-    "Zoom Out": "התרחק",
-    "Zoom In": "התקרב",
-    "View": "צפה",
-    "Select All": "בחר הכל",
-    "Delete": "מחק",
-    "Paste": "הדבק",
-    "Copy": "העתק",
-    "Cut": "גזור",
-    "Undo": "בטל ביצוע",
-    "Redo": "בצע שוב",
-    "Edit": "עריכה",
-    "Quit": "יציאה",
-    "Show/Hide": "הצג\\הסתר",
-    "Are you sure you want to quit?": "האם אתה בטוח שברצונך לצאת?",
-    "Cancel": "ביטול",
-    "Paste and Match Style": "הדבק והתאם סגנון",
-    "Copy image address": "העתקת כתובת התמונה"
+    "action": {
+        "cancel": "ביטול",
+        "close": "סגור",
+        "copy": "העתק",
+        "cut": "גזור",
+        "delete": "מחק",
+        "edit": "ערוך",
+        "minimise": "מזער",
+        "paste": "הדבק",
+        "paste_match_style": "הדבק והתאם סגנון",
+        "quit": "יציאה",
+        "redo": "בצע שוב",
+        "select_all": "בחר הכל",
+        "show_hide": "הצג\\הסתר",
+        "undo": "בטל ביצוע",
+        "zoom_in": "התקרב",
+        "zoom_out": "התרחק"
+    },
+    "common": {
+        "about": "אודות",
+        "help": "עזרה",
+        "preferences": "העדפות"
+    },
+    "confirm_quit": "האם אתה בטוח שברצונך לצאת?",
+    "edit_menu": {
+        "speech": "דיבור",
+        "speech_start_speaking": "התחל לדבר",
+        "speech_stop_speaking": "הפסק לדבר"
+    },
+    "file_menu": {
+        "label": "קובץ"
+    },
+    "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": "נכשל בשמירת התמונה"
+    },
+    "view_menu": {
+        "actual_size": "גודל ממשי",
+        "toggle_developer_tools": "הפעל כלי מפתחים",
+        "toggle_full_screen": "הפעל מצב מסך מלא",
+        "view": "צפה"
+    },
+    "window_menu": {
+        "bring_all_to_front": "הבא הכל לחזית",
+        "label": "חלון",
+        "zoom": "גודל תצוגה"
+    }
 }

src/i18n/strings/hr.json

@@ -1,12 +0,0 @@
-{
-    "Paste": "Zalijepiti",
-    "Copy": "Kopirati",
-    "Cut": "Izrezati",
-    "Redo": "Preurediti",
-    "Undo": "Poništi",
-    "Edit": "Uredi",
-    "Quit": "Prestati",
-    "Show/Hide": "Pokaži/sakrij",
-    "Are you sure you want to quit?": "Jesi li siguran da želiš odustati?",
-    "Cancel": "Otkazati"
-}

src/i18n/strings/hu.json

@@ -1,47 +1,63 @@
 {
-    "Add to dictionary": "Hozzáadás a szótárhoz",
-    "The image failed to save": "A kép mentése sikertelen",
-    "Failed to save image": "Kép mentése sikertelen",
-    "Save image as...": "Kép mentése másként...",
-    "Copy link address": "Hivatkozás másolása",
-    "Copy email address": "E-mail cím másolása",
-    "Copy image": "Kép másolása",
-    "File": "Fájl",
-    "Bring All to Front": "Mindent előtérbe hoz",
-    "Zoom": "Nagyítás",
-    "Stop Speaking": "Fejezze be a beszédet",
-    "Start Speaking": "Kezdjen beszélni",
-    "Speech": "Beszéd",
-    "Unhide": "Felfed",
-    "Hide Others": "Minden mást eltakar",
-    "Hide": "Eltakar",
-    "Services": "Szolgáltatás",
-    "About": "Névjegy",
-    "Element Help": "Element segítség",
-    "Help": "Segítség",
-    "Close": "Bezár",
-    "Minimize": "Lecsukás",
-    "Window": "Ablak",
-    "Toggle Developer Tools": "Fejlesztői eszközök",
-    "Toggle Full Screen": "Teljes képernyő",
-    "Preferences": "Beállítások",
-    "Zoom Out": "Kicsinyít",
-    "Zoom In": "Nagyít",
-    "Actual Size": "Jelenlegi méret",
-    "View": "Nézet",
-    "Select All": "Összes kijelölése",
-    "Delete": "Töröl",
-    "Paste and Match Style": "Beillesztés formázással",
-    "Paste": "Beillesztés",
-    "Copy": "Másol",
-    "Cut": "Kivág",
-    "Redo": "Újra",
-    "Undo": "Visszavon",
-    "Edit": "Szerkeszt",
-    "Quit": "Kilép",
-    "Show/Hide": "Megmutat/Elrejt",
-    "Are you sure you want to quit?": "Biztos, hogy kilép?",
-    "Cancel": "Mégsem",
-    "Copy image address": "Kép címének másolása",
-    "Close %(brand)s": "%(brand)s bezárása"
+    "action": {
+        "cancel": "Mégse",
+        "close": "Bezárás",
+        "close_brand": "%(brand)s bezárása",
+        "copy": "Másolás",
+        "cut": "Kivágás",
+        "delete": "Törlés",
+        "edit": "Szerkesztés",
+        "minimise": "Lecsukás",
+        "paste": "Beillesztés",
+        "paste_match_style": "Beillesztés formázással",
+        "quit": "Kilépés",
+        "redo": "Újra",
+        "select_all": "Összes kijelölése",
+        "show_hide": "Megjelenítés/elrejtés",
+        "undo": "Visszavonás",
+        "zoom_in": "Nagyítás",
+        "zoom_out": "Kicsinyítés"
+    },
+    "common": {
+        "about": "Névjegy",
+        "brand_help": "%(brand)s Súgó",
+        "help": "Súgó",
+        "preferences": "Beállítások"
+    },
+    "confirm_quit": "Biztos, hogy kilép?",
+    "edit_menu": {
+        "speech": "Beszéd",
+        "speech_start_speaking": "Kezdjen beszélni",
+        "speech_stop_speaking": "Fejezze be a beszédet"
+    },
+    "file_menu": {
+        "label": "Fájl"
+    },
+    "menu": {
+        "hide": "Elrejtés",
+        "hide_others": "Mások elrejtése",
+        "services": "Szolgáltatás",
+        "unhide": "Felfedés"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Hozzáadás a szótárhoz",
+        "copy_email": "E-mail-cím másolása",
+        "copy_image": "Kép másolása",
+        "copy_image_url": "Kép címének másolása",
+        "copy_link_url": "Hivatkozás másolása",
+        "save_image_as": "Kép mentése másként…",
+        "save_image_as_error_description": "A kép mentése sikertelen",
+        "save_image_as_error_title": "Kép mentése sikertelen"
+    },
+    "view_menu": {
+        "actual_size": "Jelenlegi méret",
+        "toggle_developer_tools": "Fejlesztői eszközök",
+        "toggle_full_screen": "Teljes képernyő",
+        "view": "Megtekintés"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Mindent előtérbe hoz",
+        "label": "Ablak",
+        "zoom": "Nagyítás"
+    }
 }