feat: Limit the amount of displayed moving tabs we show, b=no-bug, c=common, tabs

* fix: Fixed duplicate Ids for split views and wrong activations, b=no-bug, c=split-view

* fix: Fixed creating a new split view ID on restore, b=no-bug, c=split-view, tabs, workspaces

* chore: Simplify split view group extraction, b=no-bug, c=split-view

* feat: Make sure to return the group, even when not activating, b=no-bug, c=split-view

* feat: Assume tabs could be null, b=no-bug, c=split-view

.formal-git/components

@@ -15,7 +15,7 @@ fonts
 welcome
 scripts
 workflows
-winsign
+windows
 flatpak
 configs
 l10n

.github/advanced-issue-labeler.yml

@@ -3,56 +3,56 @@ policy:
       - id: [component]
         label:
           # Make sure it's in sync with the dropdown in the issue template
-          - name: 'component: sync'
-            keys: ['Sync']
-          - name: 'component: compact-mode'
-            keys: ['Compact Mode']
-          - name: 'component: workspaces'
-            keys: ['Workspaces']
-          - name: 'component: mods-themes'
-            keys: ['Mods / Themes']
-          - name: 'component: bookmarks'
-            keys: ['Bookmarks']
-          - name: 'component: glance'
-            keys: ['Glance']
-          - name: 'component: url-bar'
-            keys: ['URL Bar']
-          - name: 'component: tabs'
-            keys: ['Tabs']
-          - name: 'component: settings'
-            keys: ['Settings']
-          - name: 'component: privacy'
-            keys: ['Privacy']
-          - name: 'component: split-view'
-            keys: ['Split View']
-          - name: 'component: performance'
-            keys: ['Performance']
-          - name: 'component: media-controller'
-            keys: ['Media Controler']
-          - name: 'component: tab-unloading'
-            keys: ['Tab unloading']
-          - name: 'component: tab-folders'
-            keys: ['Tab Folders']
-          - name: 'component: keyboard-shortcuts'
-            keys: ['Keyboard Shortcuts']
-          - name: 'component: security'
-            keys: ['Security']
-          - name: 'component: extensions'
-            keys: ['Extensions']
-          - name: 'component: customizable-ui-toolbars'
-            keys: ['Customizable UI / Toolbars']
-          - name: 'component: localization'
-            keys: ['Localization']
-          - name: 'component: other'
-            keys: ['Other']
+          - name: "component: sync"
+            keys: ["Sync"]
+          - name: "component: compact-mode"
+            keys: ["Compact Mode"]
+          - name: "component: workspaces"
+            keys: ["Workspaces"]
+          - name: "component: mods-themes"
+            keys: ["Mods / Themes"]
+          - name: "component: bookmarks"
+            keys: ["Bookmarks"]
+          - name: "component: glance"
+            keys: ["Glance"]
+          - name: "component: url-bar"
+            keys: ["URL Bar"]
+          - name: "component: tabs"
+            keys: ["Tabs"]
+          - name: "component: settings"
+            keys: ["Settings"]
+          - name: "component: privacy"
+            keys: ["Privacy"]
+          - name: "component: split-view"
+            keys: ["Split View"]
+          - name: "component: performance"
+            keys: ["Performance"]
+          - name: "component: media-controller"
+            keys: ["Media Controler"]
+          - name: "component: tab-unloading"
+            keys: ["Tab unloading"]
+          - name: "component: tab-folders"
+            keys: ["Tab Folders"]
+          - name: "component: keyboard-shortcuts"
+            keys: ["Keyboard Shortcuts"]
+          - name: "component: security"
+            keys: ["Security"]
+          - name: "component: extensions"
+            keys: ["Extensions"]
+          - name: "component: customizable-ui-toolbars"
+            keys: ["Customizable UI / Toolbars"]
+          - name: "component: localization"
+            keys: ["Localization"]
+          - name: "component: other"
+            keys: ["Other"]
 
       - id: [platform]
-        block-list: ['Other']
+        block-list: ["Other"]
         label:
           # Make sure it's in sync with the dropdown in the issue template
-          - name: 'platform: linux'
-            keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
-          - name: 'platform: macOS'
-            keys: ['macOS - aarch64', 'macOS - Intel']
-          - name: 'platform: windows'
-            keys: ['Windows - x64', 'Windows - aarch64']
+          - name: "platform: linux"
+            keys: ["Linux (AppImage)", "Linux (Flatpak)", "Linux (Tarball)"]
+          - name: "platform: macOS"
+            keys: ["macOS - aarch64", "macOS - Intel"]
+          - name: "platform: windows"
+            keys: ["Windows - x64", "Windows - aarch64"]

.github/workflows/build.yml

@@ -4,49 +4,49 @@ on:
   workflow_dispatch:
     inputs:
       create_release:
-        description: 'Create a new release for this build'
+        description: "Create a new release for this build"
         required: false
         default: false
-        type: 'boolean'
+        type: "boolean"
       update_version:
-        description: 'Update the version number'
+        description: "Update the version number"
         required: false
         default: false
-        type: 'boolean'
+        type: "boolean"
       update_branch:
-        description: 'Update branch with new version'
+        description: "Update branch with new version"
         required: true
-        default: 'release'
-        type: 'choice'
+        default: "release"
+        type: "choice"
         options:
-          - 'release'
-          - 'twilight'
+          - "release"
+          - "twilight"
       use-sccache:
-        description: 'Use sccache'
+        description: "Use sccache"
         required: true
-        type: 'boolean'
+        type: "boolean"
         default: false
   workflow_call:
     inputs:
       create_release:
-        description: 'Create a new release for this build'
+        description: "Create a new release for this build"
         required: false
         default: false
-        type: 'boolean'
+        type: "boolean"
       update_version:
-        description: 'Update the version number'
+        description: "Update the version number"
         required: false
         default: false
-        type: 'boolean'
+        type: "boolean"
       update_branch:
-        description: 'Update branch with new version'
+        description: "Update branch with new version"
         required: true
-        default: 'release'
-        type: 'string'
+        default: "release"
+        type: "string"
       use-sccache:
-        description: 'Use sccache'
+        description: "Use sccache"
         required: true
-        type: 'boolean'
+        type: "boolean"
         default: false
 
 jobs:
@@ -142,7 +142,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Install dependencies
         run: |
@@ -202,7 +202,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Install dependencies
         run: |
@@ -244,7 +244,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Setup Git
         run: |
@@ -379,7 +379,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Install dependencies
         run: |
@@ -565,8 +565,8 @@ jobs:
             ./zen.installer.exe/*
             ./zen.installer-arm64.exe/*
             ./zen.macos-universal.dmg/*
-          tag_name: 'twilight'
-          name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
+          tag_name: "twilight"
+          name: "Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})"
           draft: false
           generate_release_notes: false
           prerelease: true
@@ -584,7 +584,7 @@ jobs:
           prerelease: false
           fail_on_unmatched_files: false
           generate_release_notes: false
-          name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          name: "Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})"
           body_path: release_notes.md
           files: |
             ./zen.source.tar.zst/*
@@ -656,7 +656,7 @@ jobs:
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: '[release]: Update Flatpak manifest'
+          commit_message: "[release]: Update Flatpak manifest"
           commit_user_name: Zen Browser Robot
           commit_user_email: zen-browser-auto@users.noreply.github.com
           repository: ./flatpak

.github/workflows/check-candidate-release.yml

@@ -2,7 +2,7 @@ name: Check Firefox Candidate Release
 
 on:
   schedule:
-    - cron: '59 4 * * 2'
+    - cron: "59 4 * * 2"
   workflow_dispatch:
 
 permissions:

.github/workflows/code-linter.yml

@@ -5,9 +5,6 @@ on:
     branches:
       - dev
   workflow_call:
-  pull_request:
-    branches:
-      - dev
 
 permissions:
   contents: read
@@ -25,7 +22,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Setup and run autopep8
         if: ${{ contains(join(github.event.commits.*.modified, ' '), '.py') || contains(join(github.event.commits.*.added, ' '), '.py') || contains(join(github.event.commits.*.removed, ' '), '.py') }}
@@ -36,5 +33,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Download Firefox
+        env:
+          ZEN_DOWNLOAD_DONT_INIT_GIT: "1"
+        run: |
+          npm run download
+
       - name: Lint
         run: npm run lint

.github/workflows/issue-metrics.yml

@@ -5,7 +5,7 @@ permissions:
 on:
   workflow_dispatch:
   schedule:
-    - cron: '3 2 1 * *'
+    - cron: "3 2 1 * *"
 
 jobs:
   build:
@@ -47,7 +47,7 @@ jobs:
           GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
           HIDE_AUTHOR: true
           HIDE_TIME_TO_ANSWER: true
-          SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
+          SEARCH_QUERY: "repo:zen-browser/desktop is:issue created:${{ env.last_month }}"
 
       - name: Move metrics to docs folder
         run: |
@@ -62,6 +62,6 @@ jobs:
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: 'docs: Update monthly issue metrics, b=(no bug), c={docs}'
+          commit_message: "docs: Update monthly issue metrics, b=(no bug), c={docs}"
           commit_user_name: Zen Browser Robot
           commit_user_email: zen-browser-auto@users.noreply.github.com

.github/workflows/linux-release-build.yml

@@ -4,19 +4,19 @@ on:
   workflow_call:
     inputs:
       build-version:
-        description: 'The version to build'
+        description: "The version to build"
         required: true
         type: string
       release-branch:
-        description: 'The branch to build'
+        description: "The branch to build"
         required: true
         type: string
       MOZ_BUILD_DATE:
         type: string
         required: true
-        default: ''
+        default: ""
       use-sccache:
-        description: 'Use sccache'
+        description: "Use sccache"
         required: true
         type: boolean
         default: false
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@main

.github/workflows/macos-release-build.yml

@@ -6,19 +6,19 @@ on:
   workflow_call:
     inputs:
       build-version:
-        description: 'The version to build'
+        description: "The version to build"
         required: true
         type: string
       release-branch:
-        description: 'The branch to build'
+        description: "The branch to build"
         required: true
         type: string
       MOZ_BUILD_DATE:
         type: string
         required: true
-        default: ''
+        default: ""
       use-sccache:
-        description: 'Use sccache'
+        description: "Use sccache"
         required: true
         type: boolean
         default: false
@@ -47,7 +47,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@main
@@ -126,8 +126,9 @@ jobs:
           export SURFER_PLATFORM="darwin"
           export PATH="$(python3 -m site --user-base)/bin":$PATH
           # Always exist with 0, even if bootstrap fails
-          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
+          ./mach --no-interactive bootstrap --application-choice browser --exclude macos-sdk || true
           cd ..
+          ls /Library/Developer/CommandLineTools/SDKs/MacOSX26.2.sdk
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh

.github/workflows/macos-universal-release-build.yml

@@ -4,18 +4,18 @@ on:
   workflow_call:
     inputs:
       build-version:
-        description: 'The version to build'
+        description: "The version to build"
         required: true
         type: string
       release-branch:
-        description: 'The branch to build'
+        description: "The branch to build"
         required: true
         type: string
 
 jobs:
   mac-build:
     name: Unify macOS (Universal)
-    runs-on: 'macos-26'
+    runs-on: "macos-26"
 
     strategy:
       fail-fast: false
@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -92,6 +92,7 @@ jobs:
       - name: Populate mozconfig
         env:
           SURFER_MOZCONFIG_ONLY: true
+          ZEN_RELEASE: 1
         run: |
           npm run build
           cd engine

.github/workflows/pr-test.yml

@@ -19,13 +19,18 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Install dependencies
         run: npm ci
 
       - name: Download Firefox and dependencies
+        env:
+          ZEN_DOWNLOAD_DONT_INIT_GIT: "1"
         run: npm run download
 
       - name: Import patches
         run: npm run import
+
+      - name: Run linting
+        run: npm run lint

.github/workflows/sync-upstream.yml

@@ -4,14 +4,14 @@ on:
   workflow_dispatch:
     inputs:
       release_candidate:
-        description: 'Set to true to sync release candidates'
+        description: "Set to true to sync release candidates"
         required: false
         type: boolean
         default: false
   workflow_call:
     inputs:
       release_candidate:
-        description: 'Set to true to sync release candidates'
+        description: "Set to true to sync release candidates"
         required: false
         type: boolean
         default: false
@@ -41,12 +41,18 @@ jobs:
         uses: actions/setup-node@v4
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Install dependencies
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: npm ci
 
+      - name: Install dependencies
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
+        run: |
+          git config --global user.email "mr-cheffy@users.noreply.github.com"
+          git config --global user.name "mr-cheffy"
+
       - name: Setup surfer CI
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: |
@@ -67,6 +73,12 @@ jobs:
             npm run sync
           fi
 
+      - name: Run formatter
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
+        run: |
+          sudo apt install python3-autopep8
+          npm run pretty
+
       - name: Check if any files changed
         id: git-check
         run: |
@@ -97,7 +109,7 @@ jobs:
 
       - name: Import external tests
         if: steps.git-check.outputs.files_changed == 'true'
-        run: python3 scripts/import_external_tests.py
+        run: python3 scripts/import_external_tests.py || true
 
       - name: Create pull request
         uses: peter-evans/create-pull-request@v7
@@ -107,9 +119,9 @@ jobs:
           GIT_CURL_VERBOSE: 1
         with:
           token: ${{ secrets.DEPLOY_KEY }}
-          commit-message: 'chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`'
-          branch: 'chore/upstream-sync'
-          title: 'Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}'
+          commit-message: "chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`"
+          branch: "chore/upstream-sync"
+          title: "Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}"
           body: |
             This PR syncs the upstream Firefox to version ${{ steps.build-data.outputs.version }}.
 

.github/workflows/twilight-release-schedule.yml

@@ -2,11 +2,11 @@ name: Zen Twilight Scheduled Releases
 
 on:
   schedule:
-    - cron: '0 23 * * *'
+    - cron: "0 23 * * *"
   workflow_dispatch:
     inputs:
       create_release:
-        description: 'Whether to do a release'
+        description: "Whether to do a release"
         required: false
         type: boolean
         default: true
@@ -34,4 +34,4 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"

.github/workflows/windows-profile-build.yml

@@ -7,15 +7,15 @@ on:
   workflow_call:
     inputs:
       build-version:
-        description: 'The version to build'
+        description: "The version to build"
         required: true
         type: string
       profile-data-path-archive:
-        description: 'The path to the zip archive containing the profile data'
+        description: "The path to the zip archive containing the profile data"
         required: false
         type: string
       release-branch:
-        description: 'The branch to build'
+        description: "The branch to build"
         required: true
         type: string
 
@@ -37,7 +37,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Setup Git
         run: |

.github/workflows/windows-release-build.yml

@@ -11,22 +11,22 @@ on:
         type: boolean
         default: false
       build-version:
-        description: 'The version to build'
+        description: "The version to build"
         required: true
         type: string
       profile-data-path-archive:
-        description: 'The path to the zip archive containing the profile data'
+        description: "The path to the zip archive containing the profile data"
         type: string
       release-branch:
-        description: 'The branch to build'
+        description: "The branch to build"
         required: true
         type: string
       MOZ_BUILD_DATE:
         type: string
         required: true
-        default: ''
+        default: ""
       use-sccache:
-        description: 'Use sccache'
+        description: "Use sccache"
         required: true
         type: boolean
         default: false
@@ -62,7 +62,7 @@ jobs:
       - name: Setup Node.js
         uses: useblacksmith/setup-node@v5
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@main
@@ -197,12 +197,14 @@ jobs:
           else
             rustup target add x86_64-pc-windows-msvc
           fi
+          # Stored in build/windows/.windows-rs-version
+          WINDOWS_RS_VERSION=$(cat build/windows/.windows-rs-version)
           cd engine/
           cargo install cargo-download --locked
-          cargo download -x windows=0.58.0
+          cargo download -x windows=$WINDOWS_RS_VERSION
           export CARGO_INCREMENTAL=0
           echo "" >> ../configs/common/mozconfig
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig
+          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-$WINDOWS_RS_VERSION" >> ../configs/common/mozconfig
 
       - name: Build language packs
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}

.gitignore

@@ -22,3 +22,5 @@ target/
 .vscode/
 
 locales/firefox-l10n/
+
+!src/toolkit/themes/shared/design-system/dist/

.prettierrc.json

@@ -2,11 +2,19 @@
   "bracketSameLine": true,
   "endOfLine": "lf",
   "trailingComma": "es5",
-  "singleQuote": true,
   "tabWidth": 2,
   "useTabs": false,
   "jsxSingleQuote": false,
   "semi": true,
   "printWidth": 100,
-  "plugins": ["prettier-plugin-sh"]
+  "plugins": ["prettier-plugin-sh"],
+  "overrides": [
+    {
+      "files": "*.css",
+      "options": {
+        "parser": "css",
+        "printWidth": 160
+      }
+    }
+  ]
 }

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `146.0.1`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 146.0.1`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `147.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0.1`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-b6f4d18893d4f547f01d5e8aa8a4b364b168c84f
+783b222b1b93fb9e8c52eb57558ef7f07bca6e7e

build/flatpak/app.zen_browser.zen.yml.template

@@ -1,14 +1,10 @@
 app-id: app.zen_browser.zen
 runtime: org.freedesktop.Platform
-runtime-version: '24.08'
+runtime-version: '25.08'
 sdk: org.freedesktop.Sdk
 base: org.mozilla.firefox.BaseApp
-base-version: '24.08'
+base-version: '25.08'
 add-extensions:
-  org.freedesktop.Platform.ffmpeg-full:
-    directory: lib/ffmpeg
-    version: '24.08'
-    add-ld-path: .
   app.zen_browser.zen.systemconfig:
     directory: etc/zen
     no-autodownload: true
@@ -24,6 +20,7 @@ finish-args:
   - --socket=cups
   - --persist=.zen
   - --env=DICPATH=/usr/share/hunspell
+  - --filesystem=xdg-config/gtk-3.0:ro
   - --filesystem=xdg-download:rw
   - --filesystem=/run/.heim_org.h5l.kcm-socket
   - --filesystem=xdg-run/speech-dispatcher:ro
@@ -51,7 +48,6 @@ modules:
     buildsystem: simple
     build-commands:
       - mv zen /app/
-      - mkdir -p /app/lib/ffmpeg
       - mkdir -p /app/etc/zen
 
       - install -Dm0755 metadata/launch-script.sh ${{FLATPAK_DEST}}/bin/launch-script.sh

build/ts/transform-ts.js

@@ -2,13 +2,13 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-const fs = require('fs');
-const MJS_FILES = ['src/zen/split-view/ZenViewSplitter.ts'];
+const fs = require("fs");
+const MJS_FILES = ["src/zen/split-view/ZenViewSplitter.ts"];
 
 for (const file of MJS_FILES) {
-  const code = fs.readFileSync(file, 'utf8');
-  require('@babel/core').transformSync(code, {
-    presets: ['@babel/preset-typescript'],
+  const code = fs.readFileSync(file, "utf8");
+  require("@babel/core").transformSync(code, {
+    presets: ["@babel/preset-typescript"],
     filename: file,
   });
 }

build/windows/.windows-rs-version

@@ -0,0 +1 @@
+0.62.2

configs/common/mozconfig

@@ -9,7 +9,9 @@ ac_add_options --with-app-basename=Zen
 # Localization (Must be an absolute path)
 ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
 
-export MOZ_USER_DIR="${name}"
+# See https://github.com/zen-browser/desktop/issues/11917 for future plans.
+# We should be removing this at some point and start supporting XDG dirs.
+ac_add_options --with-user-appdir=".${binName}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
@@ -47,6 +49,8 @@ if test "$ZEN_RELEASE"; then
   # ac_add_options --enable-clang-plugin
   ac_add_options --enable-bootstrap=-sccache
 
+  ac_add_options --enable-optimize
+
   ac_add_options --enable-release
   ac_add_options --disable-debug
   ac_add_options --disable-debug-symbols
@@ -56,8 +60,6 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --enable-rust-simd
   ac_add_options --enable-wasm-simd
 
-  mk_add_options MOZ_PARALLEL_COMPILE=1
-
   ac_add_options --disable-geckodriver
   ac_add_options --disable-rust-tests
 
@@ -73,24 +75,13 @@ if test "$ZEN_RELEASE"; then
     fi
   fi
 
-  ac_add_options --enable-jemalloc
-
   mk_add_options MOZILLA_OFFICIAL=1
   MOZILLA_OFFICIAL=1
   export MOZILLA_OFFICIAL=1
 
-  export OPT_LEVEL="3"
-  ac_add_options OPT_LEVEL="3"
-
-  export RUSTC_OPT_LEVEL="3"
-  ac_add_options RUSTC_OPT_LEVEL="3"
-
   mk_add_options AUTOCLOBBER=1
   export AUTOCLOBBER=1
 
-  ac_add_options --enable-updater
-
-  ac_add_options --enable-js-shell
   export MOZ_PACKAGE_JSSHELL=1
 
   ac_add_options --disable-crashreporter

configs/linux/mozconfig

@@ -17,30 +17,16 @@ if test "$ZEN_RELEASE"; then
         ac_add_options --enable-eme=widevine
 
         # Enable Profile Guided Optimization
-        if test "$ZEN_GA_DISABLE_PGO"; then
-        export ZEN_DUMMY=1
-        else
-        export MOZ_PGO=1
-        ac_add_options MOZ_PGO=1
+        if ! test "$ZEN_GA_DISABLE_PGO"; then
+            export MOZ_PGO=1
+            ac_add_options MOZ_PGO=1
         fi
-
-        # Optimization flags for SURFER_COMPAT
-        ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
-
-        export LDFLAGS="$LDFLAGS -Wl,-O3"
     elif test "$SURFER_COMPAT" = "aarch64"; then
         ac_add_options --target=aarch64-linux-gnu
 
-        ac_add_options --enable-optimize="-O3"
-
         # override LTO settings
         export MOZ_LTO=cross,thin
         ac_add_options --enable-lto=cross,thin
-
-        export CFLAGS="$CFLAGS -O3"
-        export CPPFLAGS="$CPPFLAGS -O3"
-        export CXXFLAGS="$CXXFLAGS -O3"
-        export LDFLAGS="$LDFLAGS -Wl,-O3"
     fi
 
     # Disable DMD and ELF hacks, enable linker lld

configs/macos/mozconfig

@@ -28,28 +28,31 @@ if test "$SURFER_COMPAT" = "x86_64"; then
 
   if test "$ZEN_RELEASE"; then
     ac_add_options --enable-wasm-avx
-    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
-
-    export CFLAGS="-O3 -march=nehalem"
-    export CPPFLAGS="-O3 -march=nehalem"
-    export CXXFLAGS="-O3 -march=nehalem"
-    export LDFLAGS="-Wl,-O3 -march=nehalem"
-    export RUSTFLAGS="-Ctarget-cpu=nehalem"
   fi
 else
   ac_add_options --enable-clang-plugin
   ac_add_options --target=aarch64-apple-darwin
 
   if test "$ZEN_RELEASE"; then
-    ac_add_options --enable-optimize="-O3 -mcpu=apple-m1 -march=armv8.3-a+simd"
-
     # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
     # but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
     # a bunch of # performance-enabling CPU features.
-    export CFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
-    export CPPFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
-    export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
-    export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
-    export RUSTFLAGS="-C target-feature=+v8.3a -Ctarget-cpu=apple-m1"
+    # TODO: We'll want to switch to aarch64-apple-macos eventually.
+    export CFLAGS="$CFLAGS -mcpu=apple-m1"
+    export CXXFLAGS="$CXXFLAGS -mcpu=apple-m1"
   fi
 fi
+
+if test "$ZEN_RELEASE"; then
+  ac_add_options --with-macos-sdk=/Library/Developer/CommandLineTools/SDKs/MacOSX26.2.sdk
+fi
+
+# Keep using ld64 on PGO/LTO builds because of performance regressions when using lld.
+# Mozilla sets "MOZ_LD64_KNOWN_GOOD" to true when they do automated builds with PGO/LTO on macOS.
+# See https://searchfox.org/firefox-main/rev/e61d59b5c9a651fd7bf28043f87c0dc669833496/build/moz.configure/lto-pgo.configure#261
+# export MOZ_LD64_KNOWN_GOOD=1
+# ac_add_options --enable-linker=ld64
+# 
+# if test "$ZEN_RELEASE"; then
+#   mk_add_options MOZ_MAKE_FLAGS="-j4"
+# fi

configs/windows/mozconfig

@@ -30,34 +30,19 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
 if test "$SURFER_COMPAT" = "x86_64"; then
-
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine,wmfcdm
-
-  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
-
-  export LDFLAGS="-Wl,-O3"
-  export RUSTFLAGS="-Clink-args=--icf=safe"
 elif test "$SURFER_COMPAT" = "aarch64"; then
   ac_add_options --target=aarch64-pc-windows-msvc
   ac_add_options --enable-eme=widevine
 
-  ac_add_options --enable-optimize="-O2 -mtune=cortex-a55 -march=armv8.2-a+simd"
-
   # override LTO settings
   export MOZ_LTO=cross,thin
   ac_add_options --enable-lto=cross,thin
-
-  export CFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export CPPFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export CXXFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export LDFLAGS="-Wl,-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
-  export RUSTFLAGS="-C target-feature=+v8.2a -Ctarget-cpu=cortex-a55"
 fi
 
 if test "$ZEN_CROSS_COMPILING"; then
   if test "$ZEN_GA_GENERATE_PROFILE"; then
-    export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic"
     mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
     ac_add_options --enable-profile-generate=cross
   elif test "$SURFER_COMPAT" = "x86_64"; then

eslint.config.mjs

@@ -1,27 +1,474 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import js from '@eslint/js';
-import globals from 'globals';
-import { defineConfig, globalIgnores } from 'eslint/config';
-import zenGlobals from './src/zen/zen.globals.js';
+import sdl from "@microsoft/eslint-plugin-sdl";
+import eslintConfigPrettier from "eslint-config-prettier/flat";
+import html from "eslint-plugin-html";
+import importPlugin from "eslint-plugin-import";
+import json from "@eslint/json";
+import lit from "eslint-plugin-lit";
+import mozilla from "eslint-plugin-mozilla";
+import reactHooks from "eslint-plugin-react-hooks";
+import zenGlobals from "./src/zen/zen.globals.mjs";
 
-export default defineConfig([
+import globals from "globals";
+import path from "path";
+
+import globalIgnores from "./engine/eslint-ignores.config.mjs";
+import testPathsConfig from "./engine/eslint-test-paths.config.mjs";
+import repositoryGlobals from "./engine/eslint-file-globals.config.mjs";
+import rollouts from "./engine/eslint-rollouts.config.mjs";
+import subdirConfigs from "./engine/eslint-subdirs.config.mjs";
+import { globalIgnores as globalIgnoresPath } from "eslint/config";
+
+const testPaths = testPathsConfig.testPaths;
+
+const httpTestingPaths = [
+  `**/*mixedcontent*.{${mozilla.allFileExtensions.join(",")}}`,
+  `**/*CrossOrigin*.{${mozilla.allFileExtensions.join(",")}}`,
+  `**/*crossorigin*.{${mozilla.allFileExtensions.join(",")}}`,
+  `**/*cors*.{${mozilla.allFileExtensions.join(",")}}`,
+  `**/*downgrade*.{${mozilla.allFileExtensions.join(",")}}`,
+  `**/*Downgrade*.{${mozilla.allFileExtensions.join(",")}}`,
+];
+
+globals.browser = {
+  ...globals.browser,
+  ...zenGlobals.reduce((obj, key) => {
+    obj[key] = "readonly";
+    return obj;
+  }, {}),
+};
+
+testPaths.browser = testPaths.browser.concat("src/zen/tests/");
+
+/**
+ * Takes each path in the paths array, and expands it with the list of extensions
+ * that ESLint is watching.
+ *
+ * @param {object} options
+ * @param {string[]} options.paths
+ *   The list of paths to wrap.
+ * @param {string[]} [options.excludedExtensions]
+ *   The list of extensions to be excluded from the wrapping.
+ */
+function wrapPaths({ paths, excludedExtensions }) {
+  let extensions = excludedExtensions
+    ? mozilla.allFileExtensions.filter((f) => !excludedExtensions.includes(f))
+    : mozilla.allFileExtensions;
+  return paths.map((p) => {
+    if (p.endsWith("**")) {
+      return p + `/*.{${extensions.join(",")}}`;
+    }
+    if (p.endsWith("/")) {
+      return p + `**/*.{${extensions.join(",")}}`;
+    }
+    if (p.endsWith("*")) {
+      return p + `.{${extensions.join(",")}}`;
+    }
+    return p;
+  });
+}
+
+/**
+ * Wraps the paths listed in the files section of a configuration with the
+ * file extensions that ESLint is watching.
+ *
+ * @param {object} configs
+ */
+function wrapPathsInConfig(configs) {
+  for (let config of configs) {
+    // add "engine/" to the paths in the files section.
+    config.files = wrapPaths({ paths: config.files.map((p) => "engine/" + p) });
+  }
+  return configs;
+}
+let config = [
   {
-    files: ['**/*.{js,mjs,cjs}'],
-    plugins: { js },
-    extends: ['js/recommended'],
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...zenGlobals.reduce((acc, global) => {
-          acc[global] = 'readable';
-          return acc;
-        }, {}),
+    name: "import-plugin-settings",
+    settings: {
+      "import/extensions": [".mjs"],
+      "import/resolver": {
+        [path.resolve(import.meta.dirname, "engine", "srcdir-resolver.js")]: {},
+        node: {},
       },
     },
-    ignores: ['**/vendor/**', '**/tests/**'],
   },
-  globalIgnores(['**/mochitests/**']),
-]);
+  {
+    name: "ignores",
+    ignores: [...globalIgnores, "src/zen/vendor/*"],
+  },
+  {
+    name: "all-files",
+    files: wrapPaths({ paths: ["**"] }),
+    linterOptions: {
+      // With this option on, if an inline comment disables a rule, and the
+      // rule is able to be automatically fixed, then ESLint will remove the
+      // inline comment and apply the fix. We don't want this because we have
+      // some rules that intentionally need to be turned off in specific cases,
+      // e.g. @microsoft/sdl/no-insecure-url.
+      reportUnusedDisableDirectives: "off",
+    },
+    plugins: { lit },
+    rules: {
+      "lit/quoted-expressions": ["error", "never"],
+      "lit/no-invalid-html": "error",
+      "lit/no-value-attribute": "error",
+    },
+  },
+  {
+    name: "source-type-script",
+    files: ["**/*.{js,json,html,sjs,xhtml}"],
+    languageOptions: {
+      sourceType: "script",
+    },
+  },
+  ...mozilla.configs["flat/recommended"],
+  {
+    name: "json-recommended-with-comments",
+    files: ["**/*.json"],
+    language: "json/jsonc",
+    ...json.configs.recommended,
+  },
+  {
+    name: "json-recommended-no-comments",
+    files: ["**/package.json"],
+    language: "json/json",
+    ...json.configs.recommended,
+  },
+  {
+    name: "json-empty-keys-off-for-image_builder",
+    files: ["taskcluster/docker/image_builder/policy.json"],
+    rules: {
+      "json/no-empty-keys": "off",
+    },
+  },
+  {
+    name: "eslint-plugin-html",
+    files: ["**/*.html", "**/*.xhtml"],
+    plugins: { html },
+  },
+
+  {
+    name: "define-globals-for-browser-env",
+    // Not available for sjs files.
+    files: wrapPaths({ paths: ["**"], excludedExtensions: ["sjs"] }),
+    ignores: [
+      // Also not available for various other scopes and tools.
+      "**/*.sys.mjs",
+      "**/?(*.)worker.?(m)js",
+      "**/?(*.)serviceworker.?(m)js",
+      ...wrapPaths({
+        paths: testPaths.xpcshell,
+        excludedExtensions: ["mjs", "sjs"],
+      }),
+      "tools/lint/eslint/**",
+    ],
+    languageOptions: {
+      globals: globals.browser,
+    },
+  },
+  {
+    // Generally we assume that all files, except mjs ones are in our
+    // privileged and specific environment. mjs are handled separately by
+    // the recommended configuration in eslint-plugin-mozilla.
+    name: "define-privileged-and-specific-globals-for-most-files",
+    files: wrapPaths({ paths: ["**"], excludedExtensions: ["json"] }),
+    ignores: ["browser/components/storybook/**", "tools"],
+    languageOptions: {
+      globals: {
+        ...mozilla.environments.privileged.globals,
+        ...mozilla.environments.specific.globals,
+      },
+    },
+  },
+  {
+    name: "define-globals-for-node-files",
+    files: [
+      // All .eslintrc.mjs files are in the node environment, so turn that
+      // on here.
+      "**/.eslintrc*.mjs",
+      // .js files in the top-level are generally assumed to be node.
+      "\.*.js",
+      // *.config.js files are generally assumed to be configuration files
+      // based for node.
+      "**/*.config.js",
+      // The resolver for moz-src for eslint, vscode etc.
+      "engine/srcdir-resolver.js",
+    ],
+    languageOptions: {
+      globals: { ...globals.node, ...mozilla.turnOff(globals.browser) },
+    },
+  },
+
+  {
+    name: "browser-no-more-globals",
+    files: ["browser/base/content/browser.js"],
+    rules: {
+      "mozilla/no-more-globals": "error",
+    },
+  },
+  {
+    name: "jsx-files",
+    files: ["**/*.jsx", "browser/components/storybook/.storybook/**/*.mjs"],
+    languageOptions: {
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+  },
+  {
+    name: "eslint-plugin-import-rules",
+    files: ["**/*.mjs"],
+    plugins: { import: importPlugin },
+    rules: {
+      "import/default": "error",
+      "import/export": "error",
+      "import/named": "error",
+      "import/namespace": "error",
+      "import/newline-after-import": "error",
+      "import/no-duplicates": "error",
+      "import/no-absolute-path": "error",
+      "import/no-named-default": "error",
+      "import/no-named-as-default": "error",
+      "import/no-named-as-default-member": "error",
+      "import/no-self-import": "error",
+      "import/no-unassigned-import": "error",
+      "import/no-unresolved": [
+        "error",
+        // Bug 1773473 - Ignore resolver URLs for chrome and resource as we
+        // do not yet have a resolver for them.
+        { ignore: ["chrome://", "resource://"] },
+      ],
+      "import/no-useless-path-segments": "error",
+    },
+  },
+  {
+    name: "turn-off-unassigned-import-for-stories",
+    // Turn off no-unassigned-import for files that typically test our
+    // custom elements, which are imported for the side effects (ie
+    // the custom element being registered) rather than any particular
+    // export:
+    files: ["**/*.stories.mjs"],
+    plugins: { import: importPlugin },
+    rules: {
+      "import/no-unassigned-import": "off",
+    },
+  },
+  {
+    ...mozilla.configs["flat/general-test"],
+    files: wrapPaths({ paths: ["**/test/**", "**/tests/**"] }),
+  },
+  {
+    ...mozilla.configs["flat/xpcshell-test"],
+    files: wrapPaths({
+      paths: testPaths.xpcshell,
+      excludedExtensions: ["mjs", "sjs"],
+    }),
+  },
+  {
+    name: "no-unused-vars-disable-on-headjs",
+    // If it is an xpcshell head file, we turn off global unused variable checks, as it
+    // would require searching the other test files to know if they are used or not.
+    // This would be expensive and slow, and it isn't worth it for head files.
+    // We could get developers to declare as exported, but that doesn't seem worth it.
+    files: testPaths.xpcshell.map((filePath) => `${filePath}head*.js`),
+    rules: {
+      "no-unused-vars": [
+        "error",
+        {
+          argsIgnorePattern: "^_",
+          caughtErrors: "none",
+          vars: "local",
+        },
+      ],
+    },
+  },
+  {
+    name: "no-unused-vars-for-xpcshell",
+    // This section enables errors of no-unused-vars globally for all test*.js
+    // files in xpcshell test paths.
+    // This is not done in the xpcshell-test configuration as we cannot pull
+    // in overrides from there. We should at some stage, aim to enable this
+    // for all files in xpcshell-tests.
+    files: testPaths.xpcshell.map((filePath) => `${filePath}test*.js`),
+    rules: {
+      // No declaring variables that are never used
+      "no-unused-vars": [
+        "error",
+        {
+          argsIgnorePattern: "^_",
+          caughtErrors: "none",
+          vars: "all",
+        },
+      ],
+    },
+  },
+  {
+    ...mozilla.configs["flat/browser-test"],
+    files: wrapPaths({
+      paths: testPaths.browser,
+      excludedExtensions: ["mjs", "sjs"],
+    }),
+  },
+  {
+    ...mozilla.configs["flat/mochitest-test"],
+    files: wrapPaths({
+      paths: testPaths.mochitest,
+      excludedExtensions: ["mjs"],
+    }),
+    ignores: ["security/manager/ssl/tests/mochitest/browser/**"],
+  },
+  {
+    ...mozilla.configs["flat/chrome-test"],
+    files: wrapPaths({
+      paths: testPaths.chrome,
+      excludedExtensions: ["mjs", "sjs"],
+    }),
+  },
+  {
+    name: "simpletest",
+    languageOptions: {
+      globals: {
+        ...mozilla.environments.simpletest.globals,
+      },
+    },
+    files: [
+      ...testPaths.mochitest.map((filePath) => `${filePath}/**/*.js`),
+      ...testPaths.chrome.map((filePath) => `${filePath}/**/*.js`),
+    ],
+  },
+  {
+    name: "multiple-test-kinds",
+    // Some directories have multiple kinds of tests, and some rules
+    // don't work well for HTML-based mochitests, so disable those.
+    files: testPaths.xpcshell
+      .concat(testPaths.browser)
+      .map((filePath) => [`${filePath}/**/*.html`, `${filePath}/**/*.xhtml`])
+      .flat(),
+    rules: {
+      // plain/chrome mochitests don't automatically include Assert, so
+      // autofixing `ok()` to Assert.something is bad.
+      "mozilla/no-comparison-or-assignment-inside-ok": "off",
+    },
+  },
+  {
+    name: "test-file-reuse",
+    // Some directories reuse `test_foo.js` files between mochitest-plain and
+    // unit tests, or use custom postMessage-based assertion propagation into
+    // browser tests. Ignore those too:
+    files: wrapPaths({
+      paths: [
+        // Reuses xpcshell unit test scripts in mochitest-plain HTML files.
+        "dom/indexedDB/test/**",
+        // Dispatches functions to the webpage in ways that are hard to detect.
+        "toolkit/components/antitracking/test/**",
+      ],
+    }),
+    rules: {
+      "mozilla/no-comparison-or-assignment-inside-ok": "off",
+    },
+  },
+  {
+    // Rules of Hooks broadly checks for camelCase "use" identifiers, so
+    // enable only for paths actually using React to avoid false positives.
+    name: "react-hooks",
+    files: [
+      "browser/components/aboutwelcome/**",
+      "browser/components/asrouter/**",
+      "browser/extensions/newtab/**",
+      "devtools/**",
+    ],
+    ...reactHooks.configs["recommended-latest"],
+    plugins: { "react-hooks": reactHooks },
+    rules: {
+      // react-hooks/recommended has exhaustive-deps as a warning, we prefer
+      // errors, so that raised issues get addressed one way or the other.
+      "react-hooks/exhaustive-deps": "error",
+    },
+  },
+  {
+    name: "disable-no-insecure-url-for-http-testing",
+    // Exempt files with these paths since they have to use http for full coverage
+    files: httpTestingPaths,
+    plugins: { "@microsoft/sdl": sdl },
+    rules: {
+      "@microsoft/sdl/no-insecure-url": "off",
+    },
+  },
+  {
+    name: "mozilla/valid-jsdoc",
+    files: wrapPaths({ paths: ["**"] }),
+    ...mozilla.configs["flat/valid-jsdoc"],
+  },
+  {
+    name: "rollout-no-browser-refs-in-toolkit",
+    files: ["toolkit/**"],
+    ignores: ["toolkit/**/test/**", "toolkit/**/tests/**"],
+    plugins: { mozilla },
+    rules: {
+      "mozilla/no-browser-refs-in-toolkit": "error",
+    },
+  },
+  {
+    name: "no-newtab-refs-outside-newtab",
+    files: ["**/*.mjs", "**/*.js", "**/*.sys.mjs"],
+    ignores: [
+      "tools/@types/generated/**",
+      "tools/lint/eslint/eslint-plugin-mozilla/lib/rules/no-newtab-refs-outside-newtab.mjs",
+      "tools/lint/eslint/eslint-plugin-mozilla/tests/no-newtab-refs-outside-newtab.mjs",
+    ],
+    plugins: { mozilla },
+    rules: {
+      "mozilla/no-newtab-refs-outside-newtab": "error",
+    },
+  },
+  ...wrapPathsInConfig(subdirConfigs),
+  ...wrapPathsInConfig(repositoryGlobals),
+
+  /**
+   * The items below should always be the last items in this order:
+   *
+   * - Enable eslint-config-prettier.
+   * - Enable curly.
+   * - Rollouts
+   */
+
+  // Turn off rules that conflict with Prettier.
+  { name: "eslint-config-prettier", ...eslintConfigPrettier },
+  {
+    name: "enable-curly",
+    files: wrapPaths({ paths: ["**/"] }),
+    rules: {
+      // Require braces around blocks that start a new line. This must be
+      // configured after eslint-config-prettier is included, as otherwise
+      // eslint-config-prettier disables the curly rule. Hence, we do
+      // not include it in
+      // `tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js`.
+      curly: ["error", "all"],
+    },
+  },
+  ...wrapPathsInConfig(rollouts),
+  globalIgnoresPath(["src/zen/tests/"]),
+];
+
+// The various places we get our globals from use true/false rather than
+// the strings required by ESLint, so translate those here.
+config.map((entry) => {
+  if (entry.languageOptions?.globals) {
+    let newGlobals = {};
+    for (let [key, value] of Object.entries(entry.languageOptions.globals)) {
+      if (typeof entry.languageOptions.globals[key] == "boolean") {
+        newGlobals[key] = value ? "writable" : "readonly";
+      } else {
+        newGlobals[key] = value;
+      }
+    }
+  }
+  return entry;
+});
+
+export default config;

locales/ar/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/ar/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/ar/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = استبدال الرابط المثبت بالرابط الحالي
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = ملف التعديل { -brand-short-name } الخاص بك تالف. تم إعادة تعيينه إلى السمة الافتراضية.
 zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = لون مخصص
-zen-panel-ui-gradient-generator-saved-message = حفظ معامل التدرج بنجاح!
 zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
-    .label = Spaces
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
@@ -61,6 +60,8 @@ zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/ar/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/ar/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = مساحات العمل
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = إنشاء مساحة عمل
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = تعديل فضاء العمل
     .accesskey = ه
-context-zen-change-workspace-tab = 
-    .label = تغيير علامة(ات) التبويب إلى فضاء العمل
-    .accesskey = ج
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Workspaces
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Click to add a color
 zen-workspace-creation-name = 
     .placeholder = Space Name
+zen-move-tab-to-workspace-button = 
+    .label = نقل إلى...
+    .tooltiptext = نقل جميع علامات التبويب في هذه النافذة إلى مساحة
 zen-workspaces-panel-context-reorder = 
     .label = Reorder Spaces
 zen-workspace-creation-profile = Profile
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = إغلاق جميع علامات التبويب الغير مثبتة
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/bg/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/bg/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/bg/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
 zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
-zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL!
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
-    .label = Spaces
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
@@ -61,6 +60,8 @@ zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/bg/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/bg/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Spaces
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Edit Space
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Change Tab(s) To Workspace
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Workspaces
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Click to add a color
 zen-workspace-creation-name = 
     .placeholder = Space Name
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Reorder Spaces
 zen-workspace-creation-profile = Profile
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/bs/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/bs/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/bs/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
 zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
-zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL!
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
-    .label = Spaces
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
@@ -61,6 +60,8 @@ zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/bs/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/bs/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Spaces
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Edit Space
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Change Tab(s) To Workspace
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Workspaces
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Click to add a color
 zen-workspace-creation-name = 
     .placeholder = Space Name
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Reorder Spaces
 zen-workspace-creation-profile = Profile
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/ca/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Commuta l'emmagatzematge
 zen-devtools-toggle-dom-shortcut = Commuta el DOM
 zen-devtools-toggle-accessibility-shortcut = Commuta l'accessibilitat
 zen-close-all-unpinned-tabs-shortcut = Tanca totes les pestanyes no fixades
+zen-new-unsynced-window-shortcut = Nova finestra no sincronitzada

locales/ca/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Converteix la carpeta en un espai
 zen-folders-panel-change-folder-space = 
     .label = Canvia l'espai...
-zen-folders-panel-change-icon-folder = 
-    .label = Canvia la icona
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Hiberna les pestanyes actives d'aquesta carpeta
 zen-folders-unload-folder = 

locales/ca/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Substitueix l'URL fixat per l'actual
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Canvia l'etiqueta...
+tab-context-zen-edit-icon = 
+    .label = Canvia la icona...
 zen-themes-corrupted = El vostre fitxer de modificacions { -brand-short-name } està malmès. S'ha restablert al tema per defecte.
 zen-shortcuts-corrupted = El vostre fitxer de dreceres { -brand-short-name } està malmès. S'ha restablert a les dreceres per defecte.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimitza
     .tooltip = Minimitza
 zen-panel-ui-gradient-generator-custom-color = Color personalitzat
-zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament
 zen-copy-current-url-confirmation = L'URL actual s'ha copiat.
 zen-general-cancel-label = 
     .label = Cancel·la
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = L'URL de la pestanya fixada s'ha substituït per l'URL
 zen-tabs-renamed = S'ha canviat el nom de la pestanya correctament
 zen-background-tab-opened-toast = S'ha obert una nova pestanya de fons
 zen-workspace-renamed-toast = S'ha canviat el nom de l'espai de treball correctament
-zen-library-sidebar-workspaces = 
-    .label = Espais
-zen-library-sidebar-mods = 
-    .label = Modificacions
 zen-toggle-compact-mode-button = 
     .label = Mode compacte
     .tooltiptext = Commuta el mode compacte
@@ -61,6 +60,8 @@ zen-site-data-settings = Configuració
 zen-generic-manage = Gestiona
 zen-generic-more = Més
 zen-generic-next = Següent
+zen-essentials-promo-label = Afegeix als essencials
+zen-essentials-promo-sublabel = Mantingueu les vostres pestanyes preferides a només un clic de distància
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permès
 zen-site-data-setting-block = Bloquejat
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Alguna cosa no funciona?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Reinici en mode segur
+zen-window-sync-migration-dialog-title = Mantingueu les finestres sincronitzades
+zen-window-sync-migration-dialog-message = El Zen ara sincronitza les finestres del mateix dispositiu, de manera que els canvis en una finestra es reflecteixen a les altres a l'instant.
+zen-window-sync-migration-dialog-learn-more = Més informació
+zen-window-sync-migration-dialog-accept = D'acord

locales/ca/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expandeix les pestanyes fixades
+           *[false] Col·lapsa les pestanyes fixades
+        }
+zen-menubar-appearance = 
+    .label = Aparença
+zen-menubar-appearance-description = 
+    .label = Els llocs web utilitzaran:
+zen-menubar-appearance-auto = 
+    .label = Automàtica
+zen-menubar-appearance-light = 
+    .label = Clara
+zen-menubar-appearance-dark = 
+    .label = Fosca
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/ca/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Espais de treball
+zen-panel-ui-spaces-label = 
+    .label = Espais
 zen-panel-ui-workspaces-create = 
     .label = Crea un espai
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Edita l'espai de treball
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Canvia les pestanyes a l'espai de treball
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Espais de treball
+    .value = Espais
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementari
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Feu clic per afegir un color
 zen-workspace-creation-name = 
     .placeholder = Nom de l'espai
+zen-move-tab-to-workspace-button = 
+    .label = Mou a...
+    .tooltiptext = Mou totes les pestanyes d'aquesta finestra a un espai
 zen-workspaces-panel-context-reorder = 
     .label = Reordena els espais
 zen-workspace-creation-profile = Perfil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Pestanyes tancades. Feu servir <s
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Esborra
     .tooltiptext = Tanca totes les pestanyes no fixades
+zen-panel-ui-workspaces-change-forward = 
+    .label = Espai següent
+zen-panel-ui-workspaces-change-back = 
+    .label = Espai anterior

locales/cs/browser/browser/preferences/zen-preferences.ftl

@@ -18,7 +18,7 @@ sync-engine-workspaces =
     .accesskey = W
 zen-glance-title = Glance
 zen-glance-header = Obecná nastavení pro Glance
-zen-glance-description = Prohlédněte si své odkazy rychle, bez otevírání v nové záložce
+zen-glance-description = Prohlédněte si své odkazy rychle, bez otevírání v novém panelu
 zen-glance-trigger-label = Spuštění
 zen-glance-enabled = 
     .label = Zapnout Glance
@@ -37,7 +37,7 @@ zen-look-and-feel-compact-view-enabled =
 zen-look-and-feel-compact-view-top-toolbar = 
     .label = Skrýt horní panel nástrojů i v kompaktním režimu
 zen-look-and-feel-compact-toolbar-flash-popup = 
-    .label = Stručně vytvořit vyskakovací okno panelu nástrojů při přepínání nebo otevírání nových panelů v kompaktním režimu
+    .label = Krátce zobrazit vyskakovací panel nástrojů při přepínání nebo otevírání nových panelů v kompaktním režimu
 pane-zen-tabs-title = Správa karet
 category-zen-workspaces = 
     .tooltiptext = { pane-zen-tabs-title }
@@ -45,9 +45,9 @@ pane-settings-workspaces-title = Pracoviště
 zen-tabs-unloader-enabled = 
     .label = Povolit uspání karet
 zen-tabs-close-on-back-with-no-history = 
-    .label = „Zavřít panel a přepnout na jeho nadřazený panel (nebo naposledy použitý panel), když se vracíte zpět bez historie.“
+    .label = Zavřít panel a přepnout na jeho nadřazený panel (nebo naposledy použitý panel), když se vracíte zpět bez historie
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cykly pouze v Essentials nebo pracovních kartách
+    .label = Ctrl+Tab zahrnuje Essentials v pracovních panelech
 zen-tabs-cycle-ignore-pending-tabs = 
     .label = Ignorovat čekající panely při cyklování s Ctrl+Tab
 zen-tabs-cycle-by-attribute-warning = Ctrl+Tab bude cyklovat v nedávno použitém pořadí
@@ -55,26 +55,26 @@ zen-look-and-feel-compact-toolbar-themed =
     .label = Použít tématické pozadí pro kompaktní panel karet
 zen-workspace-continue-where-left-off = 
     .label = Pokračovat tam, kde jste skončili
-pane-zen-pinned-tab-manager-title = Připnuté karty
+pane-zen-pinned-tab-manager-title = Připnuté panely
 zen-pinned-tab-manager-header = Obecné nastavení připnutých karet
 zen-pinned-tab-manager-description = Spravovat další chování připnutých karet
 zen-pinned-tab-manager-restore-pinned-tabs-to-pinned-url = 
-    .label = Při spuštění obnovit připnuté karty na jejich původní URL adresu
+    .label = Při spuštění obnovit připnuté panely na jejich původní URL adresu
 zen-pinned-tab-manager-container-specific-essentials-enabled = 
     .label = Povolit Essentials pro konkrétní kontejner
-zen-pinned-tab-manager-close-shortcut-behavior-label = Zavřít chování zástupce záložky
+zen-pinned-tab-manager-close-shortcut-behavior-label = Chování při zavírání připnutého panelu
 zen-pinned-tab-manager-reset-unload-switch-close-shortcut-option = 
-    .label = Obnovit URL adresu, uspat a přepnout na další kartu
+    .label = Obnovit URL adresu, uspat a přepnout na další panel
 zen-pinned-tab-manager-unload-switch-close-shortcut-option = 
-    .label = Uspat a přepnout na další kartu
+    .label = Uspat a přepnout na další panel
 zen-pinned-tab-manager-reset-switch-close-shortcut-option = 
-    .label = Obnovit URL adresu a přepnout na další kartu
+    .label = Obnovit URL adresu a přepnout na další panel
 zen-pinned-tab-manager-switch-close-shortcut-option = 
-    .label = Přepnout na další kartu
+    .label = Přepnout na další panel
 zen-pinned-tab-manager-reset-close-shortcut-option = 
     .label = Resetovat adresu URL
 zen-pinned-tab-manager-close-close-shortcut-option = 
-    .label = Zavřít kartu
+    .label = Zavřít panel
 pane-zen-workspaces-header = Pracoviště
 zen-settings-workspaces-header = Obecná nastavení pro pracovní prostory
 zen-settings-workspaces-description = S pacovišti můžete mít více relací najednou!
@@ -86,18 +86,18 @@ zen-key-unsaved = Neuložený zástupce! Ubezpečte jej po repsaní kliknutím n
 zen-key-conflict = Je v konfliktu s { $group } -> { $shortcut }
 pane-zen-theme-title = Nastavení motivu
 zen-vertical-tabs-title = Boční panel a rozložení karet
-zen-vertical-tabs-header = Vertikální karty
-zen-vertical-tabs-description = Spravujte vaše karty ve vertikálním rozložení
+zen-vertical-tabs-header = Vertikální panely
+zen-vertical-tabs-description = Spravujte vaše panely ve vertikálním rozložení
 zen-vertical-tabs-show-expand-button = 
     .label = Zobrazit tlačítko Rozbalit
 zen-vertical-tabs-newtab-on-tab-list = 
-    .label = Zobrazit tlačítko pro vytvoření nové karty v panelu záložek
+    .label = Zobrazit tlačítko pro vytvoření nového panelu v panelu záložek
 zen-vertical-tabs-newtab-top-button-up = 
-    .label = Přesunout tlačítko pro vytvoření nové karty nahoru
+    .label = Přesunout tlačítko pro vytvoření nového panelu nahoru
 zen-vertical-tabs-expand-tabs-by-default = Rozbalit záložky ve výchozím nastavení
 zen-vertical-tabs-dont-expand-tabs-by-default = Nerozšiřovat záložky ve výchozím nastavení
-zen-vertical-tabs-expand-tabs-on-hover = Rozbalit karty při přejetí myší (nefunguje v kompaktním režimu)
-zen-vertical-tabs-expand-tabs-header = Jak rozbalit karty
+zen-vertical-tabs-expand-tabs-on-hover = Rozbalit panely při přejetí myší (nefunguje v kompaktním režimu)
+zen-vertical-tabs-expand-tabs-header = Jak rozbalit panely
 zen-vertical-tabs-expand-tabs-description = Vyberte si jak rozbalit panely v postranním panelu
 zen-theme-marketplace-header = Zen Módy
 zen-theme-disable-all-enabled = 
@@ -185,7 +185,7 @@ zen-key-quick-restart = Rychlý restart
 zen-window-new-shortcut = Nové okno
 zen-tab-new-shortcut = Nová karta
 zen-key-redo = Znovu
-zen-restore-last-closed-tab-shortcut = Obnovit poslední zavřenou kartu
+zen-restore-last-closed-tab-shortcut = Obnovit poslední zavřený panel
 zen-location-open-shortcut = Otevřít polohu
 zen-location-open-shortcut-alt = Otevřít polohu (Alt)
 zen-key-undo-close-window = Vrátit zavřené okno
@@ -219,7 +219,7 @@ zen-addons-shortcut = Otevřít doplňky
 zen-file-open-shortcut = Otevřít soubor
 zen-save-page-shortcut = Uložit stránku
 zen-print-shortcut = Vytisknout stránku
-zen-close-shortcut-2 = Zavřít kartu
+zen-close-shortcut-2 = Zavřít panel
 zen-mute-toggle-shortcut = Přepnout ztlumení
 zen-key-delete = Odstranit klíč
 zen-key-go-back = Zpět
@@ -262,7 +262,7 @@ zen-key-wr-toggle-capture-sequence-cmd = Přepnout sekvence zachytávání WR
 zen-nav-reload-shortcut = Znovu načíst stránku
 zen-nav-reload-shortcut-skip-cache = Obnovit stránku (Přeskočit Cache)
 zen-close-shortcut = Zavřít okno
-zen-close-tab-shortcut = Zavřít kartu
+zen-close-tab-shortcut = Zavřít panel
 zen-compact-mode-shortcut-show-sidebar = Přepnout plovoucí postranní panel
 zen-compact-mode-shortcut-show-toolbar = Přepnout plovoucí panel nástrojů
 zen-compact-mode-shortcut-toggle = Přepnout kompaktní režim
@@ -286,16 +286,16 @@ zen-split-view-shortcut-vertical = Přepnout rozdělené zobrazení vertikálně
 zen-split-view-shortcut-horizontal = Přepnout horizontální zobrazení rozdělení
 zen-split-view-shortcut-unsplit = Zavřít rozdělené zobrazení
 zen-new-empty-split-view-shortcut = Nové prázdné rozdělené zobrazení
-zen-key-select-tab-1 = Vybrat první kartu
-zen-key-select-tab-2 = Vybrat druhou kartu
-zen-key-select-tab-3 = Vybrat třetí kartu
-zen-key-select-tab-4 = Vybrat čtvrtou kartu
-zen-key-select-tab-5 = Vybrat pátou kartu
-zen-key-select-tab-6 = Vybrat šestou kartu
-zen-key-select-tab-7 = Vybrat sedmou kartu
-zen-key-select-tab-8 = Vybrat osmou kartu
-zen-key-select-tab-last = Vybrat poslední kartu
-zen-key-show-all-tabs = Zobrazit všechny karty
+zen-key-select-tab-1 = Vybrat první panel
+zen-key-select-tab-2 = Vybrat druhý panel
+zen-key-select-tab-3 = Vybrat třetí panel
+zen-key-select-tab-4 = Vybrat čtvrtý panel
+zen-key-select-tab-5 = Vybrat pátý panel
+zen-key-select-tab-6 = Vybrat šestý panel
+zen-key-select-tab-7 = Vybrat sedmý panel
+zen-key-select-tab-8 = Vybrat osmý panel
+zen-key-select-tab-last = Vybrat poslední panel
+zen-key-show-all-tabs = Zobrazit všechny panely
 zen-key-goto-history = Přejít na historii
 zen-key-go-home = Návrat domů
 zen-bookmark-show-sidebar-shortcut = Zobrazit postranní panel záložek
@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Přepnout úložiště
 zen-devtools-toggle-dom-shortcut = Přepnout DOM
 zen-devtools-toggle-accessibility-shortcut = Přepnout přístupnost
 zen-close-all-unpinned-tabs-shortcut = Zavřít všechny nepřipnuté panely
+zen-new-unsynced-window-shortcut = Nové nesynchronizované okno

locales/cs/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Převést složku na prostor
 zen-folders-panel-change-folder-space = 
     .label = Změnit prostor...
-zen-folders-panel-change-icon-folder = 
-    .label = Změnit ikonu
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Uspat aktivní panely v této složce
 zen-folders-unload-folder = 

locales/cs/browser/browser/zen-general.ftl

@@ -5,7 +5,7 @@
 zen-panel-ui-current-profile-text = aktuální profil
 unified-extensions-description = Rozšíření slouží k přidání dalších funkcí do prohlížeče { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
-    .label = Resetovat připnuté karty
+    .label = Resetovat připnutý panel
     .accesskey = R
 tab-context-zen-add-essential = 
     .label = Přidat do Essentials
@@ -17,18 +17,21 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Nahradit připnutou URL adresu aktuální adresou
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Změnit název...
+tab-context-zen-edit-icon = 
+    .label = Změnit ikonu...
 zen-themes-corrupted = Váš { -brand-short-name } mods soubor je poškozen. Byl obnoven na výchozí motiv.
 zen-shortcuts-corrupted = Soubor se zkratky prohlížeče { -brand-short-name } je poškozen. Zkratky byly resetovány na výchozí nastavení.
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification =
     Nový adresní řádek je nyní zapnutý, takže už není potřeba otevírat nové karty.<br/><br/>
-    Zkuste otevřít novou kartu a podívejte se, jak funguje!
+    Zkuste otevřít nový panel a podívejte se, jak funguje!
 zen-disable = Zavřít
 pictureinpicture-minimize-btn = 
     .aria-label = Minimalizovat
     .tooltip = Minimalizovat
 zen-panel-ui-gradient-generator-custom-color = Vlastní barva
-zen-panel-ui-gradient-generator-saved-message = Gradient byl úspěšně uložen!
 zen-copy-current-url-confirmation = URL adresa byla zkopírována!
 zen-general-cancel-label = 
     .label = Zrušit
@@ -36,12 +39,8 @@ zen-general-confirm =
     .label = Potvrdit
 zen-pinned-tab-replaced = Připnutá URL adresa panelu byla nahrazena aktuální URL adresou.
 zen-tabs-renamed = Panel byl úspěšně přejmenován!
-zen-background-tab-opened-toast = Nová karta na pozadí byla otevřena!
+zen-background-tab-opened-toast = Nový panel na pozadí byl otevřen!
 zen-workspace-renamed-toast = Pracovní prostor byl úspěšně přejmenován!
-zen-library-sidebar-workspaces = 
-    .label = Prostory
-zen-library-sidebar-mods = 
-    .label = Módy
 zen-toggle-compact-mode-button = 
     .label = Kompaktní režim
     .tooltiptext = Přepnout kompaktní režim
@@ -61,6 +60,8 @@ zen-site-data-settings = Nastavení
 zen-generic-manage = Spravovat
 zen-generic-more = Více
 zen-generic-next = Další
+zen-essentials-promo-label = Přídat do Essentials
+zen-essentials-promo-sublabel = Mějte oblíbené panely na dosah jedním kliknutím
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Povoleno
 zen-site-data-setting-block = Blokováno
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Něco se rozbilo?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restartovat v Nouzovém Režimu
+zen-window-sync-migration-dialog-title = Mějte svá okna synchronizovaná
+zen-window-sync-migration-dialog-message = Zen nyní synchronizuje okna na stejném zařízení. Změny provedené v jednom okně se okamžitě projeví v ostatních.
+zen-window-sync-migration-dialog-learn-more = Zjistit více
+zen-window-sync-migration-dialog-accept = Rozumím

locales/cs/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Vzhled
+zen-menubar-appearance-description = 
+    .label = Webové stránky budou používat:
+zen-menubar-appearance-auto = 
+    .label = Automatický
+zen-menubar-appearance-light = 
+    .label = Světlý
+zen-menubar-appearance-dark = 
+    .label = Tmavý
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/cs/browser/browser/zen-vertical-tabs.ftl

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-toolbar-context-tabs-right = 
-    .label = Karty napravo
+    .label = Panely napravo
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompaktní režim
@@ -27,15 +27,15 @@ sidebar-zen-create-new =
 tabbrowser-unload-tab-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Uspat a přepnout na kartu
-            [few] Uspat { $tabCount } karty a přepnout na první
-           *[other] Uspat { $tabCount } karet a přepnout na první
+            [one] Uspat a přepnout na panel
+            [few] Uspat { $tabCount } panely a přepnout na první
+           *[other] Uspat { $tabCount } panelů a přepnout na první
         }
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
             [one] Resetovat a připnout kartu
-            [few] Resetovat a připnout { $tabCount } karty
-           *[other] Resetovat a připnout { $tabCount } karet
+            [few] Resetovat a připnout { $tabCount } panely
+           *[other] Resetovat a připnout { $tabCount } panelů
         }
 tab-reset-pin-label = Zpět na původní adresu

locales/cs/browser/browser/zen-welcome.ftl

@@ -10,9 +10,9 @@ zen-welcome-import-description-2 = Snadno je přeneste z jiného prohlížeče a
 zen-welcome-import-button = Importovat nyní
 zen-welcome-set-default-browser = Nastavit { -brand-short-name } jako výchozí prohlížeč
 zen-welcome-dont-set-default-browser = NENASTAVOVAT { -brand-short-name } jako výchozí prohlížeč
-zen-welcome-initial-essentials-title = Vaše klíčové karty vždy na dosah
-zen-welcome-initial-essentials-description-1 = Mějte své nejdůležitější karty snadno dostupné a vždy po ruce, bez ohledu na to, kolik jich otevřete.
-zen-welcome-initial-essentials-description-2 = Essential karty jsou vždy viditelné, bez ohledu na to, ve kterém pracovním prostoru se nacházíte.
+zen-welcome-initial-essentials-title = Vaše klíčové panely vždy na dosah
+zen-welcome-initial-essentials-description-1 = Mějte své nejdůležitější panely snadno dostupné a vždy po ruce, bez ohledu na to, kolik jich otevřete.
+zen-welcome-initial-essentials-description-2 = Essential panely jsou vždy viditelné, bez ohledu na to, ve kterém pracovním prostoru se nacházíte.
 zen-welcome-workspace-colors-title = Vaše pracovní prostory, vaše barvy
 zen-welcome-workspace-colors-description = Přizpůsobte si prohlížeč a dejte každému pracovnímu prostoru jeho vlastní barvu.
 zen-welcome-start-browsing-title =

locales/cs/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Prostory
+zen-panel-ui-spaces-label = 
+    .label = Prostory
 zen-panel-ui-workspaces-create = 
     .label = Vytvořit prostor
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Upravit prostor
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Přesunout panel(y) do prostoru
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Pracovní prostory
+    .value = Prostory
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Protilehlé
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Kliknutím přidáte barvu
 zen-workspace-creation-name = 
     .placeholder = Název prostoru
+zen-move-tab-to-workspace-button = 
+    .label = Přesunout do...
+    .tooltiptext = Přesunout všechny panely v tomto okně do pracovního prostoru
 zen-workspaces-panel-context-reorder = 
     .label = Změnit pořadí prostorů
 zen-workspace-creation-profile = Profil
@@ -59,7 +61,11 @@ zen-workspaces-delete-workspace-title = Odstranit prostor?
 zen-workspaces-delete-workspace-body = Opravdu chcete smazat { $name }? Tuto akci nelze vrátit zpět.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Karty byly zavřeny! Použijte <span>{ $shortcut }</span> pro zrušení.
+zen-workspaces-close-all-unpinned-tabs-toast = Panely byly zavřeny! Použijte <span>{ $shortcut }</span> pro zrušení.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Vyčistit
     .tooltiptext = Zavřít všechny nepřipnuté panely
+zen-panel-ui-workspaces-change-forward = 
+    .label = Další prostor
+zen-panel-ui-workspaces-change-back = 
+    .label = Předchozí prostor

locales/cy/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toglo Storio
 zen-devtools-toggle-dom-shortcut = Toglo DOM
 zen-devtools-toggle-accessibility-shortcut = Toglo Hygyrchedd
 zen-close-all-unpinned-tabs-shortcut = Cau Pob Tab Heb ei Binio
+zen-new-unsynced-window-shortcut = Ffenestr Newydd Heb ei Chydweddu

locales/cy/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Trosi ffolder i Ofod
 zen-folders-panel-change-folder-space = 
     .label = Newid Gofod...
-zen-folders-panel-change-icon-folder = 
-    .label = Newid Eicon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Dadlwytho gweithredol yn y ffolder hon
 zen-folders-unload-folder = 

locales/cy/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Ailosod URL wedi'i Binio gyda'r Cyfredol
     .accesskey = P
+tab-context-zen-edit-title = 
+    .label = Newid Label...
+tab-context-zen-edit-icon = 
+    .label = Newid Eicon...
 zen-themes-corrupted = Mae eich ffeil addasiadau { -brand-short-name } wedi'i llygru. Maen nhw wedi cael eu hailosod i'r thema rhagosodedig.
 zen-shortcuts-corrupted = Mae eich ffeil llwybr-byr { -brand-short-name } wedi'i llygru. Maen nhw wedi cael eu hailosod i'r llwybr byr rhagosodedig.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Lleihau
     .tooltip = Lleihau
 zen-panel-ui-gradient-generator-custom-color = Lliw Cyfaddas
-zen-panel-ui-gradient-generator-saved-message = Llwyddwyd i gadw'r graddiant!
 zen-copy-current-url-confirmation = Wedi copïo'r URL cyfredol!
 zen-general-cancel-label = 
     .label = Na
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Mae URL y tab wedi'i binio wedi'i newid i'r URL gyfred
 zen-tabs-renamed = Mae'r tab wedi cael ei ailenwi'n llwyddiannus!
 zen-background-tab-opened-toast = Tab cefndir newydd wedi'i agor!
 zen-workspace-renamed-toast = Mae'r Man Gwaith wedi cael ei ailenwi'n llwyddiannus!
-zen-library-sidebar-workspaces = 
-    .label = Gofodau
-zen-library-sidebar-mods = 
-    .label = Modiau
 zen-toggle-compact-mode-button = 
     .label = Modd Cryno
     .tooltiptext = Togglo Modd Cryno
@@ -61,6 +60,8 @@ zen-site-data-settings = Gosodiadau
 zen-generic-manage = Rheoli
 zen-generic-more = Rhagor
 zen-generic-next = Nesaf
+zen-essentials-promo-label = Ychwanegu at Hanfodion
+zen-essentials-promo-sublabel = Cadwch eich hoff dabiau dim ond un clic i ffwrdd
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Caniatawyd
 zen-site-data-setting-block = Rhwystrwyd
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Rhywbeth wedi torri?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Ailgychwyn yn y Modd Diogel
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/cy/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [gwir] Ehangu Tabiau wedi'u Pinio
+           *[ffug] Lleihau Tabiau wedi'u Pinio
+        }
+zen-menubar-appearance = 
+    .label = Gwedd
+zen-menubar-appearance-description = 
+    .label = Bydd gwefannau’n defnyddio:
+zen-menubar-appearance-auto = 
+    .label = Awtomatig
+zen-menubar-appearance-light = 
+    .label = Golau
+zen-menubar-appearance-dark = 
+    .label = Tywyll
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/cy/browser/browser/zen-split-view.ftl

@@ -5,8 +5,8 @@
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
-        [1] Tab Hollt (angen sawl tab wedi'u dewis)
-        *[other] Hollti { $tabCount } Tab
+            [1] Tab Hollt (angen sawl tab wedi'u dewis)
+           *[other] Hollti { $tabCount } Tab
         }
     .accesskey = H
 zen-split-link = 

locales/cy/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Gofodau Gwaith
+zen-panel-ui-spaces-label = 
+    .label = Gofodau
 zen-panel-ui-workspaces-create = 
     .label = Creu Gofod
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Golygu Gofod
     .accesskey = G
-context-zen-change-workspace-tab = 
-    .label = Newid Tab(iau) i Ofod Gwaith
-    .accesskey = N
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Gofodau Gwaith
+    .value = Gofodau
     .accesskey = o
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Cyflenwol
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Cliciwch i ychwanegu lliw
 zen-workspace-creation-name = 
     .placeholder = Enw'r Gofod
+zen-move-tab-to-workspace-button = 
+    .label = Symud I...
+    .tooltiptext = Symud pob tab yn y ffenestr hon i Ofod
 zen-workspaces-panel-context-reorder = 
     .label = Aildrefnu Gofodau
 zen-workspace-creation-profile = Proffil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabiau wedi'u Cau! Defnyddiwch <s
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clirio
     .tooltiptext = Cau pob tab heb ei binio
+zen-panel-ui-workspaces-change-forward = 
+    .label = Gofod Nesaf
+zen-panel-ui-workspaces-change-back = 
+    .label = Gofod Blaenorol

locales/da/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Vis/skjul Lager
 zen-devtools-toggle-dom-shortcut = Vis/skjul DOM
 zen-devtools-toggle-accessibility-shortcut = Vis/skjul Tilgængelighed
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/da/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Konverter mappe til Rum
 zen-folders-panel-change-folder-space = 
     .label = Skift rum...
-zen-folders-panel-change-icon-folder = 
-    .label = Skift ikon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Stop indlæsning af aktive i denne mappe
 zen-folders-unload-folder = 

locales/da/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Erstat fastgjort URL med nuværende
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Din { -brand-short-name } mods-fil er beskadiget. De er blevet nulstillet til standardtemaet.
 zen-shortcuts-corrupted = Din { -brand-short-name }-genvejsfil er beskadiget. De er blevet nulstillet til standardgenvejene.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimer
     .tooltip = Minimer
 zen-panel-ui-gradient-generator-custom-color = Brugerdefineret Farve
-zen-panel-ui-gradient-generator-saved-message = Gradienten blev gemt!
 zen-copy-current-url-confirmation = Kopieret nuværende URL!
 zen-general-cancel-label = 
     .label = Annuller
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Den fastgjorte fane-URL blev erstattet med den aktuell
 zen-tabs-renamed = Fanen blev omdøbt!
 zen-background-tab-opened-toast = Ny baggrundsfane åbnet!
 zen-workspace-renamed-toast = Arbejdsområde blev omdøbt!
-zen-library-sidebar-workspaces = 
-    .label = Rum
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Kompakt tilstand
     .tooltiptext = Kompakt tilstand til/fra
@@ -61,6 +60,8 @@ zen-site-data-settings = Indstillinger
 zen-generic-manage = Administrer
 zen-generic-more = Mere
 zen-generic-next = Næste
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Tilladt
 zen-site-data-setting-block = Blokeret
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/da/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/da/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Arbejdsområder
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Opret rum
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Rediger arbejdsområde
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Skift fane(r) til arbejdsområde
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Arbejdsområder
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Komplementær
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Klik for at tilføje en farve
 zen-workspace-creation-name = 
     .placeholder = Rumnavn
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Omarranger rum
 zen-workspace-creation-profile = Profil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/de/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Speicher umschalten
 zen-devtools-toggle-dom-shortcut = DOM umschalten
 zen-devtools-toggle-accessibility-shortcut = Barrierefreiheit umschalten
 zen-close-all-unpinned-tabs-shortcut = Alle nicht angehefteten Tabs schließen
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/de/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = In Arbeitsbereich umwandeln
 zen-folders-panel-change-folder-space = 
     .label = Arbeitsbereich wechseln...
-zen-folders-panel-change-icon-folder = 
-    .label = Icon ändern
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Alle aktiven Tabs in diesem Ordner entladen
 zen-folders-unload-folder = 

locales/de/browser/browser/zen-general.ftl

@@ -10,13 +10,17 @@ tab-context-zen-reset-pinned-tab =
 tab-context-zen-add-essential = 
     .label = Zu Essentials hinzufügen
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } von { $max } Plätzen belegt
+tab-context-zen-add-essential-badge = { $num } / { $max } Plätzen belegt
 tab-context-zen-remove-essential = 
     .label = Aus Essentials entfernen
     .accesskey = R
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Angeheftete URL durch aktuelle ersetzen
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Titel ändern...
+tab-context-zen-edit-icon = 
+    .label = Symbol ändern...
 zen-themes-corrupted = Deine { -brand-short-name }-Mods-Datei ist beschädigt. Wir haben sie auf das Standard-Design zurückgesetzt.
 zen-shortcuts-corrupted = Deine { -brand-short-name }-Tastenkombinationsdatei ist beschädigt. Sie wurde auf die Standard-Tastenkombinationen zurückgesetzt.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimieren
     .tooltip = Minimieren
 zen-panel-ui-gradient-generator-custom-color = Eigene Farbe
-zen-panel-ui-gradient-generator-saved-message = Farbverlauf gespeichert!
 zen-copy-current-url-confirmation = URL kopiert!
 zen-general-cancel-label = 
     .label = Abbrechen
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Die URL des angehefteten Tabs wurde aktualisiert!
 zen-tabs-renamed = Tab umbenannt!
 zen-background-tab-opened-toast = Neuer Tab im Hintergrund geöffnet!
 zen-workspace-renamed-toast = Arbeitsbereich umbenannt!
-zen-library-sidebar-workspaces = 
-    .label = Arbeitsbereiche
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Kompakter Modus
     .tooltiptext = Kompakten Modus umschalten
@@ -61,6 +60,8 @@ zen-site-data-settings = Einstellungen
 zen-generic-manage = Verwalten
 zen-generic-more = Mehr
 zen-generic-next = Weiter
+zen-essentials-promo-label = Hinzufügen zu Essentials
+zen-essentials-promo-sublabel = Behalte deine Lieblings-Tabs nur einen Klick entfernt
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Erlaubt
 zen-site-data-setting-block = Blockiert
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Funktioniert etwas nicht?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Im abgesicherten Modus neu starten
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/de/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Fixierte Tabs ausklappen
+           *[false] Fixierte Tabs einklappen
+        }
+zen-menubar-appearance = 
+    .label = Erscheinungsbild
+zen-menubar-appearance-description = 
+    .label = Webseiten werden nutzen:
+zen-menubar-appearance-auto = 
+    .label = Automatisch
+zen-menubar-appearance-light = 
+    .label = Hell
+zen-menubar-appearance-dark = 
+    .label = Dunkel
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/de/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Arbeitsbereiche
+zen-panel-ui-spaces-label = 
+    .label = Arbeitsbereiche
 zen-panel-ui-workspaces-create = 
     .label = Arbeitsbereich erstellen
 zen-panel-ui-folder-create = 
@@ -30,9 +32,6 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Arbeitsbereich bearbeiten
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Tabs zu Arbeitsbereich verschieben
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
     .value = Arbeitsbereiche
     .accesskey = W
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Klick hier, um eine Farbe hinzuzufügen
 zen-workspace-creation-name = 
     .placeholder = Name des Arbeitsbereichs
+zen-move-tab-to-workspace-button = 
+    .label = Verschieben nach...
+    .tooltiptext = Alle Tabs in diesem Fenster in einen Arbeitsbereich verschieben
 zen-workspaces-panel-context-reorder = 
     .label = Arbeitsbereiche neu anordnen
 zen-workspace-creation-profile = Profil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Aufräumen
     .tooltiptext = Alle nicht angehefteten Tabs schließen
+zen-panel-ui-workspaces-change-forward = 
+    .label = Nächster Arbeitsbereich
+zen-panel-ui-workspaces-change-back = 
+    .label = Vorheriger Arbeitsbereich

locales/el/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Εναλλαγή Αποθηκευτικο
 zen-devtools-toggle-dom-shortcut = Εναλλαγή DOM
 zen-devtools-toggle-accessibility-shortcut = Εναλλαγή Προσβασιμότητας
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/el/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/el/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Αντικατάσταση καρφιτσωμένου URL με το τρέχον
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Το αρχείο { -brand-short-name } mods είναι κατεστραμμένο. Έχει γίνει επαναφορά στο προεπιλεγμένο θέμα.
 zen-shortcuts-corrupted = Το αρχείο συντομεύσεων σας { -brand-short-name } είναι κατεστραμμένο. Έχει γίνει επαναφορά στις προεπιλεγμένες συντομεύσεις.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Ελαχιστοποίηση
     .tooltip = Ελαχιστοποίηση
 zen-panel-ui-gradient-generator-custom-color = Προσαρμοσμένο Χρώμα
-zen-panel-ui-gradient-generator-saved-message = Επιτυχής αποθήκευση της διαβάθμισης!
 zen-copy-current-url-confirmation = Αντιγράφηκε το τρέχον URL!
 zen-general-cancel-label = 
     .label = Ακύρωση
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Το URL της καρφιτσωμένης καρτέ
 zen-tabs-renamed = Η καρτέλα μετονομάστηκε επιτυχώς!
 zen-background-tab-opened-toast = Άνοιξε νέα καρτέλα στο παρασκήνιο!
 zen-workspace-renamed-toast = Ο χώρος εργασίας μετονομάστηκε επιτυχώς!
-zen-library-sidebar-workspaces = 
-    .label = Χώροι
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Συμπαγής Λειτουργία
     .tooltiptext = Toggle Compact Mode
@@ -61,6 +60,8 @@ zen-site-data-settings = Ρυθμίσεις
 zen-generic-manage = Διαχείριση
 zen-generic-more = Περισσότερα
 zen-generic-next = Επόμενο
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Επιτρέπεται
 zen-site-data-setting-block = Αποκλείστηκε
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Χάλασε κάτι;
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Επανεκκίνηση σε Ασφαλή Λειτουργία
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/el/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/el/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Χώροι Εργασίας
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Δημιουργία Χώρου
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Επεξεργασία Χώρου Εργασίας
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Αλλαγή Καρτελών Σε Χώρο Εργασίας
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Χώροι Εργασίας
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Συμπληρωματικό
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Κλικ για προσθήκη χρώματος
 zen-workspace-creation-name = 
     .placeholder = Όνομα Χώρου
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Αναδιάταξη Χώρων
 zen-workspace-creation-profile = Προφίλ
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/en-GB/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/en-GB/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/en-GB/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
 zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
 # note: Do not translate the "<br/>" tags in the following string
@@ -26,7 +30,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom colour
-zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
@@ -36,10 +39,6 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
-    .label = Spaces
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
@@ -59,6 +58,8 @@ zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -106,3 +107,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/en-GB/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/en-GB/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Other workspaces
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Edit Workspace
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Change Tab(s) To Workspace
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Other Workspace
+    .value = Spaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Click to add a colour
 zen-workspace-creation-name = 
     .placeholder = Space Name
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Reorder Spaces
 zen-workspace-creation-profile = Profile
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/en-US/browser/browser/preferences/zen-preferences.ftl

@@ -353,4 +353,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
-zen-new-unsynced-window-shortcut = New Unsynced Window
+zen-new-unsynced-window-shortcut = New Blank Window

locales/en-US/browser/browser/zen-general.ftl

@@ -75,6 +75,9 @@ zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
 
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
+
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -129,3 +132,8 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip =
     .title = Restart in Safe Mode
+
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/en-US/browser/browser/zen-menubar.ftl

@@ -10,11 +10,17 @@ zen-menubar-toggle-pinned-tabs =
         }
 
 zen-menubar-appearance =
-    .label = Website Appearance
+    .label = Appearance
+
+zen-menubar-appearance-description =
+    .label = Websites will use:
 
 zen-menubar-appearance-auto =
     .label = Automatic
 zen-menubar-appearance-light =
     .label = Light
 zen-menubar-appearance-dark =
-    .label = Dark
+    .label = Dark
+
+zen-menubar-new-unsynced-window =
+    .label = New Blank Window

locales/es-ES/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Alternar almacenamiento
 zen-devtools-toggle-dom-shortcut = Alternar DOM
 zen-devtools-toggle-accessibility-shortcut = Alternar accesibilidad
 zen-close-all-unpinned-tabs-shortcut = Cerrar todas las pestañas sin fijar
+zen-new-unsynced-window-shortcut = Nueva ventana no sincronizada

locales/es-ES/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convertir carpeta en espacio
 zen-folders-panel-change-folder-space = 
     .label = Cambiar espacio...
-zen-folders-panel-change-icon-folder = 
-    .label = Cambiar icono
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Suspensión activa en esta carpeta
 zen-folders-unload-folder = 

locales/es-ES/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Reemplazar la URL fijada con la actual
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Cambiar etiqueta...
+tab-context-zen-edit-icon = 
+    .label = Cambiar icono...
 zen-themes-corrupted = Su archivo de mods de { -brand-short-name } está dañado. Se ha restablecido el tema por defecto.
 zen-shortcuts-corrupted = Su archivo de atajos de { -brand-short-name } está dañado. Se han restablecido los atajos por defecto.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Color personalizado
-zen-panel-ui-gradient-generator-saved-message = ¡Gradiente guardado con éxito!
 zen-copy-current-url-confirmation = ¡URL actual copiada!
 zen-general-cancel-label = 
     .label = Cancelar
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = La URL de la pestaña fijada se ha reemplazado por la
 zen-tabs-renamed = ¡La pestaña se ha renombrado con éxito!
 zen-background-tab-opened-toast = ¡Nueva pestaña abierta en segundo plano!
 zen-workspace-renamed-toast = ¡El espacio de trabajo ha sido renombrado con éxito!
-zen-library-sidebar-workspaces = 
-    .label = Espacios
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Modo compacto
     .tooltiptext = Alternar modo compacto
@@ -61,6 +60,8 @@ zen-site-data-settings = Ajustes
 zen-generic-manage = Administrar
 zen-generic-more = Más
 zen-generic-next = Siguiente
+zen-essentials-promo-label = Añadir a esenciales
+zen-essentials-promo-sublabel = Mantenga sus pestañas favoritas a solo un clic de distancia
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = ¿Algo dejó de funcionar?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Reiniciar en modo seguro
+zen-window-sync-migration-dialog-title = Mantenga sus ventanas sincronizadas
+zen-window-sync-migration-dialog-message = Ahora Zen sincroniza las ventanas en el mismo dispositivo, por lo que los cambios en una ventana se reflejan en las demás instantáneamente.
+zen-window-sync-migration-dialog-learn-more = Más información
+zen-window-sync-migration-dialog-accept = Entendido

locales/es-ES/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expandir pestañas fijadas
+           *[false] Colapsar pestañas fijadas
+        }
+zen-menubar-appearance = 
+    .label = Apariencia
+zen-menubar-appearance-description = 
+    .label = Los sitios web usarán:
+zen-menubar-appearance-auto = 
+    .label = Automático
+zen-menubar-appearance-light = 
+    .label = Claro
+zen-menubar-appearance-dark = 
+    .label = Oscuro
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/es-ES/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Espacios de trabajo
+zen-panel-ui-spaces-label = 
+    .label = Espacios
 zen-panel-ui-workspaces-create = 
     .label = Crear espacio
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Editar espacio de trabajo
     .accesskey = E
-context-zen-change-workspace-tab = 
-    .label = Cambiar pestaña(s) a espacio de trabajo
-    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Espacios de trabajo
+    .value = Espacios
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementario
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Haga clic para añadir un color
 zen-workspace-creation-name = 
     .placeholder = Nombre del espacio
+zen-move-tab-to-workspace-button = 
+    .label = Mover a...
+    .tooltiptext = Mover todas las pestañas de esta ventana a un espacio
 zen-workspaces-panel-context-reorder = 
     .label = Reordenar espacios
 zen-workspace-creation-profile = Perfil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = ¡Pestañas cerradas! Use <span>{
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Limpiar
     .tooltiptext = Cerrar todas las pestañas sin fijar
+zen-panel-ui-workspaces-change-forward = 
+    .label = Espacio siguiente
+zen-panel-ui-workspaces-change-back = 
+    .label = Espacio anterior

locales/et/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Lülita mälu sektsioon sisse/välja
 zen-devtools-toggle-dom-shortcut = Lülita DOM sisse/välja
 zen-devtools-toggle-accessibility-shortcut = Lülita ligipääsetavuse sektsioon sisse/välja
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/et/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Teisenda kaust tööruumiks
 zen-folders-panel-change-folder-space = 
     .label = Liiguta tööruumi...
-zen-folders-panel-change-icon-folder = 
-    .label = Muuda ikooni
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Eemalda mälust selle kausta aktiivsed kaardid
 zen-folders-unload-folder = 

locales/et/browser/browser/zen-general.ftl

@@ -17,6 +17,10 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Asenda püsikaardi URL praegusega
     .accesskey = p
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Sinu { -brand-short-name } mods-ide fail on vigane. See on nüüd lähtestatud vaikimisi teemaks.
 zen-shortcuts-corrupted = Sinu { -brand-short-name } otseteede fail on vigane. See on nüüd lähtestatud vaikimisi otseteedeks.
 # note: Do not translate the "<br/>" tags in the following string
@@ -28,7 +32,6 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimeeri
     .tooltip = Minimeeri
 zen-panel-ui-gradient-generator-custom-color = Kohandatud värv
-zen-panel-ui-gradient-generator-saved-message = Värviüleminek on edukalt salvestatud!
 zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Tühista
@@ -38,10 +41,6 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Kaart on edukalt ümber nimetatud!
 zen-background-tab-opened-toast = Taustal avati uus kaart!
 zen-workspace-renamed-toast = Tööruum on edukalt ümber nimetatud!
-zen-library-sidebar-workspaces = 
-    .label = Tööruumid
-zen-library-sidebar-mods = 
-    .label = Mods-id
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Lülita kompaktne režiim sisse/välja
@@ -61,6 +60,8 @@ zen-site-data-settings = Sätted
 zen-generic-manage = Halda
 zen-generic-more = Rohkem
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Lubatud
 zen-site-data-setting-block = Keelatud
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/et/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window

locales/et/browser/browser/zen-workspaces.ftl

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Tööruumid
+zen-panel-ui-spaces-label = 
+    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Uus tööruum
 zen-panel-ui-folder-create = 
@@ -30,11 +32,8 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Muuda tööruumi
     .accesskey = M
-context-zen-change-workspace-tab = 
-    .label = Liiguta kaardid tööruumi
-    .accesskey = L
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Tööruumid
+    .value = Spaces
     .accesskey = T
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Täiendvärvid
@@ -49,6 +48,9 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Klõpsa värvi lisamiseks
 zen-workspace-creation-name = 
     .placeholder = Tööruumi nimi
+zen-move-tab-to-workspace-button = 
+    .label = Move To...
+    .tooltiptext = Move all tabs in this window to a Space
 zen-workspaces-panel-context-reorder = 
     .label = Muuda tööruumide järjestust
 zen-workspace-creation-profile = Profiil
@@ -63,3 +65,7 @@ zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcu
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
     .tooltiptext = Close all unpinned tabs
+zen-panel-ui-workspaces-change-forward = 
+    .label = Next Space
+zen-panel-ui-workspaces-change-back = 
+    .label = Previous Space

locales/fa/browser/browser/preferences/zen-preferences.ftl

@@ -314,3 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
 zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-new-unsynced-window-shortcut = New Unsynced Window

locales/fa/browser/browser/zen-folders.ftl

@@ -16,8 +16,6 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 zen-folders-panel-change-folder-space = 
     .label = Change Space...
-zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 

locales/fa/browser/browser/zen-general.ftl

@@ -5,8 +5,8 @@
 zen-panel-ui-current-profile-text = نمایهٔ کنونی
 unified-extensions-description = افزونه‌های در حال استفاده عملکردهای بیشتری به { -brand-short-name } می‌دهند.
 tab-context-zen-reset-pinned-tab = 
-    .label = Reset Pinned Tab
-    .accesskey = R
+    .label = بازنشانی زبانهٔ سنجاق شده
+    .accesskey = ب
 tab-context-zen-add-essential = 
     .label = Add to Essentials
     .accesskey = E
@@ -15,43 +15,42 @@ tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
 tab-context-zen-replace-pinned-url-with-current = 
-    .label = Replace Pinned URL with Current
+    .label = جایگزینی URL سنجاق شده با فعلی
     .accesskey = C
+tab-context-zen-edit-title = 
+    .label = Change Label...
+tab-context-zen-edit-icon = 
+    .label = Change Icon...
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
 zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
-zen-disable = Disable
+zen-disable = غیرفعال
 pictureinpicture-minimize-btn = 
-    .aria-label = Minimize
-    .tooltip = Minimize
-zen-panel-ui-gradient-generator-custom-color = Custom Color
-zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
-zen-copy-current-url-confirmation = Copied current URL!
+    .aria-label = کمینه
+    .tooltip = کمینه
+zen-panel-ui-gradient-generator-custom-color = رنگ دلخواه
+zen-copy-current-url-confirmation = رونوشت از URL فعلی!
 zen-general-cancel-label = 
-    .label = Cancel
+    .label = لغو
 zen-general-confirm = 
-    .label = Confirm
+    .label = تایید
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
-    .label = Spaces
-zen-library-sidebar-mods = 
-    .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
-zen-learn-more-text = Learn More
-zen-close-label = Close
+zen-learn-more-text = یادگیری بیشتر
+zen-close-label = بستن
 zen-singletoolbar-urlbar-placeholder-with-name = 
-    .placeholder = Search...
+    .placeholder = جستجو...
 zen-icons-picker-emoji = 
     .label = Emojis
 zen-icons-picker-svg = 
@@ -61,6 +60,8 @@ zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
 zen-generic-next = Next
+zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -108,3 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Restart in Safe Mode
+zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-accept = Got It

locales/fa/browser/browser/zen-menubar.ftl

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+zen-menubar-toggle-pinned-tabs = 
+    .label =
+        { $pinnedAreCollapsed ->
+            [true] Expand Pinned Tabs
+           *[false] Collapse Pinned Tabs
+        }
+zen-menubar-appearance = 
+    .label = Appearance
+zen-menubar-appearance-description = 
+    .label = Websites will use:
+zen-menubar-appearance-auto = 
+    .label = Automatic
+zen-menubar-appearance-light = 
+    .label = Light
+zen-menubar-appearance-dark = 
+    .label = Dark
+zen-menubar-new-unsynced-window = 
+    .label = New Blank Window