v1.11.51

Localazy Download

.github/CODEOWNERS

@@ -2,3 +2,4 @@
 /.github/workflows/**     @vector-im/element-web-app-team
 /package.json             @vector-im/element-web-app-team
 /yarn.lock                @vector-im/element-web-app-team
+/src/i18n/strings

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: vector-im/element-web

.github/workflows/backport.yml

@@ -23,7 +23,7 @@ jobs:
               )
             )
         steps:
-            - uses: tibdex/backport@7005ef85c4562bc23b0e9b4a9940d5922f439750
+            - 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

@@ -108,8 +108,6 @@ jobs:
             sqlcipher: static
             version: ${{ needs.prepare.outputs.nightly-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
@@ -120,20 +118,16 @@ jobs:
         runs-on: ubuntu-latest
         name: Deploy
         if: |
-            (
+            always() && !failure() && !cancelled() && ((
                 github.event_name != 'workflow_dispatch' &&
                 github.event.release.prerelease != true
             ) || (
-                always() && !failure() && !cancelled() && inputs.deploy &&
-                (inputs.macos || inputs.windows || inputs.linux)
-            )
+                inputs.deploy && (inputs.macos || inputs.windows || inputs.linux)
+            ))
         environment: packages.element.io
         steps:
             - name: Download artifacts
               uses: actions/download-artifact@v3
-              with:
-                  name: packages.element.io
-                  path: packages.element.io
 
             - name: Deploy artifacts
               run: |
@@ -145,29 +139,37 @@ jobs:
                   DEPLOYMENT_DIR: ${{ needs.prepare.outputs.packages-dir }}
 
             - name: Notify packages.element.io of new files
-              uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
+              uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   repository: vector-im/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 ${{ matrix.arch }}
-        strategy:
-            matrix:
-                arch: [amd64, arm64]
-        if: |
-            (
-                github.event_name != 'workflow_dispatch' &&
-                github.event.release.prerelease != true
-            ) || (
-                always() && !failure() && !cancelled() && inputs.deploy && inputs.linux
-            )
-        uses: ./.github/workflows/reprepro.yaml
-        secrets: inherit
-        with:
-            artifact-name: linux-${{ matrix.arch }}-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: Publish amd64 deb to packages.element.io
+              uses: vector-im/packages.element.io@master
+              if: 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: vector-im/packages.element.io@master
+              if: 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

@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@2f7246cb26e8bb6709b6cbfc1fec7febfe82e96a # v38
+              uses: tj-actions/changed-files@25ef3926d147cd02fc7e931c1ef50772bbb0d25d # v40
               with:
                   files: |
-                      dockerbuild/*
+                      dockerbuild/**
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@cf8514a65188af1d4f94f8c28a7a4153af1088ce
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               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@9311bf5263ae5b36f3ec67aff768790c6e2344ad
+              uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
               with:
                   context: dockerbuild
                   push: true

.github/workflows/build_macos.yaml

@@ -67,7 +67,10 @@ 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

.github/workflows/dockerbuild.yaml

@@ -20,7 +20,7 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@cf8514a65188af1d4f94f8c28a7a4153af1088ce
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -28,14 +28,14 @@ jobs:
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@0f8c876bafbf5dbce05c36682ec68e9a0274a48a
+              uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@9311bf5263ae5b36f3ec67aff768790c6e2344ad
+              uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # 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: vector-im/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

@@ -23,7 +23,7 @@ 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"
@@ -41,3 +41,20 @@ 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:
+                  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"

.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: vector-im/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 }}

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.

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/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.

element.io/nightly/config.json

@@ -53,7 +53,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call-livekit.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

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

@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.42",
+    "version": "1.11.51",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",
@@ -16,14 +16,15 @@
         "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",
+        "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 --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",
+        "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",
         "lint:js:src": "eslint --max-warnings 0 src",
         "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js test",
@@ -39,6 +40,7 @@
         "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",
+        "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'",
         "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",
@@ -68,61 +70,62 @@
         "uuid": "^9.0.0"
     },
     "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/notarize": "^2.0.0",
         "@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.41",
+        "@types/node": "16.18.52",
         "@types/pacote": "^11.1.1",
         "@types/tar": "^6.1.3",
         "@types/uuid": "^9.0.2",
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
         "allchange": "^1.0.6",
-        "app-builder-lib": "24.6.3",
+        "app-builder-lib": "24.8.1",
         "babel-jest": "^29.0.0",
         "chokidar": "^3.5.2",
         "detect-libc": "^1.0.3",
-        "electron": "^26.0.0",
-        "electron-builder": "24.6.3",
-        "electron-builder-squirrel-windows": "24.6.3",
+        "electron": "^27.0.0",
+        "electron-builder": "24.6.4",
+        "electron-builder-squirrel-windows": "24.8.1",
         "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": "^48.0.0",
+        "eslint-plugin-unicorn": "^49.0.0",
         "expect-playwright": "^0.8.0",
         "find-npm-prefix": "^1.0.2",
         "fs-extra": "^11.0.0",
         "glob": "^10.0.0",
         "jest": "^29.0.0",
-        "matrix-web-i18n": "^2.0.0",
+        "matrix-web-i18n": "^3.1.3",
         "mkdirp": "^3.0.0",
         "node-pre-gyp": "^0.17.0",
-        "pacote": "^15.0.0",
-        "playwright": "^1.25.0",
+        "pacote": "^17.0.0",
+        "playwright": "1.37.1",
         "prettier": "^2.8.1",
         "rimraf": "^5.0.0",
         "tar": "^6.1.2",
         "ts-jest": "^29.0.0",
         "ts-node": "^10.9.1",
-        "typescript": "5.1.6"
+        "typescript": "5.2.2"
     },
     "hakDependencies": {
         "matrix-seshat": "^3.0.1",
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "16.18.41"
+        "@types/node": "16.18.59"
     },
     "build": {
         "appId": "im.riot.app",

src/electron-main.ts

@@ -260,7 +260,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.control && input.key.toUpperCase() === "Q",
+    (input, platform): boolean =>
+        platform === "darwin" && input.meta && !input.control && input.key.toUpperCase() === "Q",
 ];
 
 const warnBeforeExit = (event: Event, input: Input): void => {
@@ -273,12 +274,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;

src/i18n/strings/ar.json

@@ -1,46 +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": "عن",
-    "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,44 +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": "Аб праграме",
-    "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,45 +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": "Относно",
-    "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,45 +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": "আমাদের সম্পর্কে",
-    "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,44 +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",
-    "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",
-    "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",
-    "%(brand)s Help": "%(brand)s nápověda"
+    "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",
-    "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",
-    "%(brand)s Help": "%(brand)s Hilfe"
-}

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,47 +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": "Σχετικά με",
-    "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": "Αντιγραφή εικόνας",
-    "Close %(brand)s": "Κλείσιμο %(brand)s",
-    "%(brand)s Help": "%(brand)s Υποστήριξη"
+    "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",
-    "%(brand)s Help": "%(brand)s 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,44 +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",
-    "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,33 +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",
-    "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": "Kopiu",
+        "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": "Informilo",
+        "help": "Helpo",
+        "preferences": "Preferoj"
+    },
+    "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",
-    "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",
-    "%(brand)s Help": "Ayuda sobre %(brand)s"
+    "action": {
+        "cancel": "Cancelar",
+        "close": "Cerrar",
+        "close_brand": "Cerrar %(brand)s",
+        "copy": "Copiar",
+        "cut": "Cortar",
+        "delete": "Eliminar",
+        "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 @@
 {
-    "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",
-    "%(brand)s Help": "%(brand)s abiteave"
+    "action": {
+        "cancel": "Tühista",
+        "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": "Seadistused"
+    },
+    "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": "Vaata"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Too kõik esiplaanile",
+        "label": "Aken",
+        "zoom": "Suumi"
+    }
 }

src/i18n/strings/fa.json

@@ -1,46 +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": "درباره",
-    "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,46 +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",
-    "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": "Tietoja",
+        "help": "Apua",
+        "preferences": "Asetukset"
+    },
+    "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",
-    "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",
-    "%(brand)s Help": "Aide de %(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,44 +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",
-    "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,44 +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",
-    "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": "Ver"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Traer todo á fronte",
+        "label": "Ventá",
+        "zoom": "Aumento"
+    }
 }

src/i18n/strings/he.json

@@ -1,45 +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": "אודות",
-    "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,46 +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",
-    "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égsem",
+        "close": "Bezár",
+        "close_brand": "%(brand)s bezárása",
+        "copy": "Másol",
+        "cut": "Kivág",
+        "delete": "Töröl",
+        "edit": "Szerkeszt",
+        "minimise": "Lecsukás",
+        "paste": "Beillesztés",
+        "paste_match_style": "Beillesztés formázással",
+        "quit": "Kilép",
+        "redo": "Újra",
+        "select_all": "Összes kijelölése",
+        "show_hide": "Megmutat/Elrejt",
+        "undo": "Visszavon",
+        "zoom_in": "Nagyít",
+        "zoom_out": "Kicsinyít"
+    },
+    "common": {
+        "about": "Névjegy",
+        "brand_help": "%(brand)s Súgó",
+        "help": "Segítsé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": "Eltakar",
+        "hide_others": "Minden mást eltakar",
+        "services": "Szolgáltatás",
+        "unhide": "Felfed"
+    },
+    "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": "Nézet"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Mindent előtérbe hoz",
+        "label": "Ablak",
+        "zoom": "Nagyítás"
+    }
 }

src/i18n/strings/id.json

@@ -1,47 +1,59 @@
 {
-    "Add to dictionary": "Tambah ke kamus",
-    "The image failed to save": "Gambar gagal disimpan",
-    "Failed to save image": "Gagal menyimpan gambar",
-    "Save image as...": "Simpan gambar sebagai...",
-    "Copy link address": "Salin alamat tautan",
-    "Copy email address": "Salin surel",
-    "Copy image": "Salin gambar",
-    "File": "File",
-    "Hide Others": "Sembunyikan yang Lain",
-    "Bring All to Front": "Bawa Semua ke Depan",
-    "Zoom": "Perbesar",
-    "Stop Speaking": "Berhenti Berbicara",
-    "Start Speaking": "Mulai Berbicara",
-    "Speech": "Dikte",
-    "Unhide": "Tampilkan",
-    "Hide": "Sembunyikan",
-    "Services": "Layanan",
-    "About": "Tentang",
-    "Help": "Bantuan",
-    "Close": "Tutup",
-    "Minimize": "Minimalkan",
-    "Window": "Jendela",
-    "Toggle Developer Tools": "Beralih Alat Pengembang",
-    "Toggle Full Screen": "Beralih Layar Penuh",
-    "Preferences": "Pengaturan",
-    "Zoom Out": "Perkecil",
-    "Zoom In": "Perbesar",
-    "Cut": "Potong",
-    "Redo": "Ulangi",
-    "Undo": "Urungkan",
-    "Actual Size": "Ukuran Sebenarnya",
-    "View": "Tampilan",
-    "Select All": "Pilih Semua",
-    "Delete": "Hapus",
-    "Paste and Match Style": "Tempel dan Cocokkan Gaya",
-    "Paste": "Tempel",
-    "Copy": "Salin",
-    "Edit": "Edit",
-    "Quit": "Keluar",
-    "Show/Hide": "Tampilkan/Sembunyikan",
-    "Are you sure you want to quit?": "Apakah Anda yakin ingin keluar?",
-    "Cancel": "Batal",
-    "Copy image address": "Salin alamat gambar",
-    "Close %(brand)s": "Tutuo %(brand)s",
-    "%(brand)s Help": "Bantuan %(brand)s"
+    "action": {
+        "cancel": "Batal",
+        "close": "Tutup",
+        "close_brand": "Tutuo %(brand)s",
+        "copy": "Salin",
+        "cut": "Potong",
+        "delete": "Hapus",
+        "minimise": "Minimalkan",
+        "paste": "Tempel",
+        "paste_match_style": "Tempel dan Cocokkan Gaya",
+        "quit": "Keluar",
+        "redo": "Ulangi",
+        "select_all": "Pilih Semua",
+        "show_hide": "Tampilkan/Sembunyikan",
+        "undo": "Urungkan",
+        "zoom_in": "Perbesar",
+        "zoom_out": "Perkecil"
+    },
+    "common": {
+        "about": "Tentang",
+        "brand_help": "Bantuan %(brand)s",
+        "help": "Bantuan",
+        "preferences": "Pengaturan"
+    },
+    "confirm_quit": "Apakah Anda yakin ingin keluar?",
+    "edit_menu": {
+        "speech": "Dikte",
+        "speech_start_speaking": "Mulai Berbicara",
+        "speech_stop_speaking": "Berhenti Berbicara"
+    },
+    "menu": {
+        "hide": "Sembunyikan",
+        "hide_others": "Sembunyikan yang Lain",
+        "services": "Layanan",
+        "unhide": "Tampilkan"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Tambah ke kamus",
+        "copy_email": "Salin surel",
+        "copy_image": "Salin gambar",
+        "copy_image_url": "Salin alamat gambar",
+        "copy_link_url": "Salin alamat tautan",
+        "save_image_as": "Simpan gambar sebagai...",
+        "save_image_as_error_description": "Gambar gagal disimpan",
+        "save_image_as_error_title": "Gagal menyimpan gambar"
+    },
+    "view_menu": {
+        "actual_size": "Ukuran Sebenarnya",
+        "toggle_developer_tools": "Beralih Alat Pengembang",
+        "toggle_full_screen": "Beralih Layar Penuh",
+        "view": "Tampilan"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Bawa Semua ke Depan",
+        "label": "Jendela",
+        "zoom": "Perbesar"
+    }
 }

src/i18n/strings/is.json

@@ -1,46 +1,62 @@
 {
-    "Add to dictionary": "Bæta við orðasafn",
-    "The image failed to save": "Myndina var ekki hægt að vista",
-    "Failed to save image": "Mistókst að vista mynd",
-    "Save image as...": "Vista mynd sem...",
-    "Copy link address": "Afrita vistfang tengils",
-    "Copy email address": "Afrita tölvupóstfang",
-    "Copy image": "Afrita mynd",
-    "File": "Skrá",
-    "Bring All to Front": "Setja allt fremst",
-    "Zoom": "Stærð",
-    "Stop Speaking": "Hætta tali",
-    "Start Speaking": "Byrja tal",
-    "Speech": "Tal",
-    "Unhide": "Birta",
-    "Hide Others": "Fela aðra",
-    "Hide": "Fela",
-    "Services": "Þjónustur",
-    "About": "Um hugbúnaðinn",
-    "Help": "Hjálp",
-    "Close": "Loka",
-    "Minimize": "Lágmarka",
-    "Window": "Gluggi",
-    "Toggle Developer Tools": "Víxla forritunarverkfærum af/á",
-    "Toggle Full Screen": "Víxla fullum skjá af/á",
-    "Preferences": "Stillingar",
-    "Zoom Out": "Minnka",
-    "Zoom In": "Stækka",
-    "Actual Size": "Raunstærð",
-    "View": "Skoða",
-    "Select All": "Velja allt",
-    "Delete": "Eyða",
-    "Paste and Match Style": "Líma og samsvara stíl",
-    "Paste": "Líma",
-    "Copy": "Afrita",
-    "Cut": "Klippa",
-    "Redo": "Endurgera",
-    "Undo": "Afturkalla",
-    "Edit": "Breyta",
-    "Quit": "Hætta",
-    "Show/Hide": "Sýna/Fela",
-    "Are you sure you want to quit?": "Ertu viss um að þú viljir hætta?",
-    "Cancel": "Hætta við",
-    "Copy image address": "Afrita slóð myndar",
-    "Close %(brand)s": "Loka %(brand)s"
+    "action": {
+        "cancel": "Hætta við",
+        "close": "Loka",
+        "close_brand": "Loka %(brand)s",
+        "copy": "Afrita",
+        "cut": "Klippa",
+        "delete": "Eyða",
+        "edit": "Breyta",
+        "minimise": "Lágmarka",
+        "paste": "Líma",
+        "paste_match_style": "Líma og samsvara stíl",
+        "quit": "Hætta",
+        "redo": "Endurgera",
+        "select_all": "Velja allt",
+        "show_hide": "Sýna/Fela",
+        "undo": "Afturkalla",
+        "zoom_in": "Stækka",
+        "zoom_out": "Minnka"
+    },
+    "common": {
+        "about": "Um hugbúnaðinn",
+        "help": "Hjálp",
+        "preferences": "Stillingar"
+    },
+    "confirm_quit": "Ertu viss um að þú viljir hætta?",
+    "edit_menu": {
+        "speech": "Tal",
+        "speech_start_speaking": "Byrja tal",
+        "speech_stop_speaking": "Hætta tali"
+    },
+    "file_menu": {
+        "label": "Skrá"
+    },
+    "menu": {
+        "hide": "Fela",
+        "hide_others": "Fela aðra",
+        "services": "Þjónustur",
+        "unhide": "Birta"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Bæta við orðasafn",
+        "copy_email": "Afrita tölvupóstfang",
+        "copy_image": "Afrita mynd",
+        "copy_image_url": "Afrita slóð myndar",
+        "copy_link_url": "Afrita vistfang tengils",
+        "save_image_as": "Vista mynd sem...",
+        "save_image_as_error_description": "Myndina var ekki hægt að vista",
+        "save_image_as_error_title": "Mistókst að vista mynd"
+    },
+    "view_menu": {
+        "actual_size": "Raunstærð",
+        "toggle_developer_tools": "Víxla forritunarverkfærum af/á",
+        "toggle_full_screen": "Víxla fullum skjá af/á",
+        "view": "Skoða"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Setja allt fremst",
+        "label": "Gluggi",
+        "zoom": "Stærð"
+    }
 }

src/i18n/strings/it.json

@@ -1,47 +1,62 @@
 {
-    "Add to dictionary": "Aggiungi al dizionario",
-    "The image failed to save": "Non è stato possibile salvare l'immagine",
-    "Failed to save image": "Salvataggio immagine fallito",
-    "Save image as...": "Salva immagine come...",
-    "Copy link address": "Copia indirizzo collegamento",
-    "Copy email address": "Copia indirizzo email",
-    "Copy image": "Copia immagine",
-    "File": "File",
-    "Bring All to Front": "Porta tutto in primo piano",
-    "Zoom": "Zoom",
-    "Start Speaking": "Inizia a parlare",
-    "Unhide": "Mostra",
-    "Hide Others": "Nascondi gli altri",
-    "Hide": "Nascondi",
-    "Services": "Servizi",
-    "About": "Informazioni su",
-    "Help": "Aiuto",
-    "Close": "Chiudi",
-    "Minimize": "Riduci",
-    "Window": "Finestra",
-    "Toggle Developer Tools": "Attiva strumenti per sviluppatori",
-    "Toggle Full Screen": "Passa a schermo intero",
-    "Preferences": "Preferenze",
-    "Zoom Out": "Rimpicciolisci",
-    "Zoom In": "Ingrandisci",
-    "Actual Size": "Dimensione effettiva",
-    "View": "Vedi",
-    "Select All": "Seleziona tutto",
-    "Delete": "Elimina",
-    "Paste and Match Style": "Incolla e adegua lo stile",
-    "Paste": "Incolla",
-    "Copy": "Copia",
-    "Cut": "Taglia",
-    "Redo": "Ripeti",
-    "Undo": "Annulla",
-    "Edit": "Modifica",
-    "Quit": "Esci",
-    "Show/Hide": "Mostra/Nascondi",
-    "Are you sure you want to quit?": "Vuoi veramente uscire?",
-    "Cancel": "Annulla",
-    "Stop Speaking": "Smetti di parlare",
-    "Speech": "Dettatura",
-    "Copy image address": "Copia indirizzo immagine",
-    "Close %(brand)s": "Chiudi %(brand)s",
-    "%(brand)s Help": "Aiuto per %(brand)s"
+    "action": {
+        "cancel": "Annulla",
+        "close": "Chiudi",
+        "close_brand": "Chiudi %(brand)s",
+        "copy": "Copia",
+        "cut": "Taglia",
+        "delete": "Elimina",
+        "edit": "Modifica",
+        "minimise": "Riduci",
+        "paste": "Incolla",
+        "paste_match_style": "Incolla e adegua lo stile",
+        "quit": "Esci",
+        "redo": "Ripeti",
+        "select_all": "Seleziona tutto",
+        "show_hide": "Mostra/Nascondi",
+        "undo": "Annulla",
+        "zoom_in": "Ingrandisci",
+        "zoom_out": "Rimpicciolisci"
+    },
+    "common": {
+        "about": "Informazioni su",
+        "brand_help": "Aiuto per %(brand)s",
+        "help": "Aiuto",
+        "preferences": "Preferenze"
+    },
+    "confirm_quit": "Vuoi veramente uscire?",
+    "edit_menu": {
+        "speech": "Dettatura",
+        "speech_start_speaking": "Inizia a parlare",
+        "speech_stop_speaking": "Smetti di parlare"
+    },
+    "file_menu": {
+        "label": "File"
+    },
+    "menu": {
+        "hide": "Nascondi",
+        "hide_others": "Nascondi gli altri",
+        "services": "Servizi",
+        "unhide": "Mostra"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Aggiungi al dizionario",
+        "copy_email": "Copia indirizzo email",
+        "copy_image": "Copia immagine",
+        "copy_image_url": "Copia indirizzo immagine",
+        "copy_link_url": "Copia indirizzo collegamento",
+        "save_image_as": "Salva immagine come...",
+        "save_image_as_error_description": "Non è stato possibile salvare l'immagine",
+        "save_image_as_error_title": "Salvataggio immagine fallito"
+    },
+    "view_menu": {
+        "actual_size": "Dimensione effettiva",
+        "toggle_developer_tools": "Attiva strumenti per sviluppatori",
+        "toggle_full_screen": "Passa a schermo intero",
+        "view": "Vedi"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Porta tutto in primo piano",
+        "label": "Finestra"
+    }
 }

src/i18n/strings/ja.json

@@ -1,46 +1,62 @@
 {
-    "Close %(brand)s": "%(brand)sを閉じる",
-    "Bring All to Front": "全てを前面に表示",
-    "The image failed to save": "画像の保存に失敗しました",
-    "Unhide": "再表示",
-    "Actual Size": "等倍",
-    "Paste and Match Style": "スタイルを保持して貼り付け",
-    "Add to dictionary": "辞書に追加",
-    "Failed to save image": "画像の保存に失敗",
-    "Save image as...": "画像を保存",
-    "Speech": "スピーチ",
-    "Stop Speaking": "録音を停止",
-    "Start Speaking": "録音を開始",
-    "Toggle Developer Tools": "開発者ツールを切り替える",
-    "Toggle Full Screen": "全画面表示を切り替える",
-    "Redo": "やり直す",
-    "Undo": "取り消す",
-    "Minimize": "最小化",
-    "Window": "ウィンドウ",
-    "Preferences": "環境設定",
-    "Zoom Out": "縮小",
-    "Zoom In": "拡大",
-    "Copy link address": "リンクのアドレスをコピー",
-    "Copy image address": "画像のアドレスをコピー",
-    "Copy email address": "メールアドレスをコピー",
-    "Copy image": "画像をコピー",
-    "File": "ファイル",
-    "Zoom": "ズーム",
-    "Hide Others": "他を非表示",
-    "Hide": "非表示",
-    "Services": "サービス",
-    "About": "概要",
-    "Help": "ヘルプ",
-    "Close": "閉じる",
-    "View": "表示",
-    "Select All": "全て選択",
-    "Delete": "削除",
-    "Paste": "貼り付け",
-    "Copy": "コピー",
-    "Cut": "切り取り",
-    "Edit": "編集",
-    "Quit": "終了",
-    "Are you sure you want to quit?": "終了してよろしいですか？",
-    "Show/Hide": "表示/非表示",
-    "Cancel": "キャンセル"
+    "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/ko.json

@@ -1,24 +0,0 @@
-{
-    "File": "파일",
-    "Copy email address": "이메일 주소 복사",
-    "Paste": "붙여넣기",
-    "Hide": "숨기기",
-    "Preferences": "환경설정",
-    "Undo": "실행 취소",
-    "Edit": "수정",
-    "Quit": "종료",
-    "Delete": "삭제",
-    "Cancel": "취소",
-    "Are you sure you want to quit?": "종료하시겠습니까?",
-    "Show/Hide": "보이기/숨기기",
-    "Redo": "되돌리기",
-    "Cut": "잘라내기",
-    "Copy": "복사하기",
-    "View": "보기",
-    "Actual Size": "실제 크기",
-    "Zoom In": "확대",
-    "Zoom Out": "축소",
-    "Close %(brand)s": "%(brand)s 닫기",
-    "Paste and Match Style": "붙여넣고 스타일 일치",
-    "Select All": "전체 선택"
-}

src/i18n/strings/lo.json

@@ -1,45 +1,61 @@
 {
-    "Toggle Developer Tools": "ສະຫຼັບໄປໜ້າເຄື່ອງມືພັດທະນາ",
-    "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": "ກ່ຽວກັບ",
-    "Help": "ຊ່ວຍເຫຼືອ",
-    "Close": "ປິດ",
-    "Minimize": "ຫຍໍ້ນ້ອຍ",
-    "Window": "ປ່ອງຢ້ຽມ",
-    "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": "ຍົກເລີກ"
+    "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/lt.json

@@ -1,46 +1,62 @@
 {
-    "Failed to save image": "Nepavyko įrašyti paveikslėlio",
-    "Save image as...": "Įrašyti paveikslėlį kaip...",
-    "Copy image address": "Kopijuoti paveikslėlio adresą",
-    "Copy image": "Kopijuoti paveikslėlį",
-    "The image failed to save": "Paveikslėlio nepavyko išsaugoti",
-    "Bring All to Front": "Viską iškelti į priekį",
-    "Speech": "Kalba",
-    "Actual Size": "Tikrasis dydis",
-    "Toggle Developer Tools": "Perjungti kūrėjo įrankius",
-    "Toggle Full Screen": "Perjungti viso ekrano režimą",
-    "Paste and Match Style": "Įklijuoti ir suderinti stilių",
-    "Redo": "Sugrąžinti veiksmą",
-    "Undo": "Atšaukti veiksmą",
-    "Select All": "Pasirinkti visus",
-    "Delete": "Ištrinti",
-    "Paste": "Įklijuoti",
-    "Copy": "Kopijuoti",
-    "Cut": "Iškirpti",
-    "Add to dictionary": "Pridėti prie žodyno",
-    "Copy link address": "Kopijuoti nuorodos adresą",
-    "Copy email address": "Kopijuoti el. pašto adresą",
-    "File": "Failas",
-    "Zoom": "Priartinti",
-    "Stop Speaking": "Nustoti kalbėti",
-    "Start Speaking": "Pradėti kalbėti",
-    "Unhide": "Nebeslėpti",
-    "Hide Others": "Slėpti kitus",
-    "Hide": "Slėpti",
-    "Services": "Paslaugos",
-    "About": "Apie",
-    "Help": "Pagalba",
-    "Close": "Uždaryti",
-    "Minimize": "Sumažinti",
-    "Window": "Langas",
-    "Preferences": "Nuostatos",
-    "Zoom Out": "Atitolinti",
-    "Zoom In": "Priartinti",
-    "View": "Peržiūrėti",
-    "Edit": "Redaguoti",
-    "Quit": "Išeiti",
-    "Show/Hide": "Rodyti/Slėpti",
-    "Are you sure you want to quit?": "Ar tikrai norite išeiti?",
-    "Cancel": "Atšaukti",
-    "Close %(brand)s": "Uždaryti %(brand)s"
+    "action": {
+        "cancel": "Atšaukti",
+        "close": "Uždaryti",
+        "close_brand": "Uždaryti %(brand)s",
+        "copy": "Kopijuoti",
+        "cut": "Iškirpti",
+        "delete": "Ištrinti",
+        "edit": "Koreguoti",
+        "minimise": "Sumažinti",
+        "paste": "Įklijuoti",
+        "paste_match_style": "Įklijuoti ir suderinti stilių",
+        "quit": "Išeiti",
+        "redo": "Sugrąžinti veiksmą",
+        "select_all": "Pasirinkti visus",
+        "show_hide": "Rodyti/Slėpti",
+        "undo": "Atšaukti veiksmą",
+        "zoom_in": "Priartinti",
+        "zoom_out": "Atitolinti"
+    },
+    "common": {
+        "about": "Apie",
+        "help": "Pagalba",
+        "preferences": "Nuostatos"
+    },
+    "confirm_quit": "Ar tikrai norite išeiti?",
+    "edit_menu": {
+        "speech": "Kalba",
+        "speech_start_speaking": "Pradėti kalbėti",
+        "speech_stop_speaking": "Nustoti kalbėti"
+    },
+    "file_menu": {
+        "label": "Failas"
+    },
+    "menu": {
+        "hide": "Slėpti",
+        "hide_others": "Slėpti kitus",
+        "services": "Paslaugos",
+        "unhide": "Nebeslėpti"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Pridėti prie žodyno",
+        "copy_email": "Kopijuoti el. pašto adresą",
+        "copy_image": "Kopijuoti paveikslėlį",
+        "copy_image_url": "Kopijuoti paveikslėlio adresą",
+        "copy_link_url": "Kopijuoti nuorodos adresą",
+        "save_image_as": "Įrašyti paveikslėlį kaip...",
+        "save_image_as_error_description": "Paveikslėlio nepavyko išsaugoti",
+        "save_image_as_error_title": "Nepavyko įrašyti paveikslėlio"
+    },
+    "view_menu": {
+        "actual_size": "Tikrasis dydis",
+        "toggle_developer_tools": "Perjungti kūrėjo įrankius",
+        "toggle_full_screen": "Perjungti viso ekrano režimą",
+        "view": "Žiūrėti"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Viską iškelti į priekį",
+        "label": "Langas",
+        "zoom": "Priartinti"
+    }
 }

src/i18n/strings/lv.json

@@ -1,47 +0,0 @@
-{
-    "Start Speaking": "Uzsākt runāšanu",
-    "Add to dictionary": "Pievienot vārdnīcai",
-    "The image failed to save": "Attēlu neizdevās saglabāt",
-    "Failed to save image": "Neizdevās saglabāt attēlu",
-    "Save image as...": "Saglabāt attēlu kā...",
-    "Copy link address": "Ievietot saites adresi starpliktuvē",
-    "Copy email address": "Ievietot e-pasta adresi starpliktuvē",
-    "Copy image": "Ievietot attēlu starpliktuvē",
-    "File": "Datne",
-    "Bring All to Front": "Iznest visu priekšplānā",
-    "Zoom": "Tālummaiņa",
-    "Stop Speaking": "Pārtraukt runāšanu",
-    "Speech": "Runa",
-    "Unhide": "Rādīt",
-    "Hide Others": "Paslēpt citus",
-    "Hide": "Paslēpt",
-    "Services": "Pakalpojumi",
-    "About": "Par",
-    "Help": "Palīdzība",
-    "Close": "Aizvērt",
-    "Minimize": "Samazināt",
-    "Window": "Logs",
-    "Toggle Developer Tools": "Pārslēgt izstrādātāja rīkus",
-    "Toggle Full Screen": "Pārslēgt pilnekrānu",
-    "Preferences": "Iestatījumi",
-    "Zoom Out": "Tālināt",
-    "Zoom In": "Tuvināt",
-    "Actual Size": "Īstais izmērs",
-    "View": "Skats",
-    "Select All": "Atzīmēt visu",
-    "Delete": "Izdzēst",
-    "Paste and Match Style": "Ielīmēt un pielāgot stilu",
-    "Paste": "Ielīmēt",
-    "Copy": "Ievietot starpliktuvē",
-    "Cut": "Izgriezt",
-    "Redo": "Atatsaukt",
-    "Undo": "Atsaukt",
-    "Edit": "Labot",
-    "Quit": "Iziet",
-    "Show/Hide": "Parādīt/paslēpt",
-    "Are you sure you want to quit?": "Vai tiešām iziet?",
-    "Cancel": "Atcelt",
-    "Copy image address": "Ievietot attēla adresi starpliktuvē",
-    "Close %(brand)s": "Aizvērt %(brand)s",
-    "%(brand)s Help": "%(brand)s palīdzība"
-}

src/i18n/strings/nb_NO.json

@@ -1,37 +0,0 @@
-{
-    "Toggle Developer Tools": "Veksle Utvikleralternativer",
-    "Add to dictionary": "Legg til i ordbok",
-    "The image failed to save": "Bildet kunne ikke lagres",
-    "Failed to save image": "Kunne ikke lagre bildet",
-    "Save image as...": "Lagre bildet som...",
-    "Copy email address": "Kopier e-postadressen",
-    "Copy image": "Kopier bildet",
-    "File": "Fil",
-    "Stop Speaking": "Slutt å snakke",
-    "Start Speaking": "Begynn å snakke",
-    "Speech": "Tale",
-    "Hide": "Skjul",
-    "About": "Om",
-    "Help": "Hjelp",
-    "Close": "Lukk",
-    "Minimize": "Minimere",
-    "Window": "Vindu",
-    "Zoom Out": "Zoom ut",
-    "Zoom In": "Zoom inn",
-    "Actual Size": "Faktisk størrelse",
-    "View": "Se",
-    "Select All": "Velg alle",
-    "Delete": "Slett",
-    "Paste": "Lim inn",
-    "Copy": "Kopier",
-    "Undo": "Angre",
-    "Edit": "Rediger",
-    "Quit": "Avslutt",
-    "Show/Hide": "Vis/Skjul",
-    "Are you sure you want to quit?": "Er du sikker på at du vil slutte?",
-    "Cancel": "Avbryt",
-    "Services": "Tjenester",
-    "Hide Others": "Skjul Andre",
-    "Bring All to Front": "Flytt Alt Frem",
-    "Toggle Full Screen": "Veksle Fullskjerm"
-}

src/i18n/strings/nl.json

@@ -1,46 +1,60 @@
 {
-    "Add to dictionary": "Aan woordenboek toevoegen",
-    "The image failed to save": "De afbeelding opslaan is mislukt",
-    "Failed to save image": "Afbeelding opslaan is mislukt",
-    "Save image as...": "Afbeelding opslaan als...",
-    "Copy link address": "Link kopiëren",
-    "Copy email address": "E-mailadres kopiëren",
-    "Copy image": "Afbeelding kopiëren",
-    "File": "Bestand",
-    "Bring All to Front": "Alles naar voren brengen",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Stop met praten",
-    "Start Speaking": "Begin met praten",
-    "Speech": "Spraak",
-    "Unhide": "Weer laten zien",
-    "Hide Others": "Anderen verbergen",
-    "Hide": "Verbergen",
-    "Services": "Diensten",
-    "About": "Over",
-    "Help": "Help",
-    "Close": "Sluiten",
-    "Minimize": "Minimaliseren",
-    "Window": "Venster",
-    "Toggle Developer Tools": "Developer Tools wisselen",
-    "Toggle Full Screen": "Volledig scherm wisselen",
-    "Preferences": "Voorkeuren",
-    "Zoom Out": "Uitzoomen",
-    "Zoom In": "Inzoomen",
-    "Actual Size": "Werkelijke grootte",
-    "View": "Bekijken",
-    "Select All": "Alles selecteren",
-    "Delete": "Verwijderen",
-    "Paste and Match Style": "Plakken zonder stijl",
-    "Paste": "Plakken",
-    "Copy": "Kopiëren",
-    "Cut": "Knippen",
-    "Redo": "Opnieuw doen",
-    "Undo": "Ongedaan maken",
-    "Edit": "Bewerken",
-    "Quit": "Sluiten",
-    "Show/Hide": "Tonen/Verbergen",
-    "Are you sure you want to quit?": "Weet u zeker dat u wilt stoppen?",
-    "Cancel": "Annuleren",
-    "Copy image address": "Kopieer afbeeldingsadres",
-    "Close %(brand)s": "Sluit %(brand)s"
+    "action": {
+        "cancel": "Annuleren",
+        "close": "Sluiten",
+        "close_brand": "Sluit %(brand)s",
+        "copy": "Kopiëren",
+        "cut": "Knippen",
+        "delete": "Verwijderen",
+        "edit": "Bewerken",
+        "minimise": "Minimaliseren",
+        "paste": "Plakken",
+        "paste_match_style": "Plakken zonder stijl",
+        "quit": "Sluiten",
+        "redo": "Opnieuw doen",
+        "select_all": "Alles selecteren",
+        "show_hide": "Tonen/Verbergen",
+        "undo": "Ongedaan maken",
+        "zoom_in": "Inzoomen",
+        "zoom_out": "Uitzoomen"
+    },
+    "common": {
+        "about": "Over",
+        "preferences": "Voorkeuren"
+    },
+    "confirm_quit": "Weet u zeker dat u wilt stoppen?",
+    "edit_menu": {
+        "speech": "Spraak",
+        "speech_start_speaking": "Begin met praten",
+        "speech_stop_speaking": "Stop met praten"
+    },
+    "file_menu": {
+        "label": "Bestand"
+    },
+    "menu": {
+        "hide": "Verbergen",
+        "hide_others": "Anderen verbergen",
+        "services": "Diensten",
+        "unhide": "Weer laten zien"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Aan woordenboek toevoegen",
+        "copy_email": "E-mailadres kopiëren",
+        "copy_image": "Afbeelding kopiëren",
+        "copy_image_url": "Kopieer afbeeldingsadres",
+        "copy_link_url": "Link kopiëren",
+        "save_image_as": "Afbeelding opslaan als...",
+        "save_image_as_error_description": "De afbeelding opslaan is mislukt",
+        "save_image_as_error_title": "Afbeelding opslaan is mislukt"
+    },
+    "view_menu": {
+        "actual_size": "Werkelijke grootte",
+        "toggle_developer_tools": "Developer Tools wisselen",
+        "toggle_full_screen": "Volledig scherm wisselen",
+        "view": "Bekijken"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Alles naar voren brengen",
+        "label": "Venster"
+    }
 }

src/i18n/strings/nn.json

@@ -1,46 +0,0 @@
-{
-    "The image failed to save": "Biletet vart ikkje lagra",
-    "Paste and Match Style": "Lim inn og tilpass stil",
-    "Redo": "Gjer om",
-    "Undo": "Angre",
-    "Are you sure you want to quit?": "Er du sikker på at du vil avslutta?",
-    "Add to dictionary": "Legg til i ordlista",
-    "Failed to save image": "Klarte ikkje å lagra biletet",
-    "Save image as...": "Lagre bilete som…",
-    "Copy link address": "Kopier lenkjeadresse",
-    "Copy email address": "Kopier e-postadresse",
-    "Copy image": "Kopier bilete",
-    "File": "Fil",
-    "Bring All to Front": "Plasser lengst fram",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Stopp snakka",
-    "Start Speaking": "Byrja snakka",
-    "Speech": "Tale",
-    "Unhide": "Ikkje gøym",
-    "Hide Others": "Gøym andre",
-    "Hide": "Gøym",
-    "Services": "Tenester",
-    "About": "Om",
-    "Help": "Hjelp",
-    "Close": "Lat att",
-    "Minimize": "Minimer",
-    "Window": "Vindauga",
-    "Toggle Developer Tools": "Developer Tools av/på",
-    "Toggle Full Screen": "Fullskjerm av/på",
-    "Preferences": "Innstillingar",
-    "Zoom Out": "Zoom ut",
-    "Zoom In": "Zoom inn",
-    "Actual Size": "Faktisk storleik",
-    "View": "Vis",
-    "Select All": "Marker alt",
-    "Delete": "Slett",
-    "Paste": "Lim inn",
-    "Copy": "Lim inn",
-    "Cut": "Klipp ut",
-    "Edit": "Rediger",
-    "Quit": "Avslutt",
-    "Show/Hide": "Vis/Gøym",
-    "Cancel": "Avbryt",
-    "Copy image address": "Kopier bildeadresse",
-    "Close %(brand)s": "Lukk %(brand)s"
-}

src/i18n/strings/pl.json

@@ -1,47 +1,63 @@
 {
-    "Bring All to Front": "Wyciągnij wszystko do przodu",
-    "Add to dictionary": "Dodaj do słownika",
-    "The image failed to save": "Obraz nie został zapisany",
-    "Failed to save image": "Nie udało się zapisać obrazu",
-    "Save image as...": "Zapisz obraz jako...",
-    "Copy link address": "Kopiuj adres odnośnika",
-    "Copy email address": "Kopiuj adres e-mail",
-    "Copy image": "Kopiuj obraz",
-    "File": "Plik",
-    "Zoom": "Powiększenie",
-    "Stop Speaking": "Przestań mówić",
-    "Start Speaking": "Zacznij mówić",
-    "Speech": "Mowa",
-    "Unhide": "Odkryj",
-    "Hide Others": "Ukryj inne",
-    "Hide": "Ukryj",
-    "Services": "Usługi",
-    "About": "O nas",
-    "Help": "Pomoc",
-    "Close": "Zamknij",
-    "Minimize": "Minimalizuj",
-    "Window": "Okno",
-    "Toggle Developer Tools": "Przełącz na narzędzia deweloperskie",
-    "Toggle Full Screen": "Przełącz na pełny ekran",
-    "Preferences": "Preferencje",
-    "Zoom Out": "Pomniejsz",
-    "Zoom In": "Powiększ",
-    "Actual Size": "Rozmiar rzeczywisty",
-    "View": "Pokaż",
-    "Select All": "Zaznacz wszystko",
-    "Delete": "Usuń",
-    "Paste and Match Style": "Wklej i dopasuj styl",
-    "Paste": "Wklej",
-    "Copy": "Kopiuj",
-    "Cut": "Wytnij",
-    "Redo": "Ponów",
-    "Undo": "Cofnij",
-    "Edit": "Edytuj",
-    "Quit": "Zamknij",
-    "Show/Hide": "Pokaż/Ukryj",
-    "Are you sure you want to quit?": "Czy na pewno chcesz zamknąć?",
-    "Cancel": "Anuluj",
-    "Copy image address": "Kopiuj adres obrazu",
-    "Close %(brand)s": "Zamknij %(brand)s",
-    "%(brand)s Help": "Pomoc %(brand)s"
+    "action": {
+        "cancel": "Anuluj",
+        "close": "Zamknij",
+        "close_brand": "Zamknij %(brand)s",
+        "copy": "Kopiuj",
+        "cut": "Wytnij",
+        "delete": "Usuń",
+        "edit": "Edytuj",
+        "minimise": "Minimalizuj",
+        "paste": "Wklej",
+        "paste_match_style": "Wklej i dopasuj styl",
+        "quit": "Zamknij",
+        "redo": "Ponów",
+        "select_all": "Zaznacz wszystko",
+        "show_hide": "Pokaż/Ukryj",
+        "undo": "Cofnij",
+        "zoom_in": "Powiększ",
+        "zoom_out": "Pomniejsz"
+    },
+    "common": {
+        "about": "Informacje",
+        "brand_help": "Pomoc %(brand)s",
+        "help": "Pomoc",
+        "preferences": "Preferencje"
+    },
+    "confirm_quit": "Czy na pewno chcesz zamknąć?",
+    "edit_menu": {
+        "speech": "Mowa",
+        "speech_start_speaking": "Zacznij mówić",
+        "speech_stop_speaking": "Przestań mówić"
+    },
+    "file_menu": {
+        "label": "Plik"
+    },
+    "menu": {
+        "hide": "Ukryj",
+        "hide_others": "Ukryj inne",
+        "services": "Usługi",
+        "unhide": "Odkryj"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Dodaj do słownika",
+        "copy_email": "Kopiuj adres e-mail",
+        "copy_image": "Kopiuj obraz",
+        "copy_image_url": "Kopiuj adres obrazu",
+        "copy_link_url": "Kopiuj adres odnośnika",
+        "save_image_as": "Zapisz obraz jako...",
+        "save_image_as_error_description": "Obraz nie został zapisany",
+        "save_image_as_error_title": "Nie udało się zapisać obrazu"
+    },
+    "view_menu": {
+        "actual_size": "Rozmiar rzeczywisty",
+        "toggle_developer_tools": "Przełącz na narzędzia deweloperskie",
+        "toggle_full_screen": "Przełącz na pełny ekran",
+        "view": "Wyświetl"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Wyciągnij wszystko do przodu",
+        "label": "Okno",
+        "zoom": "Powiększenie"
+    }
 }

src/i18n/strings/pt_BR.json

@@ -1,46 +1,61 @@
 {
-    "Add to dictionary": "Adicionar a dicionário",
-    "The image failed to save": "A imagem falhou para salvar",
-    "Failed to save image": "Falha para salvar imagem",
-    "Save image as...": "Salvar imagem como...",
-    "Copy link address": "Copiar endereço de link",
-    "Copy email address": "Copiar endereço de email",
-    "Copy image": "Copiar imagem",
-    "File": "Arquivo",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Parar de Falar",
-    "Start Speaking": "Começar a Falar",
-    "Speech": "Fala",
-    "Unhide": "Desesconder",
-    "Hide": "Esconder",
-    "Services": "Serviços",
-    "About": "Sobre",
-    "Help": "Ajuda",
-    "Close": "Fechar",
-    "Minimize": "Minimizar",
-    "Window": "Janela",
-    "Toggle Developer Tools": "Ativar/Desativar Ferramentas de Desenvolvimento",
-    "Toggle Full Screen": "Pôr em/Tirar de Tela Cheia",
-    "Preferences": "Preferências",
-    "Zoom Out": "Dar Zoom Out",
-    "Zoom In": "Dar Zoom In",
-    "Actual Size": "Tamanho de Verdade",
-    "View": "Visualizar",
-    "Select All": "Selecionar Todas",
-    "Delete": "Deletar",
-    "Paste and Match Style": "Colar e Adequar Estilo",
-    "Paste": "Colar",
-    "Copy": "Copiar",
-    "Cut": "Cortar",
-    "Redo": "Refazer",
-    "Undo": "Desfazer",
-    "Edit": "Editar",
-    "Quit": "Sair",
-    "Show/Hide": "Mostrar/Esconder",
-    "Are you sure you want to quit?": "Você tem certeza que você quer sair?",
-    "Cancel": "Cancelar",
-    "Bring All to Front": "Trazer Todas Para Frente",
-    "Hide Others": "Esconder Outras(os)",
-    "Copy image address": "Copiar endereço de imagem",
-    "Close %(brand)s": "Fechar %(brand)s"
+    "action": {
+        "cancel": "Cancelar",
+        "close": "Fechar",
+        "close_brand": "Fechar %(brand)s",
+        "copy": "Copiar",
+        "cut": "Cortar",
+        "delete": "Deletar",
+        "edit": "Editar",
+        "minimise": "Minimizar",
+        "paste": "Colar",
+        "paste_match_style": "Colar e Adequar Estilo",
+        "quit": "Sair",
+        "redo": "Refazer",
+        "select_all": "Selecionar Todas",
+        "show_hide": "Mostrar/Esconder",
+        "undo": "Desfazer",
+        "zoom_in": "Dar Zoom In",
+        "zoom_out": "Dar Zoom Out"
+    },
+    "common": {
+        "about": "Sobre",
+        "help": "Ajuda",
+        "preferences": "Preferências"
+    },
+    "confirm_quit": "Você tem certeza que você quer sair?",
+    "edit_menu": {
+        "speech": "Fala",
+        "speech_start_speaking": "Começar a Falar",
+        "speech_stop_speaking": "Parar de Falar"
+    },
+    "file_menu": {
+        "label": "Arquivo"
+    },
+    "menu": {
+        "hide": "Esconder",
+        "hide_others": "Esconder Outras(os)",
+        "services": "Serviços",
+        "unhide": "Desesconder"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Adicionar a dicionário",
+        "copy_email": "Copiar endereço de email",
+        "copy_image": "Copiar imagem",
+        "copy_image_url": "Copiar endereço de imagem",
+        "copy_link_url": "Copiar endereço de link",
+        "save_image_as": "Salvar imagem como...",
+        "save_image_as_error_description": "A imagem falhou para salvar",
+        "save_image_as_error_title": "Falha para salvar imagem"
+    },
+    "view_menu": {
+        "actual_size": "Tamanho de Verdade",
+        "toggle_developer_tools": "Ativar/Desativar Ferramentas de Desenvolvimento",
+        "toggle_full_screen": "Pôr em/Tirar de Tela Cheia",
+        "view": "Visualizar"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Trazer Todas Para Frente",
+        "label": "Janela"
+    }
 }

src/i18n/strings/ro.json

@@ -1,43 +0,0 @@
-{
-    "Add to dictionary": "Adăugați la dicționar",
-    "Failed to save image": "Eroare în salvarea imaginii",
-    "Save image as...": "Salvează imagine ca ...",
-    "Copy link address": "Copiază link",
-    "Copy email address": "Copiază adresă de email",
-    "Copy image": "Copiază imagine",
-    "File": "Fișier",
-    "Bring All to Front": "Aduce-ți totul in față",
-    "Zoom": "Zoom",
-    "Stop Speaking": "Oprire Voce",
-    "Start Speaking": "Pornire Voce",
-    "Speech": "Voce",
-    "Hide Others": "Ascunde restul",
-    "Hide": "Ascunde",
-    "Services": "Servicii",
-    "About": "Despre",
-    "Help": "Ajutor",
-    "Close": "Inchide",
-    "Minimize": "Minimizare",
-    "Window": "Fereastră",
-    "Toggle Developer Tools": "Comutare unelte dezvoltator",
-    "Toggle Full Screen": "Comutare pe tot ecranul",
-    "Preferences": "Preferințe",
-    "Zoom Out": "Micșorează",
-    "Zoom In": "Mărește",
-    "Actual Size": "Mărime reală",
-    "View": "Vizualizează",
-    "Select All": "Selectează tot",
-    "Delete": "Șterge",
-    "Paste and Match Style": "Lipește si potrivește stilul",
-    "Paste": "Lipește",
-    "Copy": "Copiază",
-    "Redo": "Refă",
-    "Undo": "Anulare",
-    "Edit": "Editare",
-    "Quit": "Închid",
-    "Show/Hide": "Arată/Ascunde",
-    "Are you sure you want to quit?": "Sigur vrei să ieși din cont?",
-    "Cancel": "Anulare",
-    "Close %(brand)s": "Închide %(brand)s",
-    "Cut": "Taie"
-}

src/i18n/strings/ru.json

@@ -1,47 +1,63 @@
 {
-    "Edit": "Изменить",
-    "Quit": "Выйти",
-    "Cancel": "Отмена",
-    "Show/Hide": "Показать/скрыть",
-    "Are you sure you want to quit?": "Вы уверены, что хотите выйти?",
-    "Copy email address": "Копировать адрес почты",
-    "Copy image": "Копировать изображение",
-    "File": "Файл",
-    "Zoom": "Масштаб",
-    "Unhide": "Показать",
-    "Hide": "Скрыть",
-    "Services": "Службы",
-    "About": "О программе",
-    "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": "Отменить",
-    "Save image as...": "Сохранить изображение как...",
-    "Copy link address": "Копировать ссылку",
-    "Add to dictionary": "Добавить в словарь",
-    "The image failed to save": "Не удалось сохранить изображение",
-    "Failed to save image": "Не удалось сохранить изображение",
-    "Bring All to Front": "Вынести всё вперёд",
-    "Stop Speaking": "Перестаньте говорить",
-    "Start Speaking": "Говорите",
-    "Speech": "Речь",
-    "Hide Others": "Скрыть прочие",
-    "Paste and Match Style": "Вставить с тем же стилем",
-    "Copy image address": "Копировать адрес изображения",
-    "Close %(brand)s": "Закрыть %(brand)s",
-    "%(brand)s Help": "Помощь %(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": "О программе",
+        "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/si.json

@@ -1,45 +0,0 @@
-{
-    "Show/Hide": "පෙන්වන්න/සඟවන්න",
-    "Are you sure you want to quit?": "ඔබට ඉවත් වීමට අවශ්‍ය බව විශ්වාස ද?",
-    "Cancel": "අවලංගු කරන්න",
-    "Add to dictionary": "ශබ්ද කෝෂයට එකතු කරන්න",
-    "Copy link address": "සබැඳියේ ලිපිනය පිටපත් කරන්න",
-    "Copy email address": "වි-තැපෑල පිටපත් කරන්න",
-    "File": "ගොනුව",
-    "Zoom": "විශාල කරන්න",
-    "Hide Others": "වෙනත් දෑ සඟවන්න",
-    "Hide": "සඟවන්න",
-    "Services": "සේවා",
-    "About": "පිළිබඳව",
-    "Help": "උපකාර",
-    "Close": "වසන්න",
-    "Minimize": "හකුලන්න",
-    "Window": "කවුළුව",
-    "Zoom Out": "කුඩාලනය කරන්න",
-    "Zoom In": "විශාලනය කරන්න",
-    "Actual Size": "සැබෑ ප්‍රමාණය",
-    "Select All": "සියල්ල තෝරන්න",
-    "Paste": "අලවන්න",
-    "Copy": "පිටපත්",
-    "Cut": "කපන්න",
-    "Redo": "පසුසේ",
-    "Undo": "පෙරසේ",
-    "Edit": "සංස්කරණය",
-    "Quit": "ඉවත් වන්න",
-    "Paste and Match Style": "අලවා ශෛලිය ගැළපුම",
-    "Delete": "මකන්න",
-    "The image failed to save": "රූපය සුරැකීමට අසමත්",
-    "Failed to save image": "රූපය සුරැකීමට අසමත්",
-    "Save image as...": "...ලෙස රූපය සුරකින්න",
-    "Copy image address": "රූපයේ ලිපිනයේ පිටපතක්",
-    "Copy image": "රූපයෙහි පිටපතක්",
-    "Bring All to Front": "සියල්ල ඉදිරිපසට",
-    "Stop Speaking": "කථාව නිමාව",
-    "Start Speaking": "කථාව ආරම්භය",
-    "Speech": "කථාව",
-    "Unhide": "නොසඟවන්න",
-    "Toggle Developer Tools": "සංවර්ධක මෙවලම්",
-    "Toggle Full Screen": "පූර්ණ තිරයට",
-    "Preferences": "පෙනුම",
-    "View": "දකින්න"
-}

src/i18n/strings/sk.json

@@ -1,47 +1,63 @@
 {
-    "Unhide": "Odkryť",
-    "Stop Speaking": "Zastaviť nahrávanie hlasu",
-    "Start Speaking": "Spustiť nahrávanie hlasu",
-    "Speech": "Reč",
-    "Paste and Match Style": "Vložiť a prispôsobiť štýl",
-    "Add to dictionary": "Pridať do slovníka",
-    "The image failed to save": "Obrázok sa nepodarilo uložiť",
-    "Failed to save image": "Chyba pri ukladaní obrázka",
-    "Save image as...": "Uložiť obrázok ako...",
-    "Copy link address": "Kopírovať adresu odkazu",
-    "Copy email address": "Kopírovať e-mailovú adresu",
-    "Copy image": "Kopírovať obrázok",
-    "File": "Súbor",
-    "Bring All to Front": "Preniesť všetky do popredia",
-    "Zoom": "Lupa",
-    "Hide Others": "Skryť ostatné",
-    "Hide": "Skryť",
-    "Services": "Služby",
-    "About": "O aplikácii",
-    "Help": "Pomocník",
-    "Close": "Zavrieť",
-    "Minimize": "Minimalizovať",
-    "Window": "Okno",
-    "Toggle Developer Tools": "Nástroje pre vývojárov",
-    "Toggle Full Screen": "Celá obrazovka",
-    "Preferences": "Vlastnosti",
-    "Zoom Out": "Oddialiť",
-    "Zoom In": "Priblížiť",
-    "Actual Size": "Aktuálna veľkosť",
-    "View": "Zobraziť",
-    "Select All": "Vybrať všetko",
-    "Delete": "Odstrániť",
-    "Paste": "Vložiť",
-    "Copy": "Kopírovať",
-    "Cut": "Vystrihnúť",
-    "Redo": "Opakovať",
-    "Undo": "Späť",
-    "Edit": "Úpravy",
-    "Quit": "Ukončiť",
-    "Show/Hide": "Zobraziť/Skryť",
-    "Are you sure you want to quit?": "Naozaj chcete zavrieť aplikáciu?",
-    "Cancel": "Zrušiť",
-    "Copy image address": "Kopírovať adresu obrázka",
-    "Close %(brand)s": "Zatvoriť %(brand)s",
-    "%(brand)s Help": "%(brand)s Pomoc"
+    "action": {
+        "cancel": "Zrušiť",
+        "close": "Zavrieť",
+        "close_brand": "Zatvoriť %(brand)s",
+        "copy": "Kopírovať",
+        "cut": "Vystrihnúť",
+        "delete": "Odstrániť",
+        "edit": "Úpravy",
+        "minimise": "Minimalizovať",
+        "paste": "Vložiť",
+        "paste_match_style": "Vložiť a prispôsobiť štýl",
+        "quit": "Ukončiť",
+        "redo": "Opakovať",
+        "select_all": "Vybrať všetko",
+        "show_hide": "Zobraziť/Skryť",
+        "undo": "Späť",
+        "zoom_in": "Priblížiť",
+        "zoom_out": "Oddialiť"
+    },
+    "common": {
+        "about": "O aplikácii",
+        "brand_help": "%(brand)s Pomoc",
+        "help": "Pomocník",
+        "preferences": "Vlastnosti"
+    },
+    "confirm_quit": "Naozaj chcete zavrieť aplikáciu?",
+    "edit_menu": {
+        "speech": "Reč",
+        "speech_start_speaking": "Spustiť nahrávanie hlasu",
+        "speech_stop_speaking": "Zastaviť nahrávanie hlasu"
+    },
+    "file_menu": {
+        "label": "Súbor"
+    },
+    "menu": {
+        "hide": "Skryť",
+        "hide_others": "Skryť ostatné",
+        "services": "Služby",
+        "unhide": "Odkryť"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Pridať do slovníka",
+        "copy_email": "Kopírovať e-mailovú adresu",
+        "copy_image": "Kopírovať obrázok",
+        "copy_image_url": "Kopírovať adresu obrázka",
+        "copy_link_url": "Kopírovať adresu odkazu",
+        "save_image_as": "Uložiť obrázok ako...",
+        "save_image_as_error_description": "Obrázok sa nepodarilo uložiť",
+        "save_image_as_error_title": "Chyba pri ukladaní obrázka"
+    },
+    "view_menu": {
+        "actual_size": "Aktuálna veľkosť",
+        "toggle_developer_tools": "Nástroje pre vývojárov",
+        "toggle_full_screen": "Celá obrazovka",
+        "view": "Zobraziť"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Preniesť všetky do popredia",
+        "label": "Okno",
+        "zoom": "Lupa"
+    }
 }

src/i18n/strings/sl.json

@@ -1,47 +0,0 @@
-{
-    "Undo": "Razveljavi",
-    "Redo": "Uveljavi",
-    "Copy": "Kopiraj",
-    "Paste": "Prilepi",
-    "Actual Size": "Dejanska velikost",
-    "Zoom Out": "Oddalji",
-    "Window": "Okno",
-    "Minimize": "Zmanjšaj",
-    "Help": "Pomoč",
-    "About": "O programu",
-    "Services": "Storitve",
-    "Hide Others": "Skrij ostalo",
-    "Unhide": "Razkrij",
-    "Speech": "Govor",
-    "Copy link address": "Kopiraj naslov povezave",
-    "Add to dictionary": "Dodaj v slovar",
-    "Cancel": "Prekliči",
-    "Close %(brand)s": "Zapri %(brand)s",
-    "Are you sure you want to quit?": "Ste prepričani, da želite zapreti program?",
-    "Show/Hide": "Prikaži/Skrij",
-    "Quit": "Končaj",
-    "Edit": "Uredi",
-    "Cut": "Izreži",
-    "Paste and Match Style": "Prilepi ter obdrži oblikovanje",
-    "Delete": "Izbriši",
-    "Select All": "Izberi vse",
-    "View": "Poglej",
-    "Zoom In": "Približaj",
-    "Preferences": "Nastavitve",
-    "Toggle Full Screen": "Preklopi čez cel zaslon",
-    "Toggle Developer Tools": "Preklopi na orodja za razvijalce",
-    "Close": "Zapri",
-    "%(brand)s Help": "%(brand)s pomoč",
-    "Hide": "Skrij",
-    "Start Speaking": "Začnite govoriti",
-    "Stop Speaking": "Prenehajte govoriti",
-    "Zoom": "Povečaj",
-    "Bring All to Front": "Postavi vse v ospredje",
-    "File": "Datoteka",
-    "Copy image": "Kopiraj sliko",
-    "Copy email address": "Kopiraj e-poštni naslov",
-    "Copy image address": "Kopiraj naslov slike",
-    "Save image as...": "Shrani sliko kot...",
-    "Failed to save image": "Shranjevanje slike ni uspelo",
-    "The image failed to save": "Slike ni bilo mogoče shraniti"
-}

src/i18n/strings/sq.json

@@ -0,0 +1,17 @@
+{
+    "action": {
+        "cancel": "Anuloje",
+        "close": "Mbylle",
+        "copy": "Kopjoje",
+        "delete": "Fshije",
+        "edit": "Përpuno"
+    },
+    "common": {
+        "about": "Mbi",
+        "help": "Ndihmë",
+        "preferences": "Parapëlqime"
+    },
+    "view_menu": {
+        "view": "Shihni"
+    }
+}

src/i18n/strings/sv.json

@@ -1,47 +1,63 @@
 {
-    "Save image as...": "Spara bild som…",
-    "Copy link address": "Kopiera länkadress",
-    "Copy email address": "Kopiera e-postadress",
-    "Copy image": "Kopiera bild",
-    "File": "Arkiv",
-    "Bring All to Front": "Lägg alla överst",
-    "Stop Speaking": "Sluta tala",
-    "Start Speaking": "Börja tala",
-    "Speech": "Tal",
-    "Hide Others": "Göm övriga",
-    "Hide": "Göm",
-    "Services": "Tjänster",
-    "About": "Om",
-    "Help": "Hjälp",
-    "Close": "Stäng",
-    "Minimize": "Minimera",
-    "Window": "Fönster",
-    "Preferences": "Inställningar",
-    "Actual Size": "Verklig storlek",
-    "View": "Visa",
-    "Select All": "Markera allt",
-    "Delete": "Radera",
-    "Paste and Match Style": "Klistra in och matcha stilen",
-    "Paste": "Klistra in",
-    "Copy": "Kopiera",
-    "Cut": "Klipp ut",
-    "Redo": "Gör om",
-    "Undo": "Ångra",
-    "Edit": "Redigera",
-    "Quit": "Avsluta",
-    "Cancel": "Avbryt",
-    "Zoom": "Zooma",
-    "Toggle Developer Tools": "Växla utvecklarverktyg",
-    "Toggle Full Screen": "Växla helskärm",
-    "Unhide": "Sluta gömma",
-    "Zoom Out": "Zooma ut",
-    "Zoom In": "Zooma in",
-    "Show/Hide": "Visa/dölj",
-    "Add to dictionary": "Lägg till i ordlistan",
-    "The image failed to save": "Bilden sparades inte",
-    "Failed to save image": "Misslyckades med att spara bilden",
-    "Are you sure you want to quit?": "Är du säker att du vill avsluta?",
-    "Copy image address": "Kopiera bildadress",
-    "Close %(brand)s": "Stäng %(brand)s",
-    "%(brand)s Help": "%(brand)s-hjälp"
+    "action": {
+        "cancel": "Avbryt",
+        "close": "Stäng",
+        "close_brand": "Stäng %(brand)s",
+        "copy": "Kopiera",
+        "cut": "Klipp ut",
+        "delete": "Radera",
+        "edit": "Redigera",
+        "minimise": "Minimera",
+        "paste": "Klistra in",
+        "paste_match_style": "Klistra in och matcha stilen",
+        "quit": "Avsluta",
+        "redo": "Gör om",
+        "select_all": "Markera allt",
+        "show_hide": "Visa/dölj",
+        "undo": "Ångra",
+        "zoom_in": "Zooma in",
+        "zoom_out": "Zooma ut"
+    },
+    "common": {
+        "about": "Om",
+        "brand_help": "%(brand)s-hjälp",
+        "help": "Hjälp",
+        "preferences": "Inställningar"
+    },
+    "confirm_quit": "Är du säker att du vill avsluta?",
+    "edit_menu": {
+        "speech": "Tal",
+        "speech_start_speaking": "Börja tala",
+        "speech_stop_speaking": "Sluta tala"
+    },
+    "file_menu": {
+        "label": "Arkiv"
+    },
+    "menu": {
+        "hide": "Göm",
+        "hide_others": "Göm övriga",
+        "services": "Tjänster",
+        "unhide": "Sluta gömma"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Lägg till i ordlistan",
+        "copy_email": "Kopiera e-postadress",
+        "copy_image": "Kopiera bild",
+        "copy_image_url": "Kopiera bildadress",
+        "copy_link_url": "Kopiera länkadress",
+        "save_image_as": "Spara bild som…",
+        "save_image_as_error_description": "Bilden sparades inte",
+        "save_image_as_error_title": "Misslyckades med att spara bilden"
+    },
+    "view_menu": {
+        "actual_size": "Verklig storlek",
+        "toggle_developer_tools": "Växla utvecklarverktyg",
+        "toggle_full_screen": "Växla helskärm",
+        "view": "Visa"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Lägg alla överst",
+        "label": "Fönster",
+        "zoom": "Zooma"
+    }
 }

src/i18n/strings/ta.json

@@ -1,46 +0,0 @@
-{
-    "Zoom": "பெரிதாக்குதல்",
-    "Minimize": "சிறிதாக்கு",
-    "Toggle Developer Tools": "உருவாக்குநர் கருவிகளை நிலைமாற்று",
-    "Toggle Full Screen": "முழு திரையை நிலைமாற்று",
-    "Paste and Match Style": "ஒட்டு மற்றும் நடையை பொருத்து",
-    "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": "அனைத்தையும் முன்னால் கொண்டுவா",
-    "Stop Speaking": "பேசுவதை நிறுத்து",
-    "Start Speaking": "பேசத் துவங்கு",
-    "Speech": "பேச்சு",
-    "Unhide": "மறைநீக்கு",
-    "Hide Others": "மற்றவற்றை மறை",
-    "Hide": "மறை",
-    "Services": "சேவைகள்",
-    "About": "இதனைப் பற்றி",
-    "Help": "உதவி",
-    "Close": "மூடு",
-    "Window": "சாளரம்",
-    "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": "விலக்கிக்கொள்",
-    "Copy image address": "பட முகவரியை நகலெடு",
-    "Close %(brand)s": "%(brand)s ஐ மூடு"
-}

src/i18n/strings/te.json

@@ -1,9 +0,0 @@
-{
-    "About": "గ్రెంచ్",
-    "Paste and Match Style": "మునుపటి వంటి అతికించండి",
-    "Paste": "పేస్ట్",
-    "Cut": "కట్",
-    "Copy": "కాపీ",
-    "Are you sure you want to quit?": "మీరు వెళ్ళిపోవాలని అనుకుంటున్నారా?",
-    "Cancel": "ఆపు"
-}

src/i18n/strings/tl.json

@@ -1,16 +0,0 @@
-{
-    "Hide": "Itago",
-    "Delete": "Alisin",
-    "Paste and Match Style": "I-paste at Tumugma ng Style",
-    "Paste": "I-paste",
-    "Copy": "I-copy",
-    "Cut": "I-cut",
-    "Redo": "Redo",
-    "Undo": "Undo",
-    "Edit": "I-edit",
-    "Quit": "Magsara",
-    "Show/Hide": "Ipakita/itago",
-    "Are you sure you want to quit?": "Sigurado ka ba na gusto mong magsara?",
-    "Close %(brand)s": "Isara ang %(brand)s",
-    "Cancel": "Kanselahin"
-}

src/i18n/strings/tr.json

@@ -1,45 +0,0 @@
-{
-    "Add to dictionary": "Sözlüğe ekle",
-    "The image failed to save": "Bu resim kaydedilemedi",
-    "Failed to save image": "Resim kaydedilemedi",
-    "Save image as...": "Resmi ... olarak farklı kaydet",
-    "Copy link address": "Bağlantılı adresi kopyala",
-    "Copy email address": "E-posta adresini kopyala",
-    "Copy image": "Resmi kopyala",
-    "File": "Dosya",
-    "Bring All to Front": "Hepsini öne getir",
-    "Zoom": "Yaklaştır",
-    "Stop Speaking": "Konuşmayı durdur",
-    "Start Speaking": "Konuşmaya başla",
-    "Speech": "Konuşma",
-    "Unhide": "Gizlemeyi bırak",
-    "Hide Others": "Diğerlerini gizle",
-    "Hide": "Gizle",
-    "Services": "Hizmetler",
-    "About": "Hakkında",
-    "Help": "Yardım",
-    "Close": "Kapat",
-    "Minimize": "Küçült",
-    "Window": "Pencere",
-    "Toggle Developer Tools": "Geliştirici araçları",
-    "Toggle Full Screen": "Tam ekran",
-    "Preferences": "Tercihler",
-    "Zoom Out": "Uzaklaştır",
-    "Zoom In": "Yaklaştır",
-    "Actual Size": "Gerçek boyut",
-    "View": "Görünüm",
-    "Select All": "Tümünü seç",
-    "Delete": "Sil",
-    "Paste and Match Style": "Biçimiyle bir yapıştır",
-    "Paste": "Yapıştır",
-    "Copy": "Kopyala",
-    "Cut": "Kes",
-    "Redo": "Yinele",
-    "Undo": "Geri al",
-    "Edit": "Düzenle",
-    "Quit": "Çık",
-    "Show/Hide": "Göster/Gizle",
-    "Are you sure you want to quit?": "Çıkmak istediğinize emin misiniz?",
-    "Cancel": "İptal",
-    "Copy image address": "Görsel adresini kopyala"
-}

src/i18n/strings/uk.json

@@ -1,47 +1,63 @@
 {
-    "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": "Про застосунок",
-    "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?": "Ви впевнені, що хочете вийти?",
-    "Close %(brand)s": "Закрити %(brand)s",
-    "Cancel": "Скасувати",
-    "%(brand)s Help": "Довідка %(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": "Про застосунок",
+        "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/ur.json

@@ -1,21 +0,0 @@
-{
-    "Paste": "پیسٹ",
-    "Redo": "دوبارہ کریں",
-    "Preferences": "ترجیحات",
-    "Hide Others": "",
-    "Show/Hide": "دکھائیں/چھپائیں",
-    "Quit": "چھوڑو",
-    "Hide": "چھپائیں",
-    "Unhide": "دکھائیں",
-    "Zoom": "زوم",
-    "Close": "بند",
-    "Window": "کھڑکی",
-    "Cut": "کٹ",
-    "Delete": "مٹاؤ",
-    "File": "فائل",
-    "Help": "مدد",
-    "Copy": "کاپی",
-    "Add to dictionary": "لغت میں شامل کریں",
-    "Copy image": "تصویر کاپی کریں",
-    "Start Speaking": "بولنا شروع کریں"
-}

src/i18n/strings/vi.json

@@ -1,47 +1,63 @@
 {
-    "Add to dictionary": "Thêm vào từ điển",
-    "The image failed to save": "Ảnh không lưu được",
-    "Failed to save image": "Không lưu được ảnh",
-    "Save image as...": "Lưu ảnh…",
-    "Copy link address": "Sao chép địa chỉ liên kết",
-    "Copy email address": "Sao chép địa chỉ email",
-    "Copy image": "Sao chép ảnh",
-    "File": "Tệp",
-    "Bring All to Front": "Đưa tất cả lên trước",
-    "Zoom": "Thu phóng",
-    "Stop Speaking": "Dừng nói",
-    "Start Speaking": "Bắt đầu nói",
-    "Speech": "Đọc màn hình",
-    "Unhide": "Bỏ ẩn",
-    "Hide Others": "Ẩn cái khác",
-    "Hide": "Ẩn",
-    "Services": "Dịch vụ",
-    "About": "Giới thiệu",
-    "Help": "Hỗ trợ",
-    "Close": "Đóng",
-    "Minimize": "Thu nhỏ",
-    "Window": "Cửa sổ",
-    "Toggle Developer Tools": "Công cụ phát triển",
-    "Toggle Full Screen": "Toàn màn hình",
-    "Preferences": "Tùy chọn",
-    "Zoom Out": "Thu nhỏ",
-    "Zoom In": "Phóng to",
-    "Actual Size": "Kích thước thực",
-    "View": "Xem",
-    "Select All": "Chọn tất cả",
-    "Delete": "Xóa",
-    "Paste and Match Style": "Dán và khớp kiểu",
-    "Paste": "Dán",
-    "Copy": "Sao chép",
-    "Cut": "Cắt",
-    "Redo": "Làm lại",
-    "Undo": "Hoàn tác",
-    "Edit": "Chỉnh sửa",
-    "Quit": "Thoát",
-    "Show/Hide": "Hiện/Ẩn",
-    "Are you sure you want to quit?": "Bạn có chắc chắn muốn thoát?",
-    "Cancel": "Hủy bỏ",
-    "Copy image address": "Sao chép địa chỉ ảnh",
-    "Close %(brand)s": "Đóng %(brand)s",
-    "%(brand)s Help": "Hỗ trợ %(brand)s"
+    "action": {
+        "cancel": "Hủy bỏ",
+        "close": "Đóng",
+        "close_brand": "Đóng %(brand)s",
+        "copy": "Sao chép",
+        "cut": "Cắt",
+        "delete": "Xóa",
+        "edit": "Chỉnh sửa",
+        "minimise": "Thu nhỏ",
+        "paste": "Dán",
+        "paste_match_style": "Dán và khớp kiểu",
+        "quit": "Thoát",
+        "redo": "Làm lại",
+        "select_all": "Chọn tất cả",
+        "show_hide": "Hiện/Ẩn",
+        "undo": "Hoàn tác",
+        "zoom_in": "Phóng to",
+        "zoom_out": "Thu nhỏ"
+    },
+    "common": {
+        "about": "Giới thiệu",
+        "brand_help": "Hỗ trợ %(brand)s",
+        "help": "Hỗ trợ",
+        "preferences": "Tùy chọn"
+    },
+    "confirm_quit": "Bạn có chắc chắn muốn thoát?",
+    "edit_menu": {
+        "speech": "Đọc màn hình",
+        "speech_start_speaking": "Bắt đầu nói",
+        "speech_stop_speaking": "Dừng nói"
+    },
+    "file_menu": {
+        "label": "Tệp"
+    },
+    "menu": {
+        "hide": "Ẩn",
+        "hide_others": "Ẩn cái khác",
+        "services": "Dịch vụ",
+        "unhide": "Bỏ ẩn"
+    },
+    "right_click_menu": {
+        "add_to_dictionary": "Thêm vào từ điển",
+        "copy_email": "Sao chép địa chỉ email",
+        "copy_image": "Sao chép ảnh",
+        "copy_image_url": "Sao chép địa chỉ ảnh",
+        "copy_link_url": "Sao chép địa chỉ liên kết",
+        "save_image_as": "Lưu ảnh…",
+        "save_image_as_error_description": "Ảnh không lưu được",
+        "save_image_as_error_title": "Không lưu được ảnh"
+    },
+    "view_menu": {
+        "actual_size": "Kích thước thực",
+        "toggle_developer_tools": "Công cụ phát triển",
+        "toggle_full_screen": "Toàn màn hình",
+        "view": "Xem"
+    },
+    "window_menu": {
+        "bring_all_to_front": "Đưa tất cả lên trước",
+        "label": "Cửa sổ",
+        "zoom": "Thu phóng"
+    }
 }

src/i18n/strings/zh_Hans.json

@@ -1,47 +1,63 @@
 {
-    "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": "关于",
-    "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": "取消",
-    "Copy image address": "复制图片地址",
-    "Close %(brand)s": "关闭 %(brand)s",
-    "%(brand)s Help": "%(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": "关于",
+        "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/zh_Hant.json

@@ -1,47 +1,63 @@
 {
-    "Bring All to Front": "全部移至最前",
-    "Add to dictionary": "新增到字典",
-    "The image failed to save": "儲存圖片失敗",
-    "Failed to save image": "儲存圖片失敗",
-    "Save image as...": "另存圖片為...",
-    "Copy link address": "複製連結",
-    "Copy email address": "複製電子郵件地址",
-    "Copy image": "複製圖片",
-    "File": "檔案",
-    "Zoom": "縮放",
-    "Stop Speaking": "停止說話",
-    "Start Speaking": "開始說話",
-    "Speech": "語音",
-    "Unhide": "取消隱藏",
-    "Hide Others": "隱藏其他",
-    "Hide": "隱藏",
-    "Services": "服務",
-    "About": "關於",
-    "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": "取消",
-    "Copy image address": "複製圖片地址",
-    "Close %(brand)s": "關閉 %(brand)s",
-    "%(brand)s Help": "%(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": "關於",
+        "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/language-helper.ts

@@ -15,23 +15,27 @@ limitations under the License.
 */
 
 import counterpart from "counterpart";
+import { TranslationKey as TKey } from "matrix-web-i18n";
 
 import type Store from "electron-store";
+import type EN from "./i18n/strings/en_EN.json";
 
 const FALLBACK_LOCALE = "en";
 
-export function _td(text: string): string {
+type TranslationKey = TKey<typeof EN>;
+
+export function _td(text: TranslationKey): TranslationKey {
     return text;
 }
 
 type SubstitutionValue = number | string;
 
-interface IVariables {
+interface Variables {
     [key: string]: SubstitutionValue | undefined;
     count?: number;
 }
 
-export function _t(text: string, variables: IVariables = {}): string {
+export function _t(text: TranslationKey, variables: Variables = {}): string {
     const { count } = variables;
 
     // Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191

src/macos-titlebar.ts

@@ -25,7 +25,17 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
         cssKey = await window.webContents.insertCSS(`
             /* Create margin of space for the traffic light buttons */
             .mx_UserMenu {
-                margin-top: 32px !important;
+                /* We zero the margin and use padding as we want to use it as a drag handle */ 
+                margin-top: 0 !important;
+                margin-left: 0 !important;
+                padding-top: 32px !important;
+                padding-left: 20px !important;
+                -webkit-app-region: drag;
+                -webkit-user-select: none;
+            }
+            /* Exclude the button from being a drag handle and not working */
+            .mx_UserMenu > * {
+                -webkit-app-region: no-drag;            
             }
             /* Maintain alignment of the toggle space panel button */
             .mx_SpacePanel_toggleCollapse {
@@ -55,15 +65,6 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             .mx_AuthPage .mx_AuthFooter > * {
                 -webkit-app-region: no-drag;
             }
-            
-            /* Mark the header as a drag handle */
-            .mx_LeftPanel .mx_LeftPanel_filterContainer {
-                -webkit-app-region: drag;
-            }
-            /* Exclude header interactive elements from being drag handles */
-            .mx_LeftPanel .mx_LeftPanel_filterContainer .mx_AccessibleButton {
-                -webkit-app-region: no-drag;
-            }
         
             /* Mark the home page background as a drag handle */
             .mx_HomePage {
@@ -76,23 +77,10 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             }
             
             /* Mark the header as a drag handle */
-            .mx_LegacyRoomHeader,
-            .mx_RoomHeader {
-                -webkit-app-region: drag;
-                -webkit-user-select: none;
-            }
             .mx_ImageView_panel {
                 -webkit-app-region: drag;
             }
             /* Exclude header interactive elements from being drag handles */
-            .mx_RoomHeader .mx_BaseAvatar,
-            .mx_RoomHeader_heading,
-            .mx_RoomHeader button,
-            .mx_RoomHeader .mx_FacePile,
-            .mx_LegacyRoomHeader .mx_LegacyRoomHeader_avatar,
-            .mx_LegacyRoomHeader .mx_E2EIcon,
-            .mx_LegacyRoomHeader .mx_RoomTopic,
-            .mx_LegacyRoomHeader .mx_AccessibleButton,
             .mx_ImageView_panel > .mx_ImageView_info_wrapper,
             .mx_ImageView_panel > .mx_ImageView_title,
             .mx_ImageView_panel > .mx_ImageView_toolbar > * {
@@ -100,7 +88,8 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             }
             
             /* Mark the background as a drag handle only if no modal is open */
-            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_RoomView_wrapper {
+            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_RoomView_wrapper,
+            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_HomePage {
                 -webkit-app-region: drag;
             }
             /* Exclude content elements from being drag handles */
@@ -109,9 +98,53 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             .mx_RoomView_body,
             .mx_AutoHideScrollbar,
             .mx_RightPanel_ResizeWrapper,
-            .mx_RoomPreviewCard {
+            .mx_RoomPreviewCard,
+            .mx_LeftPanel,
+            .mx_RoomView,
+            .mx_SpaceRoomView,
+            .mx_AccessibleButton {
                 -webkit-app-region: no-drag;
             }
+            /* Exclude context menus and their backgrounds */
+            .mx_ContextualMenu, .mx_ContextualMenu_background {
+                -webkit-app-region: no-drag;
+            }
+            /* Exclude iframes, such as recaptcha */
+            iframe {
+                -webkit-app-region: no-drag;
+            }
+
+            /* Add a bar above room header + left panel */
+            
+            .mx_LeftPanel {
+                flex-direction: column;
+            }
+
+            .mx_LeftPanel::before {
+                content: "";
+                height: 20px;
+                -webkit-app-region: drag;
+            }
+
+            .mx_RoomView::before,
+            .mx_SpaceRoomView::before {
+                content: "";
+                -webkit-app-region: drag;
+            }
+            
+            .mx_SpaceRoomView::before {
+                display: block;
+                height: 24px;            
+            }
+
+            .mx_RoomView[data-room-header="new"]::before {
+                height: 13px;
+            }
+
+            .mx_RoomView[data-room-header="legacy"]::before {
+                height: 27px;
+            }
+
         `);
     }
 

src/tray.ts

@@ -121,12 +121,12 @@ export function initApplicationMenu(): void {
 
     const contextMenu = Menu.buildFromTemplate([
         {
-            label: _t("Show/Hide"),
+            label: _t("action|show_hide"),
             click: toggleWin,
         },
         { type: "separator" },
         {
-            label: _t("Quit"),
+            label: _t("action|quit"),
             click: function (): void {
                 app.quit();
             },

src/vectormenu.ts

@@ -24,46 +24,46 @@ export function buildMenuTemplate(): Menu {
     // Menu template from http://electron.atom.io/docs/api/menu/, edited
     const template: Array<MenuItemConstructorOptions | MenuItem> = [
         {
-            label: _t("Edit"),
+            label: _t("action|edit"),
             accelerator: "e",
             submenu: [
                 {
                     role: "undo",
-                    label: _t("Undo"),
+                    label: _t("action|undo"),
                 },
                 {
                     role: "redo",
-                    label: _t("Redo"),
+                    label: _t("action|redo"),
                 },
                 { type: "separator" },
                 {
                     role: "cut",
-                    label: _t("Cut"),
+                    label: _t("action|cut"),
                 },
                 {
                     role: "copy",
-                    label: _t("Copy"),
+                    label: _t("action|copy"),
                 },
                 {
                     role: "paste",
-                    label: _t("Paste"),
+                    label: _t("action|paste"),
                 },
                 {
                     role: "pasteAndMatchStyle",
-                    label: _t("Paste and Match Style"),
+                    label: _t("action|paste_match_style"),
                 },
                 {
                     role: "delete",
-                    label: _t("Delete"),
+                    label: _t("action|delete"),
                 },
                 {
                     role: "selectAll",
-                    label: _t("Select All"),
+                    label: _t("action|select_all"),
                 },
             ],
         },
         {
-            label: _t("View"),
+            label: _t("view_menu|view"),
             accelerator: "V",
             submenu: [
                 { type: "separator" },
@@ -84,22 +84,22 @@ export function buildMenuTemplate(): Menu {
                 },
                 {
                     role: "resetZoom",
-                    label: _t("Actual Size"),
+                    label: _t("view_menu|actual_size"),
                 },
                 {
                     role: "zoomIn",
-                    label: _t("Zoom In"),
+                    label: _t("action|zoom_in"),
                 },
                 {
                     role: "zoomOut",
-                    label: _t("Zoom Out"),
+                    label: _t("action|zoom_out"),
                 },
                 { type: "separator" },
                 // in macOS the Preferences menu item goes in the first menu
                 ...(!isMac
                     ? [
                           {
-                              label: _t("Preferences"),
+                              label: _t("common|preferences"),
                               click(): void {
                                   global.mainWindow?.webContents.send("preferences");
                               },
@@ -108,37 +108,37 @@ export function buildMenuTemplate(): Menu {
                     : []),
                 {
                     role: "togglefullscreen",
-                    label: _t("Toggle Full Screen"),
+                    label: _t("view_menu|toggle_full_screen"),
                 },
                 {
                     role: "toggleDevTools",
-                    label: _t("Toggle Developer Tools"),
+                    label: _t("view_menu|toggle_developer_tools"),
                 },
             ],
         },
         {
-            label: _t("Window"),
+            label: _t("window_menu|label"),
             accelerator: "w",
             role: "window",
             submenu: [
                 {
                     role: "minimize",
-                    label: _t("Minimize"),
+                    label: _t("action|minimise"),
                 },
                 {
                     role: "close",
-                    label: _t("Close"),
+                    label: _t("action|close"),
                 },
             ],
         },
         {
-            label: _t("Help"),
+            label: _t("common|help"),
             accelerator: "h",
             role: "help",
             submenu: [
                 {
                     // XXX: vectorConfig won't have defaults applied to it so we need to duplicate them here
-                    label: _t("%(brand)s Help", { brand: global.vectorConfig?.brand || "Element" }),
+                    label: _t("common|brand_help", { brand: global.vectorConfig?.brand || "Element" }),
                     click(): void {
                         shell.openExternal(global.vectorConfig?.help_url || "https://element.io/help");
                     },
@@ -156,11 +156,11 @@ export function buildMenuTemplate(): Menu {
             submenu: [
                 {
                     role: "about",
-                    label: _t("About") + " " + app.name,
+                    label: _t("common|about") + " " + app.name,
                 },
                 { type: "separator" },
                 {
-                    label: _t("Preferences") + "…",
+                    label: _t("common|preferences") + "…",
                     accelerator: "Command+,", // Mac-only accelerator
                     click(): void {
                         global.mainWindow?.webContents.send("preferences");
@@ -169,26 +169,26 @@ export function buildMenuTemplate(): Menu {
                 { type: "separator" },
                 {
                     role: "services",
-                    label: _t("Services"),
+                    label: _t("menu|services"),
                     submenu: [],
                 },
                 { type: "separator" },
                 {
                     role: "hide",
-                    label: _t("Hide"),
+                    label: _t("menu|hide"),
                 },
                 {
                     role: "hideOthers",
-                    label: _t("Hide Others"),
+                    label: _t("menu|hide_others"),
                 },
                 {
                     role: "unhide",
-                    label: _t("Unhide"),
+                    label: _t("menu|unhide"),
                 },
                 { type: "separator" },
                 {
                     role: "quit",
-                    label: _t("Quit"),
+                    label: _t("action|quit"),
                 },
             ],
         });
@@ -197,15 +197,15 @@ export function buildMenuTemplate(): Menu {
         (template[1].submenu as MenuItemConstructorOptions[]).push(
             { type: "separator" },
             {
-                label: _t("Speech"),
+                label: _t("edit_menu|speech"),
                 submenu: [
                     {
                         role: "startSpeaking",
-                        label: _t("Start Speaking"),
+                        label: _t("edit_menu|speech_start_speaking"),
                     },
                     {
                         role: "stopSpeaking",
-                        label: _t("Stop Speaking"),
+                        label: _t("edit_menu|speech_stop_speaking"),
                     },
                 ],
             },
@@ -215,30 +215,30 @@ export function buildMenuTemplate(): Menu {
         // This also has specific functionality on macOS
         template[3].submenu = [
             {
-                label: _t("Close"),
+                label: _t("action|close"),
                 accelerator: "CmdOrCtrl+W",
                 role: "close",
             },
             {
-                label: _t("Minimize"),
+                label: _t("action|minimise"),
                 accelerator: "CmdOrCtrl+M",
                 role: "minimize",
             },
             {
-                label: _t("Zoom"),
+                label: _t("window_menu|zoom"),
                 role: "zoom",
             },
             {
                 type: "separator",
             },
             {
-                label: _t("Bring All to Front"),
+                label: _t("window_menu|bring_all_to_front"),
                 role: "front",
             },
         ];
     } else {
         template.unshift({
-            label: _t("File"),
+            label: _t("file_menu|label"),
             accelerator: "f",
             submenu: [
                 // For some reason, 'about' does not seem to work on windows.
@@ -248,7 +248,7 @@ export function buildMenuTemplate(): Menu {
                 },*/
                 {
                     role: "quit",
-                    label: _t("Quit"),
+                    label: _t("action|quit"),
                 },
             ],
         });

src/webcontents-handler.ts

@@ -85,8 +85,9 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
     if (url.startsWith("vector://vector/webapp")) {
         // Avoid showing a context menu for app icons
         if (params.hasImageContents) return;
-        // Rewrite URL so that it can be used outside of the app
-        url = "https://app.element.io/" + url.substring(23);
+        const baseUrl = vectorConfig.web_base_url ?? "https://app.element.io/";
+        // Rewrite URL so that it can be used outside the app
+        url = baseUrl + url.substring(23);
     }
 
     const popupMenu = new Menu();
@@ -105,7 +106,7 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
     if (params.hasImageContents) {
         popupMenu.append(
             new MenuItem({
-                label: _t("Copy image"),
+                label: _t("right_click_menu|copy_image"),
                 accelerator: "c",
                 click(): void {
                     webContents.copyImageAt(params.x, params.y);
@@ -120,7 +121,7 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
         if (url.startsWith(MAILTO_PREFIX)) {
             popupMenu.append(
                 new MenuItem({
-                    label: _t("Copy email address"),
+                    label: _t("right_click_menu|copy_email"),
                     accelerator: "a",
                     click(): void {
                         clipboard.writeText(url.substr(MAILTO_PREFIX.length));
@@ -130,7 +131,9 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
         } else {
             popupMenu.append(
                 new MenuItem({
-                    label: params.hasImageContents ? _t("Copy image address") : _t("Copy link address"),
+                    label: params.hasImageContents
+                        ? _t("right_click_menu|copy_image_url")
+                        : _t("right_click_menu|copy_link_url"),
                     accelerator: "a",
                     click(): void {
                         clipboard.writeText(url);
@@ -145,7 +148,7 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
     if (params.hasImageContents && !url.startsWith("blob:")) {
         popupMenu.append(
             new MenuItem({
-                label: _t("Save image as..."),
+                label: _t("right_click_menu|save_image_as"),
                 accelerator: "s",
                 async click(): Promise<void> {
                     const targetFileName = params.suggestedFilename || params.altText || "image.png";
@@ -168,8 +171,8 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
                         console.error(err);
                         dialog.showMessageBox({
                             type: "error",
-                            title: _t("Failed to save image"),
-                            message: _t("The image failed to save"),
+                            title: _t("right_click_menu|save_image_as_error_title"),
+                            message: _t("right_click_menu|save_image_as_error_description"),
                         });
                     }
                 },
@@ -199,7 +202,7 @@ function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemCons
                 type: "separator",
             },
             {
-                label: _t("Add to dictionary"),
+                label: _t("right_click_menu|add_to_dictionary"),
                 click: (menuItem, browserWindow) => {
                     browserWindow?.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord);
                 },
@@ -213,19 +216,19 @@ function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemCons
     options.push(
         {
             role: "cut",
-            label: _t("Cut"),
+            label: _t("action|cut"),
             accelerator: "t",
             enabled: params.editFlags.canCut,
         },
         {
             role: "copy",
-            label: _t("Copy"),
+            label: _t("action|copy"),
             accelerator: "c",
             enabled: params.editFlags.canCopy,
         },
         {
             role: "paste",
-            label: _t("Paste"),
+            label: _t("action|paste"),
             accelerator: "p",
             enabled: params.editFlags.canPaste,
         },
@@ -235,7 +238,7 @@ function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemCons
         },
         {
             role: "selectAll",
-            label: _t("Select All"),
+            label: _t("action|select_all"),
             accelerator: "a",
             enabled: params.editFlags.canSelectAll,
         },