Merge branch 't3chguy/build-files-assert' into t3chguy/update-electron-builder

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

# Conflicts:
#	.github/workflows/build_windows.yaml

.github/workflows/build_and_deploy.yaml

@@ -62,7 +62,7 @@ jobs:
         name: Windows ${{ matrix.arch }}
         strategy:
             matrix:
-                arch: [ia32, x64, arm64]
+                arch: [ia32, x64]
         uses: ./.github/workflows/build_windows.yaml
         secrets: inherit
         with:
@@ -112,8 +112,6 @@ jobs:
 
             - name: Prepare artifacts for deployment
               run: |
-                  set -x
-
                   # Windows
                   for arch in x64 ia32 arm64
                   do
@@ -147,8 +145,6 @@ jobs:
             - name: "[Nightly] Strip version from installer file"
               if: needs.prepare.outputs.nightly-version != ''
               run: |
-                  set -x
-
                   # Windows
                   for arch in x64 ia32 arm64
                   do
@@ -165,8 +161,6 @@ jobs:
             - name: "[Release] Prepare release latest symlink"
               if: needs.prepare.outputs.nightly-version == ''
               run: |
-                  set -x
-
                   # Windows
                   for arch in x64 ia32 arm64
                   do
@@ -214,7 +208,6 @@ jobs:
             - name: Deploy artifacts
               if: needs.prepare.outputs.deploy == 'true'
               run: |
-                  set -x
                   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 }}
@@ -234,8 +227,6 @@ jobs:
               id: deb
               if: needs.linux.result == 'success'
               run: |
-                  set -x
-
                   for arch in amd64 arm64
                   do
                       echo "$arch=$(ls linux-$arch-sqlcipher-static/*.deb | tail -n1)" >> $GITHUB_OUTPUT
@@ -295,8 +286,6 @@ jobs:
 
             - name: Copy files to S3
               run: |
-                  set -x
-
                   PREFIX="${VERSION%.*}"
                   for file in win-*/*.msi; do
                       filename=$(basename "$file")

.github/workflows/build_and_test.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: ./.github/workflows/build_windows.yaml
         strategy:
             matrix:
-                arch: [x64, ia32, arm64]
+                arch: [x64, ia32]
         with:
             arch: ${{ matrix.arch }}
 
@@ -97,7 +97,7 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                   cache: "yarn"
 
             - name: Install Deps

.github/workflows/build_linux.yaml

@@ -76,7 +76,7 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                   cache: "yarn"
               env:
                   # Workaround for https://github.com/actions/setup-node/issues/317
@@ -88,7 +88,7 @@ jobs:
             - name: "Get modified files"
               id: changed_files
               if: steps.cache.outputs.cache-hit != 'true' && github.event_name == 'pull_request'
-              uses: tj-actions/changed-files@dcc7a0cba800f454d79fff4b993e8c3555bcc0a8 # v45
+              uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # v45
               with:
                   files: |
                       dockerbuild/**
@@ -98,7 +98,7 @@ jobs:
               uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
               if: steps.changed_files.outputs.any_modified == 'true'
               with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                   load: true
                   platforms: linux/${{ inputs.arch }}
                   tags: ${{ env.HAK_DOCKER_IMAGE }}
@@ -123,6 +123,11 @@ jobs:
                       ./scripts/glibc-check.sh $filename
                   done
 
+            - name: "[Nightly] Resolve version"
+              if: inputs.version != ''
+              run: |
+                  echo "ED_NIGHTLY=${{ inputs.version }}" >> $GITHUB_ENV
+
             - name: Generate debian files and arguments
               run: |
                   if [ -f changelog.Debian ]; then
@@ -139,9 +144,6 @@ jobs:
 
             - name: Build App
               run: yarn build --publish never -l ${{ steps.config.outputs.build-args }}
-              env:
-                  # Only set for Nightly builds
-                  ED_NIGHTLY: ${{ inputs.version }}
 
             - name: Check native libraries
               run: |

.github/workflows/build_macos.yaml

@@ -62,9 +62,10 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  node-version-file: .node-version
+                  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"
 
@@ -75,6 +76,11 @@ jobs:
                   pip3 install setuptools
                   yarn build:native:universal
 
+            - name: "[Nightly] Resolve version"
+              if: inputs.version != ''
+              run: |
+                  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 != ''
@@ -86,8 +92,6 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
                   CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
                   CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
-                  # Only set for Nightly builds
-                  ED_NIGHTLY: ${{ inputs.version }}
 
             - name: Check app was signed & notarised successfully
               if: inputs.sign != ''

.github/workflows/build_prepare.yaml

@@ -56,7 +56,7 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  node-version-file: .node-version
+                  node-version-file: package.json
                   cache: "yarn"
 
             - name: Install Deps

.github/workflows/build_windows.yaml

@@ -74,6 +74,11 @@ jobs:
                   path: |
                       ./.hak
 
+            - name: Set up build tools
+              uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+              with:
+                  arch: ${{ steps.config.outputs.arch || inputs.arch }}
+
             # ActiveTCL package on choco is from 2015,
             # this one is newer but includes more than we need
             - name: Choco install tclsh
@@ -99,26 +104,13 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  # node-version-file: package.json
-                  # For https://github.com/element-hq/element-desktop/issues/2161
-                  node-version: 23.9.0
+                  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: Set up sqlcipher macros
-              if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm')
-              shell: pwsh
-              run: |
-                  echo "NCC=${{ github.workspace }}\scripts\cl.bat" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-            - name: Set up build tools
-              if: steps.cache.outputs.cache-hit != 'true'
-              uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
-              with:
-                  arch: ${{ steps.config.outputs.arch || inputs.arch }}
-
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
               run: |
@@ -168,11 +160,19 @@ jobs:
                   INSTALL_DIR: C:\Users\runneradmin\eSignerCKA
                   MASTER_KEY_FILE: C:\Users\runneradmin\eSignerCKA\master.key
 
+            - name: "[Nightly] Resolve version"
+              if: inputs.version != ''
+              shell: bash
+              run: |
+                  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 build --publish never -w ${{ steps.config.outputs.build-args }}
-              env:
-                  # Only set for Nightly builds
-                  ED_NIGHTLY: ${{ inputs.version }}
+              run: |
+                  yarn electron-builder --publish never -w ${{ steps.config.outputs.build-args }}
 
             - name: Trust eSigner sandbox cert
               if: inputs.sign == ''
@@ -186,7 +186,7 @@ jobs:
                   Get-ChildItem `
                       -Recurse dist `
                       -Include *.exe, *.msi `
-                  | ForEach-Object -Process {. $env:SIGNTOOL_PATH verify /pa $_.FullName; if(!$?) { throw }}
+                  | ForEach-Object -Process {. 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool.exe' verify /pa $_.FullName; if(!$?) { throw }}
 
             - name: Upload Artifacts
               uses: actions/upload-artifact@v4

.github/workflows/dockerbuild.yaml

@@ -22,17 +22,17 @@ jobs:
             - uses: actions/checkout@v4
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3
+              uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
+              uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
               with:
                   install: true
 
             - name: Build test image
               uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
               with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                   push: false
                   load: true
                   tags: element-desktop-dockerbuild
@@ -63,7 +63,7 @@ jobs:
               if: github.event_name != 'pull_request'
               uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
               with:
-                  file: dockerbuild/Dockerfile
+                  context: dockerbuild
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

@@ -19,7 +19,6 @@ jobs:
             contents: write
             issues: write
             pull-requests: read
-            id-token: write
         secrets:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
             GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/triage-stale.yml

@@ -14,9 +14,7 @@ jobs:
         steps:
             - uses: actions/stale@v9
               with:
-                  operations-per-run: 250
-                  days-before-issue-stale: -1
-                  days-before-issue-close: -1
+                  operations-per-run: 100
                   days-before-pr-stale: 180
                   days-before-pr-close: 0
                   close-pr-message: "This PR has been automatically closed because it has been stale for 180 days. If you wish to continue working on this PR, please ping a maintainer to reopen it."

.node-version

@@ -1 +0,0 @@
-v22.13.1

CHANGELOG.md

@@ -1,44 +1,3 @@
-Changes in [1.11.94](https://github.com/element-hq/element-desktop/releases/tag/v1.11.94) (2025-02-27)
-======================================================================================================
-* No changes
-
-## 🐛 Bug Fixes
-
-* [Backport staging] fix: /tmp/element-web-config may already exist preventing the container from booting up ([#29377](https://github.com/element-hq/element-web/pull/29377)). Contributed by @RiotRobot.
-
-
-
-Changes in [1.11.93](https://github.com/element-hq/element-desktop/releases/tag/v1.11.93) (2025-02-25)
-======================================================================================================
-## ✨ Features
-
-* [backport] Dynamically load Element Web modules in Docker entrypoint ([#29358](https://github.com/element-hq/element-web/pull/29358)). Contributed by @t3chguy.
-* ChangeRecoveryKey: error handling ([#29262](https://github.com/element-hq/element-web/pull/29262)). Contributed by @richvdh.
-* Dehydration: enable dehydrated device on "Set up recovery" ([#29265](https://github.com/element-hq/element-web/pull/29265)). Contributed by @richvdh.
-* Render reason for invite rejection. ([#29257](https://github.com/element-hq/element-web/pull/29257)). Contributed by @Half-Shot.
-* New room list: add search section ([#29251](https://github.com/element-hq/element-web/pull/29251)). Contributed by @florianduros.
-* New room list: hide favourites and people meta spaces ([#29241](https://github.com/element-hq/element-web/pull/29241)). Contributed by @florianduros.
-* New Room List: Create new labs flag ([#29239](https://github.com/element-hq/element-web/pull/29239)). Contributed by @MidhunSureshR.
-* Stop URl preview from covering message box ([#29215](https://github.com/element-hq/element-web/pull/29215)). Contributed by @edent.
-* Rename "security key" into "recovery key" ([#29217](https://github.com/element-hq/element-web/pull/29217)). Contributed by @florianduros.
-* Add new verification section to user profile ([#29200](https://github.com/element-hq/element-web/pull/29200)). Contributed by @MidhunSureshR.
-* Initial support for runtime modules ([#29104](https://github.com/element-hq/element-web/pull/29104)). Contributed by @t3chguy.
-* Add `Forgot recovery key?` button to encryption tab ([#29202](https://github.com/element-hq/element-web/pull/29202)). Contributed by @florianduros.
-* Add KeyIcon to key storage out of sync toast ([#29201](https://github.com/element-hq/element-web/pull/29201)). Contributed by @florianduros.
-* Improve rendering of empty topics in the timeline  ([#29152](https://github.com/element-hq/element-web/pull/29152)). Contributed by @Half-Shot.
-
-## 🐛 Bug Fixes
-
-* Fix font scaling in member list ([#29285](https://github.com/element-hq/element-web/pull/29285)). Contributed by @florianduros.
-* Grow member list search field when resizing the right panel ([#29267](https://github.com/element-hq/element-web/pull/29267)). Contributed by @langleyd.
-* Don't reload roomview on offline connectivity check ([#29243](https://github.com/element-hq/element-web/pull/29243)). Contributed by @dbkr.
-* Respect user's 12/24 hour preference consistently ([#29237](https://github.com/element-hq/element-web/pull/29237)). Contributed by @t3chguy.
-* Restore the accessibility role on call views ([#29225](https://github.com/element-hq/element-web/pull/29225)). Contributed by @robintown.
-* Revert `GoToHome` keyboard shortcut to `Ctrl`–`Shift`–`H` on macOS ([#28577](https://github.com/element-hq/element-web/pull/28577)). Contributed by @gy-mate.
-* Encryption tab: display correct encryption panel when user cancels the reset identity flow ([#29216](https://github.com/element-hq/element-web/pull/29216)). Contributed by @florianduros.
-
-
-
 Changes in [1.11.92](https://github.com/element-hq/element-desktop/releases/tag/v1.11.92) (2025-02-11)
 ======================================================================================================
 ## ✨ Features

dockerbuild/Dockerfile

@@ -21,7 +21,8 @@ ENV FORCE_COLOR true
 
 WORKDIR /project
 
+ENV NODE_VERSION 20.18.2
 ARG TARGETOS
 ARG TARGETARCH
-COPY .node-version dockerbuild/setup.sh /
+COPY setup.sh /setup.sh
 RUN /setup.sh

dockerbuild/setup.sh

@@ -3,6 +3,5 @@
 set -x
 declare -A archMap=(["amd64"]="x64" ["arm64"]="arm64")
 ARCH="${archMap["$TARGETARCH"]}"
-NODE_VERSION=$(cat /.node-version)
-curl --proto "=https" -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \
+curl --proto "=https" -L "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \
   unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md

docs/windows-requirements.md

@@ -12,13 +12,6 @@ If you want to build native modules, make sure that the following tools are inst
 - [Strawberry Perl](https://strawberryperl.com/)
 - [Rustup](https://rustup.rs/)
 - [NASM](https://www.nasm.us/)
-
-You can install the above tools using [Chocolatey](https://chocolatey.org/install):
-
-```cmd
-choco install --no-progress -y git nodejs-lts yarn python StrawberryPerl rustup.install nasm magicsplat-tcl-tk
-```
-
 - [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
     - On the Workloads tab:
         - Desktop & Mobile -> C++ build tools

package.json

@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.11.94",
+    "version": "1.11.91",
     "description": "Element: the future of secure communication",
     "author": "Element",
     "homepage": "https://element.io",
@@ -15,7 +15,7 @@
     "type": "module",
     "files": [],
     "engines": {
-        "node": ">=18.0.0 <=22.13.1 || >22"
+        "node": ">=18.0.0"
     },
     "scripts": {
         "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
@@ -44,7 +44,7 @@
         "build": "yarn run build:ts && yarn run build:res && electron-builder",
         "build:ts": "tsc",
         "build:res": "tsx scripts/copy-res.ts",
-        "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .",
+        "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",
@@ -72,22 +72,22 @@
         "@babel/core": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/preset-typescript": "^7.18.6",
-        "@electron/asar": "3.3.1",
+        "@electron/asar": "3.2.18",
         "@playwright/test": "1.50.1",
         "@stylistic/eslint-plugin": "^3.0.0",
         "@types/auto-launch": "^5.0.1",
         "@types/counterpart": "^0.18.1",
         "@types/minimist": "^1.2.1",
-        "@types/node": "18.19.76",
+        "@types/node": "18.19.74",
         "@types/pacote": "^11.1.1",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
-        "app-builder-lib": "26.0.8",
+        "app-builder-lib": "26.0.7",
         "chokidar": "^4.0.0",
         "detect-libc": "^2.0.0",
-        "electron": "34.2.0",
-        "electron-builder": "26.0.8",
-        "electron-builder-squirrel-windows": "26.0.8",
+        "electron": "34.0.2",
+        "electron-builder": "26.0.7",
+        "electron-builder-squirrel-windows": "26.0.7",
         "electron-devtools-installer": "^4.0.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
@@ -111,11 +111,11 @@
         "typescript": "5.7.3"
     },
     "hakDependencies": {
-        "matrix-seshat": "^4.0.1",
+        "matrix-seshat": "^4.0.0",
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "18.19.76",
+        "@types/node": "18.19.74",
         "config-file-ts": "0.2.8-rc1"
     }
 }

scripts/cl.bat

@@ -1,7 +0,0 @@
-REM Batch file to aid in cross-compiling sqlcipher for Windows ARM64
-REM Full path should be passed to Makefile.msc as NCC env var
-
-setlocal
-call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSCMD_ARG_HOST_ARCH%
-cl.exe %*
-endlocal

src/i18n/strings/cy.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "Diddymu",
-        "close": "Cau",
-        "close_brand": "Cau %(brand)s",
-        "copy": "Copïo",
-        "cut": "Torri",
-        "delete": "Dileu",
-        "edit": "Golygu",
-        "minimise": "Lleihau",
-        "paste": "Gludo",
-        "paste_match_style": "Gludo a Chyfateb Arddull",
-        "quit": "Gadael",
-        "redo": "Ail-wneud",
-        "select_all": "Dewis y Cyfan",
-        "show_hide": "Dangos/Cuddio",
-        "undo": "Dadwneud",
-        "zoom_in": "Chwyddo i Mewn",
-        "zoom_out": "Chwyddo Allan"
-    },
-    "common": {
-        "about": "Ynghylch",
-        "brand_help": "%(brand)s Cymorth",
-        "help": "Cymorth",
-        "preferences": "Dewisiadau"
-    },
-    "confirm_quit": "Ydych chi'n siŵr eich bod am roi'r gorau iddi?",
-    "edit_menu": {
-        "speech": "Lleferydd",
-        "speech_start_speaking": "Cychwyn Llefaru",
-        "speech_stop_speaking": "Peidio Llefaru"
-    },
-    "file_menu": {
-        "label": "Ffeil"
-    },
-    "menu": {
-        "hide": "Cuddio",
-        "hide_others": "Cuddio'r Gweddill",
-        "services": "Gwasanaethau",
-        "unhide": "Datguddio"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Ychwanegu i'r Geiriadur",
-        "copy_email": "Copïo cyfeiriad e-bost",
-        "copy_image": "Copïo delwedd",
-        "copy_image_url": "Copïo cyfeiriad delwedd",
-        "copy_link_url": "Copïo cyfeiriad y ddolen",
-        "save_image_as": "Cadw delwedd fel...",
-        "save_image_as_error_description": "Methodd y ddelwedd â chadw",
-        "save_image_as_error_title": "Wedi methu cadw'r ddelwedd"
-    },
-    "view_menu": {
-        "actual_size": "Maint Gwirioneddol",
-        "toggle_developer_tools": "Toggle Developer Tools",
-        "toggle_full_screen": "Toglo Sgrin Lawn",
-        "view": "Golwg"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Popeth i'r Blaen",
-        "label": "Ffenestr",
-        "zoom": "Chwyddo"
-    }
-}

src/i18n/strings/hu.json

@@ -2,7 +2,7 @@
     "action": {
         "cancel": "Mégse",
         "close": "Bezárás",
-        "close_brand": "Az %(brand)s bezárása",
+        "close_brand": "%(brand)s bezárása",
         "copy": "Másolás",
         "cut": "Kivágás",
         "delete": "Törlés",
@@ -56,7 +56,7 @@
         "view": "Megtekintés"
     },
     "window_menu": {
-        "bring_all_to_front": "Minden előtérbe hozása",
+        "bring_all_to_front": "Mindent előtérbe hoz",
         "label": "Ablak",
         "zoom": "Nagyítás"
     }

src/i18n/strings/ka.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "გაუქმება",
-        "close": "დახურვა",
-        "close_brand": "დახურვა %(brand)s",
-        "copy": "კოპირება",
-        "cut": "მოჭრა",
-        "delete": "წაშალეთ",
-        "edit": "რედაქტირება",
-        "minimise": "შეამცირეთ",
-        "paste": "პასტა",
-        "paste_match_style": "ჩასვით და მატჩის სტილი",
-        "quit": "თავი დაანებე",
-        "redo": "რედო",
-        "select_all": "აირჩიეთ ყველა",
-        "show_hide": "ჩვენება/დამალვა",
-        "undo": "გაუქმება",
-        "zoom_in": "გაზარდოთ",
-        "zoom_out": "გაფართოება"
-    },
-    "common": {
-        "about": "შესახებ",
-        "brand_help": "%(brand)sდახმარება",
-        "help": "დახმარება",
-        "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/lv.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "Atcelt",
-        "close": "Aizvērt",
-        "close_brand": "Aizvērt %(brand)s",
-        "copy": "Kopēt",
-        "cut": "Izgriezt",
-        "delete": "Dzēst",
-        "edit": "Labot",
-        "minimise": "Samazināt",
-        "paste": "Ielīmēt",
-        "paste_match_style": "Ielīmēt un pielāgot stilu",
-        "quit": "Iziet",
-        "redo": "Atatsaukt",
-        "select_all": "Atzīmēt visu",
-        "show_hide": "Parādīt/paslēpt",
-        "undo": "Atsaukt",
-        "zoom_in": "Tuvināt",
-        "zoom_out": "Tālināt"
-    },
-    "common": {
-        "about": "Par",
-        "brand_help": "%(brand)s palīdzība",
-        "help": "Palīdzība",
-        "preferences": "Iestatījumi"
-    },
-    "confirm_quit": "Vai tiešām iziet?",
-    "edit_menu": {
-        "speech": "Runa",
-        "speech_start_speaking": "Uzsākt runāšanu",
-        "speech_stop_speaking": "Pārtraukt runāšanu"
-    },
-    "file_menu": {
-        "label": "Datne"
-    },
-    "menu": {
-        "hide": "Paslēpt",
-        "hide_others": "Paslēpt citus",
-        "services": "Pakalpojumi",
-        "unhide": "Rādīt"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Pievienot vārdnīcai",
-        "copy_email": "Ievietot e-pasta adresi starpliktuvē",
-        "copy_image": "Ievietot attēlu starpliktuvē",
-        "copy_image_url": "Ievietot attēla adresi starpliktuvē",
-        "copy_link_url": "Ievietot saites adresi starpliktuvē",
-        "save_image_as": "Saglabāt attēlu kā...",
-        "save_image_as_error_description": "Attēlu neizdevās saglabāt",
-        "save_image_as_error_title": "Neizdevās saglabāt attēlu"
-    },
-    "view_menu": {
-        "actual_size": "Īstais izmērs",
-        "toggle_developer_tools": "Pārslēgt izstrādātāja rīkus",
-        "toggle_full_screen": "Pārslēgt pilnekrānu",
-        "view": "Skats"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Iznest visu priekšplānā",
-        "label": "Logs",
-        "zoom": "Tālummaiņa"
-    }
-}

src/i18n/strings/mg_MG.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "Hanafoana",
-        "close": "Akatona",
-        "close_brand": "Anakatona%(brand)s",
-        "copy": "Dika Mitovy",
-        "cut": "Tapaina",
-        "delete": "Fafaina",
-        "edit": "Anova",
-        "minimise": "Manamaivana",
-        "paste": "Koba",
-        "paste_match_style": "Mametaka sy Mampifanandrify ny fomba",
-        "quit": "Mialà",
-        "redo": "Averina atao",
-        "select_all": "Isafidy ny rehetra",
-        "show_hide": "Aneho/Anafina",
-        "undo": "Ravao",
-        "zoom_in": "Angedao",
-        "zoom_out": "Hahelezo"
-    },
-    "common": {
-        "about": "Mombamomba",
-        "brand_help": "%(marques)Fanampiana",
-        "help": "Fanampiana",
-        "preferences": "Safidy manokana"
-    },
-    "confirm_quit": "Azo Antoka ve fa tena hiala ianao",
-    "edit_menu": {
-        "speech": "Fitenenana",
-        "speech_start_speaking": "Atomboy ny resaka/Manomboha fitenenena",
-        "speech_stop_speaking": "Atsaharo ny fitenenana"
-    },
-    "file_menu": {
-        "label": "Manapetraka/apetrao"
-    },
-    "menu": {
-        "hide": "Afeno",
-        "hide_others": "Afeno ny hafa",
-        "services": "Tolotra",
-        "unhide": "Asehoy"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Ampio ao amin'ny rakibolana",
-        "copy_email": "Adikao ny adiresy imailaka",
-        "copy_image": "Andika ny sary",
-        "copy_image_url": "Adikao ny adiresin'ny sary",
-        "copy_link_url": "Adikao ny adiresy rohy",
-        "save_image_as": "Hitahiry ny sary ho",
-        "save_image_as_error_description": "Tsy voatahiry ilay sary",
-        "save_image_as_error_title": "Tsy nahahomby ny fitahirizana an'ilay sary"
-    },
-    "view_menu": {
-        "actual_size": "Habe Ankehitriny",
-        "toggle_developer_tools": "Amadika fitaovana fampandrosoana",
-        "toggle_full_screen": "Hamadika amin'ny efijery feno",
-        "view": "Hijery"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Ataovy aloha ny zava-drehetra",
-        "label": "Varavarankely",
-        "zoom": "Anakaiky fahitana"
-    }
-}

src/i18n/strings/nb_NO.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "Avbryt",
-        "close": "Lukk",
-        "close_brand": "Avslutt %(brand)s",
-        "copy": "Kopier",
-        "cut": "Klipp",
-        "delete": "Slett",
-        "edit": "Rediger",
-        "minimise": "Minimere",
-        "paste": "Lim inn",
-        "paste_match_style": "Lim inn og match stil",
-        "quit": "Avslutt",
-        "redo": "Gjør om",
-        "select_all": "Velg alle",
-        "show_hide": "Vis/Skjul",
-        "undo": "Angre",
-        "zoom_in": "Zoom inn",
-        "zoom_out": "Zoom ut"
-    },
-    "common": {
-        "about": "Om",
-        "brand_help": "%(brand)s Hjelp",
-        "help": "Hjelp",
-        "preferences": "Brukervalg"
-    },
-    "confirm_quit": "Er du sikker på at du vil slutte?",
-    "edit_menu": {
-        "speech": "Tale",
-        "speech_start_speaking": "Begynn å snakke",
-        "speech_stop_speaking": "Slutt å snakke"
-    },
-    "file_menu": {
-        "label": "Fil"
-    },
-    "menu": {
-        "hide": "Skjul",
-        "hide_others": "Skjul andre",
-        "services": "Tjenester",
-        "unhide": "Slutt å skjule"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Legg til i ordbok",
-        "copy_email": "Kopier e-postadressen",
-        "copy_image": "Kopier bildet",
-        "copy_image_url": "Kopier bildeadresse",
-        "copy_link_url": "Kopier link adresse",
-        "save_image_as": "Lagre bildet som...",
-        "save_image_as_error_description": "Bildet kunne ikke lagres",
-        "save_image_as_error_title": "Kunne ikke lagre bildet"
-    },
-    "view_menu": {
-        "actual_size": "Faktisk størrelse",
-        "toggle_developer_tools": "Veksle Utvikleralternativer",
-        "toggle_full_screen": "Veksle Fullskjerm",
-        "view": "Vis"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Flytt Alt Frem",
-        "label": "Vindu",
-        "zoom": "Forstørr"
-    }
-}

src/i18n/strings/pt_BR.json

@@ -20,7 +20,6 @@
     },
     "common": {
         "about": "Sobre",
-        "brand_help": "%(brand)s Ajuda",
         "help": "Ajuda",
         "preferences": "Preferências"
     },
@@ -57,7 +56,6 @@
     },
     "window_menu": {
         "bring_all_to_front": "Trazer Todas Para Frente",
-        "label": "Janela",
-        "zoom": "Zoom"
+        "label": "Janela"
     }
 }

src/i18n/strings/tr.json

@@ -1,63 +0,0 @@
-{
-    "action": {
-        "cancel": "İptal",
-        "close": "Kapat",
-        "close_brand": "Kapat %(brand)s",
-        "copy": "Kopyala",
-        "cut": "Kes",
-        "delete": "Sil",
-        "edit": "Düzenle",
-        "minimise": "Küçült",
-        "paste": "Yapıştır",
-        "paste_match_style": "Stili Yapıştır ve Eşleştir",
-        "quit": "Çık",
-        "redo": "Yeniden yap",
-        "select_all": "Tümünü seç",
-        "show_hide": "Göster/Gizle",
-        "undo": "Geri al",
-        "zoom_in": "Yakınlaştır",
-        "zoom_out": "Uzaklaştır"
-    },
-    "common": {
-        "about": "Hakkında",
-        "brand_help": "%(brand)s Yardım",
-        "help": "Yardım",
-        "preferences": "Tercihler"
-    },
-    "confirm_quit": "Çıkmak istediğinizden emin misiniz?",
-    "edit_menu": {
-        "speech": "Konuşma",
-        "speech_start_speaking": "Konuşmaya başla",
-        "speech_stop_speaking": "Konuşmayı durdur"
-    },
-    "file_menu": {
-        "label": "Dosya"
-    },
-    "menu": {
-        "hide": "Gizle",
-        "hide_others": "Diğerlerini gizle",
-        "services": "Hizmetler",
-        "unhide": "Göster"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Sözlüğe ekle",
-        "copy_email": "E-posta adresini kopyala",
-        "copy_image": "Resmi kopyala",
-        "copy_image_url": "Görsel adresini kopyala",
-        "copy_link_url": "Bağlantılı adresi kopyala",
-        "save_image_as": "Resmi farklı kaydet...",
-        "save_image_as_error_description": "Görüntü kaydedilemedi",
-        "save_image_as_error_title": "Resim kaydedilemedi"
-    },
-    "view_menu": {
-        "actual_size": "Gerçek boyut",
-        "toggle_developer_tools": "Geliştirici araçları",
-        "toggle_full_screen": "Tam ekran",
-        "view": "Görüntüle"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Hepsini öne getir",
-        "label": "Pencere",
-        "zoom": "Yaklaştır"
-    }
-}