fix: Correctly detect ld64, b=no-bug, c=no-component

.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"
+          - name: 'component: sync'
-            keys: ["Sync"]
+            keys: ['Sync']
-          - name: "component: compact-mode"
+          - name: 'component: compact-mode'
-            keys: ["Compact Mode"]
+            keys: ['Compact Mode']
-          - name: "component: workspaces"
+          - name: 'component: workspaces'
-            keys: ["Workspaces"]
+            keys: ['Workspaces']
-          - name: "component: mods-themes"
+          - name: 'component: mods-themes'
-            keys: ["Mods / Themes"]
+            keys: ['Mods / Themes']
-          - name: "component: bookmarks"
+          - name: 'component: bookmarks'
-            keys: ["Bookmarks"]
+            keys: ['Bookmarks']
-          - name: "component: glance"
+          - name: 'component: glance'
-            keys: ["Glance"]
+            keys: ['Glance']
-          - name: "component: url-bar"
+          - name: 'component: url-bar'
-            keys: ["URL Bar"]
+            keys: ['URL Bar']
-          - name: "component: tabs"
+          - name: 'component: tabs'
-            keys: ["Tabs"]
+            keys: ['Tabs']
-          - name: "component: settings"
+          - name: 'component: settings'
-            keys: ["Settings"]
+            keys: ['Settings']
-          - name: "component: privacy"
+          - name: 'component: privacy'
-            keys: ["Privacy"]
+            keys: ['Privacy']
-          - name: "component: split-view"
+          - name: 'component: split-view'
-            keys: ["Split View"]
+            keys: ['Split View']
-          - name: "component: performance"
+          - name: 'component: performance'
-            keys: ["Performance"]
+            keys: ['Performance']
-          - name: "component: media-controller"
+          - name: 'component: media-controller'
-            keys: ["Media Controler"]
+            keys: ['Media Controler']
-          - name: "component: tab-unloading"
+          - name: 'component: tab-unloading'
-            keys: ["Tab unloading"]
+            keys: ['Tab unloading']
-          - name: "component: tab-folders"
+          - name: 'component: tab-folders'
-            keys: ["Tab Folders"]
+            keys: ['Tab Folders']
-          - name: "component: keyboard-shortcuts"
+          - name: 'component: keyboard-shortcuts'
-            keys: ["Keyboard Shortcuts"]
+            keys: ['Keyboard Shortcuts']
-          - name: "component: security"
+          - name: 'component: security'
-            keys: ["Security"]
+            keys: ['Security']
-          - name: "component: extensions"
+          - name: 'component: extensions'
-            keys: ["Extensions"]
+            keys: ['Extensions']
-          - name: "component: customizable-ui-toolbars"
+          - name: 'component: customizable-ui-toolbars'
-            keys: ["Customizable UI / Toolbars"]
+            keys: ['Customizable UI / Toolbars']
-          - name: "component: localization"
+          - name: 'component: localization'
-            keys: ["Localization"]
+            keys: ['Localization']
-          - name: "component: other"
+          - name: 'component: other'
-            keys: ["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"
+          - name: 'platform: linux'
-            keys: ["Linux (AppImage)", "Linux (Flatpak)", "Linux (Tarball)"]
+            keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
-          - name: "platform: macOS"
+          - name: 'platform: macOS'
-            keys: ["macOS - aarch64", "macOS - Intel"]
+            keys: ['macOS - aarch64', 'macOS - Intel']
-          - name: "platform: windows"
+          - name: 'platform: windows'
-            keys: ["Windows - x64", "Windows - aarch64"]
+            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"
+        default: 'release'
-        type: "choice"
+        type: 'choice'
         options:
-          - "release"
+          - 'release'
-          - "twilight"
+          - '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"
+        default: 'release'
-        type: "string"
+        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: |
@@ -336,7 +336,7 @@ jobs:
       MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
       use-sccache: ${{ inputs.use-sccache }}
 
-  mac:
+  mac-pgo-generate:
     name: macOS build
     uses: ./.github/workflows/macos-release-build.yml
     permissions:
@@ -348,6 +348,21 @@ jobs:
       release-branch: ${{ inputs.update_branch }}
       MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
       use-sccache: ${{ inputs.use-sccache }}
+      generate-pgo-data: true
+
+  mac:
+    name: macOS build
+    uses: ./.github/workflows/macos-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, buildid, mac-pgo-generate]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+      generate-pgo-data: false
 
   mac-uni:
     name: macOS build (Universal)
@@ -379,7 +394,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 +580,8 @@ jobs:
             ./zen.installer.exe/*
             ./zen.installer-arm64.exe/*
             ./zen.macos-universal.dmg/*
-          tag_name: "twilight"
+          tag_name: 'twilight'
-          name: "Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})"
+          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 +599,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 +671,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,6 +5,9 @@ on:
     branches:
       - dev
   workflow_call:
+  pull_request:
+    branches:
+      - dev
 
 permissions:
   contents: read
@@ -22,7 +25,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') }}
@@ -33,11 +36,5 @@ 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,22 +6,27 @@ 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
+      generate-pgo-data:
+        description: 'Generate PGO data'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   mac-build:
@@ -47,7 +52,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
@@ -68,8 +73,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.email "mr-cheffy@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
+          git config --global user.name "mr-cheffy"
 
       - name: Install system dependencies
         run: |
@@ -120,6 +125,20 @@ jobs:
           SURFER_COMPAT: ${{ matrix.arch }}
         run: npm run import -- --verbose
 
+      - name: Download PGO data
+        if: ${{ inputs.generate-pgo-data == false }}
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-macos-pgo-data-${{ matrix.arch }}
+
+      - name: Move PGO data
+        if: ${{ inputs.generate-pgo-data == false }}
+        run: |
+          mkdir -p $(echo ~)/artifact
+          mv $GITHUB_WORKSPACE/zen-macos-pgo-data-${{ matrix.arch }}/* $(echo ~)/artifact
+          chmod +x ~/artifact/en-US.log
+          chmod +x ~/artifact/merged.profdata
+
       - name: Bootstrap
         run: |
           cd engine
@@ -142,6 +161,7 @@ jobs:
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
           ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+          ZEN_GENERATE_PGO_DATA: ${{ inputs.generate-pgo-data && '1' || '0' }}
         run: |
           export SURFER_PLATFORM="darwin"
           if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
@@ -150,6 +170,7 @@ jobs:
           bash .github/workflows/src/release-build.sh
 
       - name: Package
+        if: ${{ !inputs.generate-pgo-data }}
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
           ZEN_GA_DISABLE_PGO: true
@@ -163,6 +184,7 @@ jobs:
           rm -rf ~/.zen-keys
 
       - name: Rename artifacts
+        if: ${{ !inputs.generate-pgo-data }}
         run: |
           echo "Tarballing DMG"
           set -ex
@@ -172,6 +194,7 @@ jobs:
 
       - name: Upload dist dmg
         uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-pgo-data }}
         with:
           retention-days: 1
           name: zen-${{ matrix.arch }}-apple-darwin-dist.dmg
@@ -179,7 +202,7 @@ jobs:
 
       - name: Upload host mar
         uses: actions/upload-artifact@v4
-        if: matrix.arch == 'aarch64'
+        if: matrix.arch == 'aarch64' && !inputs.generate-pgo-data
         with:
           retention-days: 1
           name: zen-macos-host-mar
@@ -187,8 +210,16 @@ jobs:
 
       - name: Upload platform.ini
         uses: actions/upload-artifact@v4
-        if: matrix.arch == 'x86_64'
+        if: matrix.arch == 'x86_64' && !inputs.generate-pgo-data
         with:
           retention-days: 1
           name: platform.ini
           path: ./platform.ini
+
+      - name: Upload PGO data
+        uses: actions/upload-artifact@v4
+        if: inputs.generate-pgo-data
+        with:
+          retention-days: 1
+          name: zen-macos-pgo-data-${{ matrix.arch }}
+          path: ./zen-macos-pgo-data

.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

.github/workflows/pr-test.yml

@@ -19,18 +19,13 @@ 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/src/release-build.sh

@@ -28,3 +28,22 @@ else
   export ZEN_RELEASE=1
   npm run build
 fi
+
+if test "$ZEN_GENERATE_PGO_DATA" = "1"; then
+  cd engine
+  export UPLOAD_PATH=../zen-macos-pgo-data
+  export MOZ_FETCHES_DIR=/Users/runner/.mozbuild
+  mkdir -p $UPLOAD_PATH
+
+  export JARLOG_FILE="en-US.log"
+
+  export LLVM_PROFDATA=$MOZ_FETCHES_DIR/clang/bin/llvm-profdata
+
+  set -v
+
+  ./mach python build/pgo/profileserver.py --binary obj-*-apple-darwin/dist/*.app/Contents/MacOS/zen
+
+  mv merged.profdata $UPLOAD_PATH/
+  mv $JARLOG_FILE $UPLOAD_PATH/
+  cd ..
+fi

.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,7 +41,7 @@ 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'
@@ -119,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 }}`"
+          commit-message: 'chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`'
-          branch: "chore/upstream-sync"
+          branch: 'chore/upstream-sync'
-          title: "Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}"
+          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

.gitignore

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

.prettierrc.json

@@ -2,19 +2,11 @@
   "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 `147.0.1`! 🚀
+- [`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 147.0.1`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0`!
 
 ### Contributing
 

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

@@ -1 +1 @@
-783b222b1b93fb9e8c52eb57558ef7f07bca6e7e
+459ca9dfb9642c48c4ae314ce489d462b25448a8

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

@@ -1,10 +1,14 @@
 app-id: app.zen_browser.zen
 runtime: org.freedesktop.Platform
-runtime-version: '25.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 base: org.mozilla.firefox.BaseApp
-base-version: '25.08'
+base-version: '24.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
@@ -20,7 +24,6 @@ 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
@@ -48,6 +51,7 @@ 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 fs = require('fs');
-const MJS_FILES = ["src/zen/split-view/ZenViewSplitter.ts"];
+const MJS_FILES = ['src/zen/split-view/ZenViewSplitter.ts'];
 
 for (const file of MJS_FILES) {
-  const code = fs.readFileSync(file, "utf8");
+  const code = fs.readFileSync(file, 'utf8');
-  require("@babel/core").transformSync(code, {
+  require('@babel/core').transformSync(code, {
-    presets: ["@babel/preset-typescript"],
+    presets: ['@babel/preset-typescript'],
     filename: file,
   });
 }

configs/common/mozconfig

@@ -9,9 +9,7 @@ ac_add_options --with-app-basename=Zen
 # Localization (Must be an absolute path)
 ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
 
-# See https://github.com/zen-browser/desktop/issues/11917 for future plans.
+export MOZ_USER_DIR="${name}"
-# 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}

configs/macos/mozconfig

@@ -14,15 +14,6 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --enable-lto=cross,thin
 fi
 
-if test "$ZEN_RELEASE"; then
-  if test "$ZEN_GA_DISABLE_PGO"; then
-    export ZEN_DUMMY=1
-  else
-    export MOZ_PGO=1
-    ac_add_options MOZ_PGO=1
-  fi
-fi
-
 if test "$SURFER_COMPAT" = "x86_64"; then
   ac_add_options --target=x86_64-apple-darwin
 
@@ -50,9 +41,18 @@ 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
+export MOZ_LD64_KNOWN_GOOD=1
-# ac_add_options --enable-linker=ld64
+ac_add_options --enable-linker=ld64
-# 
+
-# if test "$ZEN_RELEASE"; then
+if test "$ZEN_RELEASE"; then
-#   mk_add_options MOZ_MAKE_FLAGS="-j4"
+  if ! test "$ZEN_GA_DISABLE_PGO"; then
-# fi
+    if test "$ZEN_GENERATE_PGO_DATA"; then
+      mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
+      ac_add_options --enable-profile-generate=cross
+    else
+      ac_add_options --enable-profile-use=cross
+      ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
+      ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
+    fi
+  fi
+fi

configs/windows/mozconfig

@@ -47,9 +47,7 @@ if test "$ZEN_CROSS_COMPILING"; then
     ac_add_options --enable-profile-generate=cross
   elif test "$SURFER_COMPAT" = "x86_64"; then
     # Dont use PGO on aarch64 builds and the ZEN_GA_DISABLE_PGO flag is not set
-    if test "$ZEN_GA_DISABLE_PGO"; then
+    if ! test "$ZEN_GA_DISABLE_PGO"; then
-      export ZEN_DUMMY=1
-    else
       ac_add_options --enable-profile-use=cross
       ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
       ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log

eslint.config.mjs

@@ -1,474 +1,27 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+// 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
+// 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/. */
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import sdl from "@microsoft/eslint-plugin-sdl";
+import js from '@eslint/js';
-import eslintConfigPrettier from "eslint-config-prettier/flat";
+import globals from 'globals';
-import html from "eslint-plugin-html";
+import { defineConfig, globalIgnores } from 'eslint/config';
-import importPlugin from "eslint-plugin-import";
+import zenGlobals from './src/zen/zen.globals.js';
-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";
 
-import globals from "globals";
+export default defineConfig([
-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 = [
   {
-    name: "import-plugin-settings",
+    files: ['**/*.{js,mjs,cjs}'],
-    settings: {
+    plugins: { js },
-      "import/extensions": [".mjs"],
+    extends: ['js/recommended'],
-      "import/resolver": {
-        [path.resolve(import.meta.dirname, "engine", "srcdir-resolver.js")]: {},
-        node: {},
-      },
-    },
-  },
-  {
-    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,
+        ...globals.browser,
-        ...mozilla.environments.specific.globals,
+        ...zenGlobals.reduce((acc, global) => {
+          acc[global] = 'readable';
+          return acc;
+        }, {}),
       },
     },
+    ignores: ['**/vendor/**', '**/tests/**'],
   },
-  {
+  globalIgnores(['**/mochitests/**']),
-    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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Workspaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Workspaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Workspaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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
+    .value = Espais de treball
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementari
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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ém panelu
+zen-glance-description = Prohlédněte si své odkazy rychle, bez otevírání v nové záložce
 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 = 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
+    .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
 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 zahrnuje Essentials v pracovních panelech
+    .label = Ctrl+Tab cykly pouze v Essentials nebo pracovních kartách
 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é panely
+pane-zen-pinned-tab-manager-title = Připnuté karty
 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é panely na jejich původní URL adresu
+    .label = Při spuštění obnovit připnuté karty 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 = Chování při zavírání připnutého panelu
+zen-pinned-tab-manager-close-shortcut-behavior-label = Zavřít chování zástupce záložky
 zen-pinned-tab-manager-reset-unload-switch-close-shortcut-option = 
-    .label = Obnovit URL adresu, uspat a přepnout na další panel
+    .label = Obnovit URL adresu, uspat a přepnout na další kartu
 zen-pinned-tab-manager-unload-switch-close-shortcut-option = 
-    .label = Uspat a přepnout na další panel
+    .label = Uspat a přepnout na další kartu
 zen-pinned-tab-manager-reset-switch-close-shortcut-option = 
-    .label = Obnovit URL adresu a přepnout na další panel
+    .label = Obnovit URL adresu a přepnout na další kartu
 zen-pinned-tab-manager-switch-close-shortcut-option = 
-    .label = Přepnout na další panel
+    .label = Přepnout na další kartu
 zen-pinned-tab-manager-reset-close-shortcut-option = 
     .label = Resetovat adresu URL
 zen-pinned-tab-manager-close-close-shortcut-option = 
-    .label = Zavřít panel
+    .label = Zavřít kartu
 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í panely
+zen-vertical-tabs-header = Vertikální karty
-zen-vertical-tabs-description = Spravujte vaše panely ve vertikálním rozložení
+zen-vertical-tabs-description = Spravujte vaše karty 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ého panelu v panelu záložek
+    .label = Zobrazit tlačítko pro vytvoření nové karty v panelu záložek
 zen-vertical-tabs-newtab-top-button-up = 
-    .label = Přesunout tlačítko pro vytvoření nového panelu nahoru
+    .label = Přesunout tlačítko pro vytvoření nové karty 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 panely při přejetí myší (nefunguje v kompaktním režimu)
+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 panely
+zen-vertical-tabs-expand-tabs-header = Jak rozbalit karty
 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řený panel
+zen-restore-last-closed-tab-shortcut = Obnovit poslední zavřenou kartu
 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 panel
+zen-close-shortcut-2 = Zavřít kartu
 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 panel
+zen-close-tab-shortcut = Zavřít kartu
 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í panel
+zen-key-select-tab-1 = Vybrat první kartu
-zen-key-select-tab-2 = Vybrat druhý panel
+zen-key-select-tab-2 = Vybrat druhou kartu
-zen-key-select-tab-3 = Vybrat třetí panel
+zen-key-select-tab-3 = Vybrat třetí kartu
-zen-key-select-tab-4 = Vybrat čtvrtý panel
+zen-key-select-tab-4 = Vybrat čtvrtou kartu
-zen-key-select-tab-5 = Vybrat pátý panel
+zen-key-select-tab-5 = Vybrat pátou kartu
-zen-key-select-tab-6 = Vybrat šestý panel
+zen-key-select-tab-6 = Vybrat šestou kartu
-zen-key-select-tab-7 = Vybrat sedmý panel
+zen-key-select-tab-7 = Vybrat sedmou kartu
-zen-key-select-tab-8 = Vybrat osmý panel
+zen-key-select-tab-8 = Vybrat osmou kartu
-zen-key-select-tab-last = Vybrat poslední panel
+zen-key-select-tab-last = Vybrat poslední kartu
-zen-key-show-all-tabs = Zobrazit všechny panely
+zen-key-show-all-tabs = Zobrazit všechny karty
 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,4 +314,3 @@ 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,6 +16,8 @@ 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ý panel
+    .label = Resetovat připnuté karty
     .accesskey = R
 tab-context-zen-add-essential = 
     .label = Přidat do Essentials
@@ -17,21 +17,18 @@ 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 nový panel a podívejte se, jak funguje!
+    Zkuste otevřít novou kartu 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
@@ -39,8 +36,12 @@ 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ý panel na pozadí byl otevřen!
+zen-background-tab-opened-toast = Nová karta na pozadí byla otevřena!
 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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 = Panely napravo
+    .label = Karty 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 panel
+            [one] Uspat a přepnout na kartu
-            [few] Uspat { $tabCount } panely a přepnout na první
+            [few] Uspat { $tabCount } karty a přepnout na první
-           *[other] Uspat { $tabCount } panelů a přepnout na první
+           *[other] Uspat { $tabCount } karet a přepnout na první
         }
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
             [one] Resetovat a připnout kartu
-            [few] Resetovat a připnout { $tabCount } panely
+            [few] Resetovat a připnout { $tabCount } karty
-           *[other] Resetovat a připnout { $tabCount } panelů
+           *[other] Resetovat a připnout { $tabCount } karet
         }
 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é panely vždy na dosah
+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ší panely snadno dostupné a vždy po ruce, bez ohledu na to, kolik jich otevřete.
+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 panely jsou vždy viditelné, bez ohledu na to, ve kterém pracovním prostoru se nacházíte.
+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-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Prostory
+    .value = Pracovní prostory
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Protilehlé
@@ -48,9 +49,6 @@ 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
@@ -61,11 +59,7 @@ 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 = Panely byly zavřeny! Použijte <span>{ $shortcut }</span> pro zrušení.
+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-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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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)
+        [1] Tab Hollt (angen sawl tab wedi'u dewis)
-           *[other] Hollti { $tabCount } Tab
+        *[other] Hollti { $tabCount } Tab
         }
     .accesskey = H
 zen-split-link = 

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

@@ -3,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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
+    .value = Gofodau Gwaith
     .accesskey = o
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Cyflenwol
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Arbejdsområder
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Komplementær
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,17 +10,13 @@ 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 } / { $max } Plätzen belegt
+tab-context-zen-add-essential-badge = { $num } von { $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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,6 +30,9 @@ 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
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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 = Ακύρωση
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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 = Αποκλείστηκε
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Χώροι Εργασίας
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Συμπληρωματικό
@@ -48,9 +49,6 @@ 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 = Προφίλ
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -30,6 +26,7 @@ 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
@@ -39,6 +36,10 @@ 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
@@ -58,8 +59,6 @@ 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
@@ -107,7 +106,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Other Workspace
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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 Blank Window
+zen-new-unsynced-window-shortcut = New Unsynced Window

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

@@ -75,9 +75,6 @@ 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
@@ -132,8 +129,3 @@ 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

@@ -21,6 +21,3 @@ zen-menubar-appearance-light =
     .label = Light
 zen-menubar-appearance-dark =
     .label = Dark
-
-zen-menubar-new-unsynced-window =
-    .label = New Blank Window

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

@@ -314,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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
+    .value = Espacios de trabajo
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementario
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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,10 +17,6 @@ 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
@@ -32,6 +28,7 @@ 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
@@ -41,6 +38,10 @@ 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
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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,8 +3,6 @@
 # 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 = 
@@ -32,8 +30,11 @@ 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 = Spaces
+    .value = Tööruumid
     .accesskey = T
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Täiendvärvid
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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,4 +314,3 @@ 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,6 +16,8 @@ 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 = بازنشانی زبانهٔ سنجاق شده
+    .label = Reset Pinned Tab
-    .accesskey = ب
+    .accesskey = R
 tab-context-zen-add-essential = 
     .label = Add to Essentials
     .accesskey = E
@@ -15,42 +15,43 @@ tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
 tab-context-zen-replace-pinned-url-with-current = 
-    .label = جایگزینی URL سنجاق شده با فعلی
+    .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
 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 = غیرفعال
+zen-disable = Disable
 pictureinpicture-minimize-btn = 
-    .aria-label = کمینه
+    .aria-label = Minimize
-    .tooltip = کمینه
+    .tooltip = Minimize
-zen-panel-ui-gradient-generator-custom-color = رنگ دلخواه
+zen-panel-ui-gradient-generator-custom-color = Custom Color
-zen-copy-current-url-confirmation = رونوشت از URL فعلی!
+zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
-    .label = لغو
+    .label = Cancel
 zen-general-confirm = 
-    .label = تایید
+    .label = Confirm
 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 = یادگیری بیشتر
+zen-learn-more-text = Learn More
-zen-close-label = بستن
+zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
-    .placeholder = جستجو...
+    .placeholder = Search...
 zen-icons-picker-emoji = 
     .label = Emojis
 zen-icons-picker-svg = 
@@ -60,8 +61,6 @@ 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
@@ -109,7 +108,3 @@ 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

@@ -1,22 +0,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/.
-
-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/fa/browser/browser/zen-workspaces.ftl

@@ -3,8 +3,6 @@
 # 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 = Create Space
 zen-panel-ui-folder-create = 
@@ -32,8 +30,11 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = ویرایش فضای کاری
     .accesskey = E
+context-zen-change-workspace-tab = 
+    .label = Change Tab(s) To Workspace
+    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Spaces
+    .value = Workspaces
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementary
@@ -48,9 +49,6 @@ 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
@@ -65,7 +63,3 @@ 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/fi/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,3 @@ zen-devtools-toggle-storage-shortcut = Vaihda Tallennustilaa
 zen-devtools-toggle-dom-shortcut = Vaihda DOM:ia
 zen-devtools-toggle-accessibility-shortcut = Vaihda Esteettömyystilaan
 zen-close-all-unpinned-tabs-shortcut = Sulje kaikki kiinnittämättömät välilehdet
-zen-new-unsynced-window-shortcut = New Unsynced Window

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

@@ -16,6 +16,8 @@ zen-folders-panel-convert-folder-to-space =
     .label = Muunna kansio työtilaksi
 zen-folders-panel-change-folder-space = 
     .label = Muuta Työtilaa...
+zen-folders-panel-change-icon-folder = 
+    .label = Vaihda kuvake
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Poista käytöstä aktiivinen kansio
 zen-folders-unload-folder = 

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

@@ -17,10 +17,6 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Korvaa kiinnitetty URL-osoite nykyisellä
     .accesskey = C
-tab-context-zen-edit-title = 
-    .label = Change Label...
-tab-context-zen-edit-icon = 
-    .label = Change Icon...
 zen-themes-corrupted = { -brand-short-name } modejasi tiedosto on vioittunut. Ne on palautettu oletusteemaan.
 zen-shortcuts-corrupted = { -brand-short-name } Oikotietä sisältävä tiedosto on korruptoitunut. Ne on palautettu oletus oikoteihin.
 # note: Do not translate the "<br/>" tags in the following string
@@ -32,6 +28,7 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimoi
     .tooltip = Minimoi
 zen-panel-ui-gradient-generator-custom-color = Muokattu Väri
+zen-panel-ui-gradient-generator-saved-message = Kaltevuus tallennettu onnistuneesti!
 zen-copy-current-url-confirmation = Nykyinen URL-osoite kopioitu!
 zen-general-cancel-label = 
     .label = Peruuta
@@ -41,6 +38,10 @@ zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Välilehti on nimetty uudelleen!
 zen-background-tab-opened-toast = Uusi taustavälilehti avattu!
 zen-workspace-renamed-toast = Työtila on nimetty uudelleen!
+zen-library-sidebar-workspaces = 
+    .label = Työtilat
+zen-library-sidebar-mods = 
+    .label = Modit
 zen-toggle-compact-mode-button = 
     .label = Kompakti Tila
     .tooltiptext = Ota käyttöön Kompakti tila
@@ -60,8 +61,6 @@ zen-site-data-settings = Asetukset
 zen-generic-manage = Hallitse
 zen-generic-more = Lisää
 zen-generic-next = Seuraava
-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 = Sallittu
 zen-site-data-setting-block = Estetty
@@ -109,7 +108,3 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Jotain rikki?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Käynnistä uudelleen vianmääritystilassa
-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/fi/browser/browser/zen-menubar.ftl

@@ -1,22 +0,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/.
-
-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/fi/browser/browser/zen-workspaces.ftl

@@ -3,8 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-panel-ui-workspaces-text = Työtilat
-zen-panel-ui-spaces-label = 
-    .label = Spaces
 zen-panel-ui-workspaces-create = 
     .label = Luo työtila
 zen-panel-ui-folder-create = 
@@ -32,8 +30,11 @@ zen-workspaces-panel-context-open =
 zen-workspaces-panel-context-edit = 
     .label = Muokkaa Työtilaa
     .accesskey = E
+context-zen-change-workspace-tab = 
+    .label = Vaihda Välilehdet Työtilaan
+    .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Spaces
+    .value = Työtilat
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Täydentävä
@@ -48,9 +49,6 @@ zen-panel-ui-gradient-generator-algo-floating =
 zen-panel-ui-gradient-click-to-add = Klikkaa lisätäksesi väri
 zen-workspace-creation-name = 
     .placeholder = Työtilan 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 = Järjestä Työtilat Uudelleen
 zen-workspace-creation-profile = Profiili
@@ -65,7 +63,3 @@ zen-workspaces-close-all-unpinned-tabs-toast = Välilehdet suljettu! Peruuta toi
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Tyhjennä
     .tooltiptext = Sulje kaikki kiinnittämättömät välilehdet
-zen-panel-ui-workspaces-change-forward = 
-    .label = Next Space
-zen-panel-ui-workspaces-change-back = 
-    .label = Previous Space