gh-14651: Change event listeners to not be inlined (gh-14700)

When dragging a tab from the blank window to the main window, the blank
window doesn't close because '#isLastTabWindow' considers
'zen-empty-tab' as a normal tab.

.github/workflows/build.yml

@@ -500,10 +500,24 @@ jobs:
           path: updates-server
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download object files
+      - name: Download signed windows objects
         if: ${{ inputs.update_branch == 'release' }}
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
         run: |
-          git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object --depth 1
+          mkdir -p .github/workflows/object
+          gh release download "windows-signed-${{ github.run_id }}" \
+            --repo zen-browser/windows-binaries \
+            --pattern 'windows-x64-signed-*.tar.gz' \
+            --dir .github/workflows/object
+
+          for arch in x86_64 arm64; do
+            archive=".github/workflows/object/windows-x64-signed-$arch.tar.gz"
+            dest=".github/workflows/object/windows-x64-signed-$arch"
+            echo "Expanding $archive"
+            mkdir -p "$dest"
+            tar -xvf "$archive" -C "$dest"
+          done
 
       - name: Sign MAR files
         env:
@@ -616,6 +630,17 @@ jobs:
             ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
             ./zen.macos-universal.dmg/*
 
+      - name: Clean up signed windows staging release
+        if: ${{ inputs.update_branch == 'release' }}
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+        run: |
+          # The per-run staging prerelease on windows-binaries has served its purpose
+          # now that the signed bundles are published in the real release. Never fail
+          # the release over this cleanup.
+          gh release delete "windows-signed-${{ github.run_id }}" \
+            --repo zen-browser/windows-binaries --cleanup-tag --yes || true
+
   prepare-flatpak:
     if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all

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

@@ -60,7 +60,7 @@ jobs:
 
           brew install watchman
 
-          cargo install apple-codesign
+          cargo install apple-codesign --locked --force
 
       - name: Force usage of gnu-tar
         run: |

.github/workflows/src/release-build.sh

@@ -8,10 +8,28 @@ if command -v apt-get &> /dev/null; then
   sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
+if ! test "$ZEN_CROSS_COMPILING" && test "$(uname -s)" = "Linux"; then
+  if test -d "$HOME/.mozbuild/clang/bin"; then
+      export CC="$HOME/.mozbuild/clang/bin/clang"
+      export CXX="$HOME/.mozbuild/clang/bin/clang++"
+  else
+      export CC=clang
+      export CXX=clang++
+  fi
+fi
+
 mkdir -p ~/.zen-keys
-echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
-echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
-echo "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY" > ~/.zen-keys/google_location_service.dat
+if test "$ZEN_SAFEBROWSING_API_KEY"; then
+  echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
+fi
+
+if test "$ZEN_MOZILLA_API_KEY"; then
+  echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
+fi
+
+if test "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY"; then
+  echo "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY" > ~/.zen-keys/google_location_service.dat
+fi
 
 . $HOME/.cargo/env
 

.github/workflows/sync-upstream.yml

@@ -129,7 +129,7 @@ jobs:
           token: ${{ secrets.DEPLOY_KEY }}
           commit-message: "chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`"
           branch: "chore/upstream-sync"
-          title: "no-bug: Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}"
+          title: "no-bug: 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/windows-profile-build.yml

@@ -61,7 +61,6 @@ jobs:
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd C:\artifact
-          ls
           Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
           ls
 

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

@@ -154,7 +154,7 @@ jobs:
             zlib1g-dev \
             aria2
           echo Setup wine
-          aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
+          aria2c "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/dQz_aHy8Rl-Lt0xf2WlrMw/artifacts/public/build/wine.tar.zst" -o wine.tar.zst
           tar --zstd -xf wine.tar.zst -C ~/win-cross
           rm wine.tar.zst
           echo Setup Visual Studio
@@ -234,7 +234,8 @@ jobs:
           ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
           ZEN_SAFEBROWSING_API_KEY: ${{ secrets.ZEN_SAFEBROWSING_API_KEY }}
           ZEN_MOZILLA_API_KEY: ${{ secrets.ZEN_MOZILLA_API_KEY }}
-          ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
+          # Firefox doesn't support location service for Windows
+          # ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
         run: |
           set -x
           dos2unix configs/windows/mozconfig
@@ -259,8 +260,8 @@ jobs:
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
           npm run package
-          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
+          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls .
 
       - name: Move package for PGO upload

.rust-toolchain

@@ -1 +1 @@
-1.90
+1.94.1

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 `151.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 151.0.2`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `153.0`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 153.0`!
 
 ### Contributing
 

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

@@ -1 +1 @@
-05272df13c2e4f435b4e0a706715f302b09ef829
+b1d3fe8f65751e6d695fa9ef94b11ad81e70dac1

build/windows/sign.ps1

@@ -170,14 +170,16 @@ function SignAndPackage($name) {
     echo "Packaging $name"
     npm run package -- --verbose
 
-    # In the release script, we do the following:
+    # We assemble the signed bundle as a plain folder here (with no top-level
+    # directory inside it) and compress it into windows-x64-signed-$name.tar.gz
+    # at the end of the script, once every .exe has been signed. The release
+    # workflow expands it back with:
     #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64
-    # We need to create a tar with the same structure and no top-level directory
-    # Inside, we need:
+    # Inside the bundle we need:
     #  - update_manifest/*
     #  - windows.mar
     #  - zen.installer.exe
-    echo "Creating tar for $name"
+    echo "Preparing signed bundle for $name"
     rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
     mkdir windsign-temp\windows-x64-signed-$name
 
@@ -200,9 +202,8 @@ function SignAndPackage($name) {
     # Move the manifest
     mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
 
-    # note: We need to sign it into a parent folder, called windows-x64-signed-$name
-    rmdir .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
-    mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
+    # The signed bundle stays in windsign-temp\windows-x64-signed-$name; it is
+    # compressed and uploaded to the staging release once every .exe is signed.
     rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
 
     echo "Finished $name"
@@ -211,16 +212,42 @@ function SignAndPackage($name) {
 SignAndPackage arm64
 SignAndPackage x86_64
 
-$files = Get-ChildItem .\windsign-temp\windows-binaries -Recurse -Include *.exe
+$files = Get-ChildItem .\windsign-temp\windows-x64-signed-x86_64, .\windsign-temp\windows-x64-signed-arm64 -Recurse -Include *.exe
 signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
 
-echo "All artifacts signed and packaged, ready for release!"
-echo "Commiting the changes to the repository"
-cd windsign-temp\windows-binaries
-git add .
-git commit -m "Sign and package windows artifacts"
-git push
-cd ..\..
+# Compress each signed bundle into a single gzip tarball (`-C <dir> .` so it has
+# no top-level directory) and upload it as a release asset on the windows-binaries
+# repo, keyed to this build's run id. Release assets keep the bundles out of git
+# (they were too large to commit) while still living in the windows-binaries repo.
+# The gated release job downloads and expands these from that repo's releases.
+$binariesRepo = "zen-browser/windows-binaries"
+$stagingTag = "windows-signed-$GithubRunId"
+echo "Ensuring staging release $stagingTag exists on $binariesRepo"
+gh release view $stagingTag --repo $binariesRepo *> $null
+if ($LASTEXITCODE -ne 0) {
+    gh release create $stagingTag --repo $binariesRepo --prerelease --title "Windows signed bundles ($GithubRunId)" --notes "Signed Windows bundles for run $GithubRunId, consumed by the release workflow. Safe to delete."
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to create staging release $stagingTag on $binariesRepo"
+    }
+}
+
+foreach ($name in @("x86_64", "arm64")) {
+    $signedDir = ".\windsign-temp\windows-x64-signed-$name"
+    $archive = ".\windsign-temp\windows-x64-signed-$name.tar.gz"
+    echo "Creating compressed tar for $name"
+    Remove-Item $archive -ErrorAction SilentlyContinue
+    tar -czvf $archive -C $signedDir .
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to create tar archive for $name"
+    }
+    echo "Uploading $archive to $binariesRepo release $stagingTag"
+    gh release upload $stagingTag $archive --repo $binariesRepo --clobber
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to upload $archive to release $stagingTag"
+    }
+}
+
+echo "All artifacts signed, packaged, and uploaded to $binariesRepo release $stagingTag!"
 
 # Cleaning up
 

configs/linux/mozconfig

@@ -2,15 +2,6 @@
 # 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/.
 
-# Setting the compiler based on the existence of clang bin directory
-if test -d "$HOME/.mozbuild/clang/bin"; then
-    export CC="$HOME/.mozbuild/clang/bin/clang"
-    export CXX="$HOME/.mozbuild/clang/bin/clang++"
-else
-    export CC=clang
-    export CXX=clang++
-fi
-
 if test "$ZEN_RELEASE"; then
     if test "$SURFER_COMPAT" = "x86_64"; then
         ac_add_options --target=x86_64-pc-linux

configs/windows/mozconfig

@@ -10,15 +10,14 @@ if test "$ZEN_CROSS_COMPILING"; then
   export WINEDEBUG=-all
 
   export MOZ_STUB_INSTALLER=1
-  export MOZ_PKG_FORMAT=TAR
 
   export CROSS_BUILD=1
   CROSS_COMPILE=1
 
   if test "$SURFER_COMPAT" = "aarch64"; then
-    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.50.35710/arm64/Microsoft.VC145.CRT"
+    export WIN32_REDIST_DIR="$WINSYSROOT/VC/Redist/MSVC/14.50.35710/arm64/Microsoft.VC145.CRT"
   else
-    export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.50.35710/x64/Microsoft.VC145.CRT"
+    export WIN32_REDIST_DIR="$WINSYSROOT/VC/Redist/MSVC/14.50.35710/x64/Microsoft.VC145.CRT"
   fi
 fi
 

crowdin.yml

@@ -22,3 +22,7 @@ files:
     translation: browser/browser/zen-folders.ftl
   - source: en-US/browser/browser/zen-boosts.ftl
     translation: browser/browser/zen-boosts.ftl
+  - source: en-US/browser/browser/zen-space-routing.ftl
+    translation: browser/browser/zen-space-routing.ftl
+  - source: en-US/browser/browser/zen-command-palette.ftl
+    translation: browser/browser/zen-command-palette.ftl

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Trieu el selector
 zen-boost-css-inspector = 
     .tooltiptext = Obre l'inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brillantor
-zen-bootst-color-original-saturation = Saturació original
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brillantor
+zen-boost-color-original-saturation = Saturació original
 zen-add-zap-helper = Feu clic als elements de la pàgina per <b>amagar-los</b>
 zen-remove-zap-helper = ← Feu clic per mostrar
 zen-select-this = Insereix un selector per a això

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Selektor auswählen
 zen-boost-css-inspector = 
     .tooltiptext = Inspektor öffnen
-zen-bootst-color-contrast = Kontrast
-zen-bootst-color-brightness = Helligkeit
-zen-bootst-color-original-saturation = Ausgangssättigung
+zen-boost-color-contrast = Kontrast
+zen-boost-color-brightness = Helligkeit
+zen-boost-color-original-saturation = Ausgangssättigung
 zen-add-zap-helper = Klicke auf Elemente auf der Seite, um sie mit <b>Zap</b> zu markieren
 zen-remove-zap-helper = ← Erneut klicken zum Wiederherstellen
 zen-select-this = Selektor für dieses Element einfügen

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector =
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/en-US/browser/browser/zen-command-palette.ftl

@@ -0,0 +1,36 @@
+# 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-action-toggle-compact-mode = Toggle Compact Mode
+zen-action-open-theme-picker = Open Theme Picker
+zen-action-new-split-view = New Split View
+zen-action-new-folder = New Folder
+zen-action-copy-current-url = Copy Current URL
+zen-action-settings = Settings
+zen-action-open-private-window = Open Private Window
+zen-action-open-new-window = Open New Window
+zen-action-new-blank-window = New Blank Window
+zen-action-pin-tab = Pin Tab
+zen-action-unpin-tab = Unpin Tab
+zen-action-open-space-routing = Open Space Routing
+zen-action-new-boost = New Boost
+zen-action-next-space = Next Space
+zen-action-previous-space = Previous Space
+zen-action-close-tab = Close Tab
+zen-action-reload-tab = Reload Tab
+zen-action-reload-tab-without-cache = Reload Tab Without Cache
+zen-action-next-tab = Next Tab
+zen-action-previous-tab = Previous Tab
+zen-action-capture-screenshot = Capture Screenshot
+zen-action-toggle-tabs-on-right = Toggle Tabs on right
+zen-action-add-to-essentials = Add to Essentials
+zen-action-remove-from-essentials = Remove from Essentials
+zen-action-find-in-page = Find in Page
+zen-action-manage-extensions = Manage Extensions
+zen-action-switch-to-automatic-appearance = Switch to Automatic Appearance
+zen-action-switch-to-light-mode = Switch to Light Mode
+zen-action-switch-to-dark-mode = Switch to Dark Mode
+zen-action-print = Print
+zen-action-focus-on = Focus on
+zen-action-extension = Extension

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

@@ -6,13 +6,13 @@ zen-folders-search-placeholder =
     .placeholder = Search { $folder-name }...
 
 zen-folders-panel-rename-folder =
-    .label = Rename Folder
+    .label = Rename Folder…
 
 zen-folders-panel-unpack-folder =
     .label = Unpack Folder
 
 zen-folders-new-subfolder =
-    .label = New Subfolder
+    .label = New Subfolder…
 
 zen-folders-panel-delete-folder =
     .label = Delete Folder
@@ -21,7 +21,7 @@ zen-folders-panel-convert-folder-to-space =
     .label = Convert folder to Space
 
 zen-folders-panel-change-folder-space =
-    .label = Change Space...
+    .label = Change Space
 
 zen-folders-unload-all-tooltip =
     .tooltiptext = Unload active in this folder

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

@@ -19,17 +19,23 @@ tab-context-zen-add-essential-badge = { $num } / { $max }
 tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-edit-pinned-page =
     .label =
         { $isEssential ->
-            [true] Replace Essential URL with Current
-           *[false] Replace Pinned URL with Current
+            [true] Edit Essential URL
+           *[false] Edit Pinned URL
         }
+    .accesskey = P
+tab-context-zen-replace-pinned-url-with-current =
+    .label = Replace with Current URL
     .accesskey = C
+tab-context-zen-edit-pinned-url =
+    .label = Edit…
+    .accesskey = E
 tab-context-zen-edit-title =
-    .label = Change Label...
+    .label = Change Label…
 tab-context-zen-edit-icon =
-    .label = Change 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.
@@ -55,6 +61,10 @@ zen-general-confirm =
     .label = Confirm
 
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL!
+zen-pinned-tab-url-edited = Pinned tab URL has been updated!
+zen-pinned-tab-url-invalid = That doesn't look like a valid URL.
+zen-pinned-tab-edit-url-title = Edit Pinned URL
+zen-pinned-tab-edit-url-label = Enter the URL this pinned tab should point to:
 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!
@@ -77,6 +87,8 @@ zen-icons-picker-emoji =
   .label = Emojis
 zen-icons-picker-svg =
   .label = Icons
+zen-emojis-picker-search =
+  .placeholder = Search emojis
 
 urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings

locales/en-US/browser/browser/zen-space-routing.ftl

@@ -0,0 +1,33 @@
+# 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-space-routing-settings =
+    .label = Space Routing Settings
+zen-space-routing-rulepanel-placeholder = Routes let you choose where specific sites open inside Zen. For example, you can route YouTube links to always open inside your Personal space.
+zen-space-routing-dialog-title = Space Routing Settings
+zen-space-routing-external-default = Default route for external links
+zen-space-routing-new-route = New Route
+zen-space-routing-open-in-space = Open in Space
+zen-space-routing-most-recent-space = Most recent Space
+zen-space-routing-close-button = 
+    .aria-label = Close
+    .tooltiptext = Close
+
+zen-space-routing-contains =
+    .label = Contains
+zen-space-routing-equal-to =
+    .label = Is Equal To
+zen-space-routing-regex =
+    .label = RegEx
+
+zen-space-routing-open-in = Open In
+zen-space-routing-url = URL
+
+zen-space-routing-tab-routed-toast = New tab opened in { $targetWorkspace }
+tab-context-zen-add-domain-to-sr = 
+    .label = 
+        { $tabCount ->
+            [one] Add Route for Domain
+            *[other] Add Route for Domains
+        }

locales/en-US/browser/browser/zen-vertical-tabs.ftl

@@ -20,7 +20,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .accesskey = H
 
 zen-toolbar-context-move-to-folder =
-    .label = Move to Folder...
+    .label = Move to Folder
     .accesskey = M
 
 zen-toolbar-context-new-folder =
@@ -31,7 +31,7 @@ sidebar-zen-expand =
   .label = Expand Sidebar
 
 sidebar-zen-create-new =
-  .label = Create New...
+  .label = Create New
 
 tabbrowser-unload-tab-button =
 .tooltiptext =

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

@@ -24,10 +24,10 @@ zen-workspaces-panel-context-delete =
     .accesskey = D
 
 zen-workspaces-panel-change-name =
-    .label = Change Name
+    .label = Change Name…
 
 zen-workspaces-panel-change-icon =
-    .label = Change Icon
+    .label = Change Icon…
 
 zen-workspaces-panel-context-default-profile =
     .label = Set Profile
@@ -42,7 +42,7 @@ zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 
 zen-workspaces-change-theme =
-    .label = Edit Theme
+    .label = Edit Theme…
 
 zen-workspaces-panel-context-open =
     .label = Open Workspace
@@ -72,7 +72,7 @@ zen-workspace-creation-name =
     .placeholder = Space Name
 
 zen-move-tab-to-workspace-button =
-    .label = Move To...
+    .label = Move To
     .tooltiptext = Move all tabs in this window to a Space
 
 zen-workspaces-panel-context-reorder =

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Escoger selector
 zen-boost-css-inspector = 
     .tooltiptext = Abrir inspector
-zen-bootst-color-contrast = Contraste
-zen-bootst-color-brightness = Brillo
-zen-bootst-color-original-saturation = Saturación original
+zen-boost-color-contrast = Contraste
+zen-boost-color-brightness = Brillo
+zen-boost-color-original-saturation = Saturación original
 zen-add-zap-helper = Haga clic en los elementos de la página para <b>borrarlos</b>
 zen-remove-zap-helper = ← Clic para deshacer
 zen-select-this = Insertar selector para esto

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/eu/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

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

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/fr/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Choisir le sélecteur
 zen-boost-css-inspector = 
     .tooltiptext = Ouvrir l'inspecteur
-zen-bootst-color-contrast = Contraste
-zen-bootst-color-brightness = Luminosité
-zen-bootst-color-original-saturation = Saturation originale
+zen-boost-color-contrast = Contraste
+zen-boost-color-brightness = Luminosité
+zen-boost-color-original-saturation = Saturation originale
 zen-add-zap-helper = Cliquez sur des éléments de la page pour les <b>zapper</b>
 zen-remove-zap-helper = ← Cliquez pour démasquer
 zen-select-this = Insérer un sélecteur pour ceci

locales/ga-IE/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Roghnóir Roghnaigh
 zen-boost-css-inspector = 
     .tooltiptext = Oscail an Cigire
-zen-bootst-color-contrast = Codarsnacht
-zen-bootst-color-brightness = Gile
-zen-bootst-color-original-saturation = Sáithiú Bunaidh
+zen-boost-color-contrast = Codarsnacht
+zen-boost-color-brightness = Gile
+zen-boost-color-original-saturation = Sáithiú Bunaidh
 zen-add-zap-helper = Cliceáil ar eilimintí ar an leathanach chun iad a <b>Zapáil</b>
 zen-remove-zap-helper = ← Cliceáil chun Dízipáil
 zen-select-this = Cuir roghnóir isteach don seo

locales/he/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = ניגודיות
-zen-bootst-color-brightness = בהירות
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = ניגודיות
+zen-boost-color-brightness = בהירות
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/hu/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Vizsgáló megnyitása
-zen-bootst-color-contrast = Kontraszt
-zen-bootst-color-brightness = Fényerő
-zen-bootst-color-original-saturation = Eredeti szaturáció
+zen-boost-color-contrast = Kontraszt
+zen-boost-color-brightness = Fényerő
+zen-boost-color-original-saturation = Eredeti szaturáció
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/id/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/is/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Veljari
 zen-boost-css-inspector = 
     .tooltiptext = Opna rýni
-zen-bootst-color-contrast = Birtuskil
-zen-bootst-color-brightness = Birtustig
-zen-bootst-color-original-saturation = Upprunaleg litmettun
+zen-boost-color-contrast = Birtuskil
+zen-boost-color-brightness = Birtustig
+zen-boost-color-original-saturation = Upprunaleg litmettun
 zen-add-zap-helper = Smelltu á atriði á síðunni til að <b>einangra</b> þau (zap)
 zen-remove-zap-helper = ← Smelltu til að taka úr einangrun
 zen-select-this = Setja inn veljara fyrir þetta

locales/it/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/ja/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = セレクターを選択
 zen-boost-css-inspector = 
     .tooltiptext = インスペクタを開く
-zen-bootst-color-contrast = コントラスト
-zen-bootst-color-brightness = 明るさ
-zen-bootst-color-original-saturation = 元の彩度
+zen-boost-color-contrast = コントラスト
+zen-boost-color-brightness = 明るさ
+zen-boost-color-original-saturation = 元の彩度
 zen-add-zap-helper = <b>Zap</b> にページ上の要素をクリックします
 zen-remove-zap-helper = ←クリックして解除
 zen-select-this = このセレクターを挿入

locales/ko/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = 선택자 선택
 zen-boost-css-inspector = 
     .tooltiptext = 검사기 열기
-zen-bootst-color-contrast = 대비
-zen-bootst-color-brightness = 밝기
-zen-bootst-color-original-saturation = 원본 채도
+zen-boost-color-contrast = 대비
+zen-boost-color-brightness = 밝기
+zen-boost-color-original-saturation = 원본 채도
 zen-add-zap-helper = 페이지 내의 요소를 클릭해서 <b>날려</b>버리세요
 zen-remove-zap-helper = ← 클릭하여 되살리기
 zen-select-this = 이 요소의 선택자 삽입

locales/lt/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Kontrastas
-zen-bootst-color-brightness = Šviesumas
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Kontrastas
+zen-boost-color-brightness = Šviesumas
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/nb/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Velgselektor
 zen-boost-css-inspector = 
     .tooltiptext = Åpne inspektør
-zen-bootst-color-contrast = Kontrast
-zen-bootst-color-brightness = Lysstyrke
-zen-bootst-color-original-saturation = Opprinnelig fargemetning
+zen-boost-color-contrast = Kontrast
+zen-boost-color-brightness = Lysstyrke
+zen-boost-color-original-saturation = Opprinnelig fargemetning
 zen-add-zap-helper = Klikk elementer på siden for å <b>Zappe</b> dem
 zen-remove-zap-helper = ← Klikk for å avzappe
 zen-select-this = Sett inn slektor for dette

locales/nl/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/nn-NO/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/pl/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Wybierz selektor
 zen-boost-css-inspector = 
     .tooltiptext = Otwórz Inspektor
-zen-bootst-color-contrast = Kontrast
-zen-bootst-color-brightness = Jasność
-zen-bootst-color-original-saturation = Oryginalne nasycenie
+zen-boost-color-contrast = Kontrast
+zen-boost-color-brightness = Jasność
+zen-boost-color-original-saturation = Oryginalne nasycenie
 zen-add-zap-helper = Kliknij elementy na stronie, aby je <b>ukryć</b>
 zen-remove-zap-helper = ← Kliknij, aby cofnąć ukrycie
 zen-select-this = Wstaw selektor dla tego elementu

locales/pt-BR/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Ferramenta de Seleção
 zen-boost-css-inspector = 
     .tooltiptext = Abrir Inspetor
-zen-bootst-color-contrast = Contraste
-zen-bootst-color-brightness = Brilho
-zen-bootst-color-original-saturation = Saturação Original
+zen-boost-color-contrast = Contraste
+zen-boost-color-brightness = Brilho
+zen-boost-color-original-saturation = Saturação Original
 zen-add-zap-helper = Clique em elementos da página para dar um <b>Zap</b> neles
 zen-remove-zap-helper = Clique para Deszapar
 zen-select-this = Inserir seletor para isto

locales/pt-PT/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/ro/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/ru/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/sk/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/sv-SE/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Välj väljare
 zen-boost-css-inspector = 
     .tooltiptext = Öppna inspektör
-zen-bootst-color-contrast = Kontrast
-zen-bootst-color-brightness = Ljusstyrka
-zen-bootst-color-original-saturation = Ursprunglig mättnad
+zen-boost-color-contrast = Kontrast
+zen-boost-color-brightness = Ljusstyrka
+zen-boost-color-original-saturation = Ursprunglig mättnad
 zen-add-zap-helper = Klicka på element på sidan för att <b>zappa</b> dem
 zen-remove-zap-helper = ← Klicka för att avzappa
 zen-select-this = Infoga väljare för detta

locales/th/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Pick Selector
 zen-boost-css-inspector = 
     .tooltiptext = Open Inspector
-zen-bootst-color-contrast = Contrast
-zen-bootst-color-brightness = Brightness
-zen-bootst-color-original-saturation = Original Saturation
+zen-boost-color-contrast = Contrast
+zen-boost-color-brightness = Brightness
+zen-boost-color-original-saturation = Original Saturation
 zen-add-zap-helper = Click elements on the page to <b>Zap</b> them
 zen-remove-zap-helper = ← Click to Unzap
 zen-select-this = Insert selector for this

locales/tr/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Seçici seç
 zen-boost-css-inspector = 
     .tooltiptext = Denetleyiciyi aç
-zen-bootst-color-contrast = Kontrast
-zen-bootst-color-brightness = Parlaklık
-zen-bootst-color-original-saturation = Orijinal doygunluk
+zen-boost-color-contrast = Kontrast
+zen-boost-color-brightness = Parlaklık
+zen-boost-color-original-saturation = Orijinal doygunluk
 zen-add-zap-helper = Sayfadaki ögelere tıklayarak onları <b>Zap</b> ile kaldırın
 zen-remove-zap-helper = ← Unzap için tıklayın
 zen-select-this = Bu öge için seçici ekle

locales/uk/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Вибір селектора
 zen-boost-css-inspector = 
     .tooltiptext = Відкрити інспектора
-zen-bootst-color-contrast = Контраст
-zen-bootst-color-brightness = Яскравість
-zen-bootst-color-original-saturation = Оригінальна насиченість
+zen-boost-color-contrast = Контраст
+zen-boost-color-brightness = Яскравість
+zen-boost-color-original-saturation = Оригінальна насиченість
 zen-add-zap-helper = Клацніть на елементи на сторінці, щоби <b>сховати</b> їх
 zen-remove-zap-helper = ← Клацніть, аби знову показати
 zen-select-this = Вставити селектор для цього

locales/vi/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = Chọn phần tử
 zen-boost-css-inspector = 
     .tooltiptext = Mở trình kiểm tra
-zen-bootst-color-contrast = Độ tương phản
-zen-bootst-color-brightness = Độ sáng
-zen-bootst-color-original-saturation = Độ bão hòa gốc
+zen-boost-color-contrast = Độ tương phản
+zen-boost-color-brightness = Độ sáng
+zen-boost-color-original-saturation = Độ bão hòa gốc
 zen-add-zap-helper = Nhấp vào các phần tử trên trang để <b>Khử</b> chúng
 zen-remove-zap-helper = ← Nhấp để khôi phục
 zen-select-this = Nhập bộ chọn cho phần tử này

locales/zh-CN/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = 选取选择器
 zen-boost-css-inspector = 
     .tooltiptext = 打开查看器
-zen-bootst-color-contrast = 对比度
-zen-bootst-color-brightness = 亮度
-zen-bootst-color-original-saturation = 初始饱和度
+zen-boost-color-contrast = 对比度
+zen-boost-color-brightness = 亮度
+zen-boost-color-original-saturation = 初始饱和度
 zen-add-zap-helper = 点击页面上的元素以将其<b>屏蔽</b>
 zen-remove-zap-helper = ← 点击以取消屏蔽
 zen-select-this = 插入此元素的选择器

locales/zh-TW/browser/browser/zen-boosts.ftl

@@ -29,9 +29,9 @@ zen-boost-css-picker =
     .tooltiptext = 汲取選擇器
 zen-boost-css-inspector = 
     .tooltiptext = 開啟檢測器
-zen-bootst-color-contrast = 對比
-zen-bootst-color-brightness = 亮度
-zen-bootst-color-original-saturation = 飽和度
+zen-boost-color-contrast = 對比
+zen-boost-color-brightness = 亮度
+zen-boost-color-original-saturation = 飽和度
 zen-add-zap-helper = 選擇要 <b>Zap</b>的元素
 zen-remove-zap-helper = ← 按此取消zap
 zen-select-this = 加入此元素的選擇器

package-lock.json

@@ -19,14 +19,6 @@
         "typescript": "^5.9.3"
       }
     },
-    "engine/tools/lint/eslint/eslint-plugin-spidermonkey-js": {
-      "extraneous": true,
-      "license": "MPL-2.0",
-      "devDependencies": {},
-      "engines": {
-        "node": ">=6.9.1"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -1923,17 +1915,17 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -2169,9 +2161,9 @@
       "license": "ISC"
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2390,10 +2382,20 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
+      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -4223,14 +4225,6 @@
       "engines": {
         "node": ">=0.8"
       }
-    },
-    "tools/eslint-plugin-spidermonkey-js": {
-      "extraneous": true,
-      "license": "MPL-2.0",
-      "devDependencies": {},
-      "engines": {
-        "node": ">=6.9.1"
-      }
     }
   }
 }

package.json

@@ -28,7 +28,7 @@
     "surfer": "surfer",
     "test": "python3 scripts/run_tests.py",
     "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
-    "test:gtest": "cd engine && ./mach gtest",
+    "test:gtest": "cd engine && ./mach gtest Zen*",
     "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
     "lc": "surfer license-check",
     "lc:fix": "surfer license-check --fix",

prefs/firefox/ai.yaml

@@ -23,3 +23,6 @@
 
 - name: browser.ml.linkPreview.enabled
   value: false
+
+- name: browser.preferences.aiControls
+  value: false

prefs/firefox/browser.yaml

@@ -94,3 +94,8 @@
 # See gh-12985 for details on the following preferences
 - name: browser.search.widget.new
   value: true
+
+# Disabled from https://searchfox.org/firefox-main/rev/d6bfff43852356ca98af848b4705d37f8d41856f/modules/libpref/init/StaticPrefList.yaml#2008
+# Only enabled for windows, doesn't really fit inside Zen.
+- name: browser.startup.preXulSkeletonUI
+  value: false

prefs/zen/sync.yaml

@@ -0,0 +1,12 @@
+# 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/.
+
+- name: services.sync.engine.spaces
+  value: true
+  condition: "@IS_TWILIGHT@"
+
+- name: services.sync.engine.spaces
+  value: false
+  locked: true
+  condition: "!@IS_TWILIGHT@"

prefs/zen/windows.yaml

@@ -7,10 +7,6 @@
   value: true
   condition: "defined(XP_WIN)"
 
-- name: widget.windows.mica.popups
-  value: true
-  condition: "defined(XP_WIN)"
-
 # 1 = DWMSBT_MAINWINDOW
 # 2 = DWMSBT_TRANSIENTWINDOW (default, also used for popups)
 # 3 = DWMSBT_TABBEDWINDOW

prefs/zen/workspaces.yaml

@@ -32,9 +32,6 @@
 - name: zen.workspaces.scroll-modifier-key
   value: ctrl
 
-- name: services.sync.engine.workspaces
-  value: false
-
 - name: zen.workspaces.separate-essentials
   value: true
 

src/-prettierignore.patch

@@ -1,8 +1,8 @@
 diff --git a/.prettierignore b/.prettierignore
-index de2efe413e5696a3b8d0467a3a9e668dfadd8a1a..01c76d8e639d5630fca9cccb55d415fc4e903e91 100644
+index 949896ff064ae0b54b6a657ea074bc88e12820f7..5249f420972667bece4d85fe8d35073afaebeb8a 100644
 --- a/.prettierignore
 +++ b/.prettierignore
-@@ -1805,3 +1805,12 @@ tools/ts/test/baselines/
+@@ -1803,3 +1803,12 @@ tools/ts/test/baselines/
  try_task_config.json
  xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
  **/package-lock.json

src/-stylelintrc-js.patch

@@ -1,5 +1,5 @@
 diff --git a/.stylelintrc.js b/.stylelintrc.js
-index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb72433976b2c 100644
+index b484bf6600a7e1b8ad2aed8c8b7fe5e84cc3d023..f89712e2c13dfa0bcb48e55cd3872c67f5c98dad 100644
 --- a/.stylelintrc.js
 +++ b/.stylelintrc.js
 @@ -67,7 +67,7 @@ module.exports = {
@@ -11,9 +11,9 @@ index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb724
        {
          ignore: ["blockless-at-rules"],
        },
-@@ -274,7 +274,7 @@ module.exports = {
-     // Remove this line setting `csscontrols/use-logical` to null after implementing fixes
-     "csstools/use-logical": null,
+@@ -280,7 +280,7 @@ module.exports = {
+     "media-query-no-invalid": null,
+     "stylelint-plugin-mozilla/media-query-no-invalid": true,
      "stylelint-plugin-mozilla/no-base-design-tokens": true,
 -    "stylelint-plugin-mozilla/use-design-tokens": true,
 +    "stylelint-plugin-mozilla/use-design-tokens": false,

src/browser/actors/EncryptedMediaParent-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs
-index 492dce93d3cc7c6ec16db047c9e47b175ef3a0fe..757e5543e0e6900c414db6d7a96d511608c1e50a 100644
+index 8bdeba9b8803354e23a3881147fee6a6af94a63b..61c8407df1fbebcc36481ad2169a9c103b4faed5 100644
 --- a/browser/actors/EncryptedMediaParent.sys.mjs
 +++ b/browser/actors/EncryptedMediaParent.sys.mjs
 @@ -199,6 +199,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {

src/browser/actors/WebRTCParent-sys-mjs.patch

@@ -1,12 +1,12 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index b743bd83529c4cd01a6bc820967186dbe41b6144..e24c48bac0f4ae3d4b26087b7e0cac7910019d0e 100644
+index 98b10b1d789c20b3463de4f703af102f6908318b..29534480fbeda6d66cb9dab81afdaed8d8a5c565 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
 @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
  
-     let tabbrowser = browser.ownerGlobal.gBrowser;
+     let tabbrowser = browser.documentGlobal.gBrowser;
      if (tabbrowser) {
-+      browser.ownerGlobal.gZenMediaController.updateMediaSharing(state);
++      browser.documentGlobal.gZenMediaController.updateMediaSharing(state);
        tabbrowser.updateBrowserSharing(browser, {
          webRTC: state,
        });

src/browser/base/content/aboutDialog-css.patch

@@ -0,0 +1,18 @@
+diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
+index 017125bc2510e5f5e317a5e78c40d6aa9ded76ca..d343d8c62a2251e3c3a33ae8f2ab9c4c68218c22 100644
+--- a/browser/base/content/aboutDialog.css
++++ b/browser/base/content/aboutDialog.css
+@@ -135,6 +135,13 @@
+   margin: 0 40px;
+ }
+ 
++#trademark {
++  font-size: xx-small;
++  text-align: center;
++  margin-block: 10px;
++  color: var(--text-color-deemphasized);
++}
++
+ #currentChannel {
+   margin: 0;
+   padding: 0;

src/browser/base/content/aboutDialog-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index c64980810570fcea84e33fdc2d66ac42a79f4e46..aa629ebb38a9aa74048fe3fc759f716fad57d6f3 100644
+index 3ffd464b960a4299a7dd0cd87e4fc2f781b9d593..7a831c8ee2b73bb89bf8a82ac24958b55c16a5aa 100644
 --- a/browser/base/content/aboutDialog.xhtml
 +++ b/browser/base/content/aboutDialog.xhtml
 @@ -102,10 +102,6 @@
@@ -39,8 +39,8 @@ index c64980810570fcea84e33fdc2d66ac42a79f4e46..aa629ebb38a9aa74048fe3fc759f716f
          <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
 -        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
 -        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>
-+        <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottomLinks-rights"/>
-+        <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
++        <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottom-links-terms"/>
++        <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottom-links-privacy"/>
        </hbox>
        <description id="trademark" data-l10n-id="trademarkInfo"></description>
      </vbox>

src/browser/base/content/browser-addons-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05f45bce08 100644
+index 56acad9b7c21c07842f901d24525a97a0ba20217..829054218dc6fbb14fe034546e8da62b12516eae 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1060,7 +1060,7 @@ var gXPInstallObserver = {
@@ -20,7 +20,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
        },
      };
  
-@@ -2209,7 +2209,7 @@ var gUnifiedExtensions = {
+@@ -2214,7 +2214,7 @@ var gUnifiedExtensions = {
    // If the new ID is not added in NOTIFICATION_IDS, consider handling the case
    // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
    getPopupAnchorID(aBrowser, aWindow) {
@@ -29,7 +29,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      const attr = anchorID + "popupnotificationanchor";
  
      if (!aBrowser[attr]) {
-@@ -2220,7 +2220,7 @@ var gUnifiedExtensions = {
+@@ -2225,7 +2225,7 @@ var gUnifiedExtensions = {
          anchorID
          // Anchor on the toolbar icon to position the popup right below the
          // button.
@@ -38,7 +38,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      }
  
      return anchorID;
-@@ -2545,7 +2545,7 @@ var gUnifiedExtensions = {
+@@ -2550,7 +2550,7 @@ var gUnifiedExtensions = {
      requestAnimationFrame(() => this.updateAttention());
    },
  
@@ -47,7 +47,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      // A list of extension widget IDs (possibly empty).
      let widgetIDs;
  
-@@ -2559,7 +2559,7 @@ var gUnifiedExtensions = {
+@@ -2564,7 +2564,7 @@ var gUnifiedExtensions = {
      }
  
      // The list of overflowed extensions in the extensions panel.
@@ -56,7 +56,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
        "#overflowed-extensions-list"
      );
  
-@@ -2660,37 +2660,41 @@ var gUnifiedExtensions = {
+@@ -2665,37 +2665,41 @@ var gUnifiedExtensions = {
        );
        template.replaceWith(template.content);
        this._panel = document.getElementById("unified-extensions-panel");
@@ -123,7 +123,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      if (!CustomizationHandler.isCustomizing()) {
        if (aEvent) {
          if (
-@@ -2712,6 +2716,7 @@ var gUnifiedExtensions = {
+@@ -2717,6 +2721,7 @@ var gUnifiedExtensions = {
          // and no alternative content is available for display in the panel.
          const policies = this.getActivePolicies();
          if (
@@ -131,7 +131,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
            policies.length &&
            !this.hasExtensionsInPanel(policies) &&
            !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2727,32 +2732,30 @@ var gUnifiedExtensions = {
+@@ -2732,32 +2737,30 @@ var gUnifiedExtensions = {
        this.blocklistAttentionInfo =
          await AddonManager.getBlocklistAttentionInfo();
  
@@ -170,7 +170,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
            triggerEvent: aEvent,
          });
        }
-@@ -2947,18 +2950,20 @@ var gUnifiedExtensions = {
+@@ -2952,18 +2955,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  

src/browser/base/content/browser-box-inc-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index d58fcdf99843d110b708f3fbf9fb317787fadfcf..cfc2aad902641609c3804e615c4cb66ce65299b7 100644
+index 4a16fe93daeefb88af024c1dac05bc1f518c3fcb..a420768e4047937c8becefb69c1017e13fc12231 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
 @@ -3,12 +3,22 @@
@@ -10,7 +10,7 @@ index d58fcdf99843d110b708f3fbf9fb317787fadfcf..cfc2aad902641609c3804e615c4cb66c
 +  <html:div id="zen-browser-background" class="zen-browser-generic-background">
 +    <html:div class="zen-browser-grain" />
 +  </html:div>
-   <box context="sidebar-context-menu" id="sidebar-main" hidden="true">
+   <box context="sidebar-context-menu" id="sidebar-container" class="chrome-block" hidden="true">
      <html:sidebar-main flex="1">
        <box id="vertical-tabs" slot="tabstrip" customizable="true" contextmenu="toolbar-context-menu"></box>
      </html:sidebar-main>
@@ -22,7 +22,7 @@ index d58fcdf99843d110b708f3fbf9fb317787fadfcf..cfc2aad902641609c3804e615c4cb66c
 +  </html:div>
 +<hbox id="zen-tabbox-wrapper" flex="1">
 +  <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
-   <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
+   <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome chrome-block">
      <box id="sidebar-header" align="center">
        <toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
 @@ -25,7 +35,7 @@

src/browser/base/content/browser-commands-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de71d7c8e3 100644
+index 87148c353ee852248e887e3ae31d46bcbee1cd11..91b1d5a8e0e512dd50139f99ad3e3ba7bade80fb 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
 @@ -13,6 +13,10 @@ var BrowserCommands = {
@@ -13,7 +13,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
        try {
          gBrowser.goBack();
        } catch (ex) {}
-@@ -234,6 +238,10 @@ var BrowserCommands = {
+@@ -230,6 +234,10 @@ var BrowserCommands = {
        }
      }
  
@@ -24,7 +24,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -318,6 +326,14 @@ var BrowserCommands = {
+@@ -346,6 +354,14 @@ var BrowserCommands = {
        return;
      }
  
@@ -39,7 +39,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -325,8 +341,8 @@ var BrowserCommands = {
+@@ -353,8 +369,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {

src/browser/base/content/browser-fullScreenAndPointerLock-js.patch

@@ -1,12 +1,12 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index 1eaf79a4f6788c518a4759bbce81175fd5fba220..6fde5e944ad4a847180ca83a9e6f4fde20aa7b42 100644
+index d0d3b6fc57800b073bb1c75f6e55212749815b0a..f3d5790eed58f1cb9a36229582e0fa00f3668962 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -501,8 +501,6 @@ var FullScreen = {
-     // don't need that kind of precision in our CSS.
+@@ -502,8 +502,6 @@ var FullScreen = {
      shiftSize = shiftSize.toFixed(2);
      let translate = shiftSize > 0 ? `0 ${shiftSize}px` : "";
--    document.body.style.translate = translate;
+     gNavToolbox.classList.toggle("fullscreen-floating-toolbox", shiftSize > 0);
+-    gNavToolbox.style.translate = translate;
 -    gURLBar.style.translate = gURLBar.hasAttribute("breakout") ? translate : "";
      let searchbar = document.getElementById("searchbar-new");
      if (searchbar) {

src/browser/base/content/browser-gestureSupport-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
-index a28d54bf72c0e6495b9586f220d1859aac794936..411d7255a68c48643617d77cc279a0a831fdf5c9 100644
+index f94b39d26a1a9626b3e1f518e2395bc394d1262d..15e198f4bb440cff0bbfb8ccd97c2ce180d5724f 100644
 --- a/browser/base/content/browser-gestureSupport.js
 +++ b/browser/base/content/browser-gestureSupport.js
 @@ -247,6 +247,10 @@ var gGestureSupport = {
@@ -13,7 +13,7 @@ index a28d54bf72c0e6495b9586f220d1859aac794936..411d7255a68c48643617d77cc279a0a8
      return canGoBack || canGoForward;
    },
  
-@@ -832,7 +836,7 @@ var gHistorySwipeAnimation = {
+@@ -848,7 +852,7 @@ var gHistorySwipeAnimation = {
     * @return true if there is a previous page in history, false otherwise.
     */
    canGoBack: function HSA_canGoBack() {

src/browser/base/content/browser-init-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1caf50df1 100644
+index 0aa4baea8e5e6d742fc6cd3333068e7eb64b5bbc..057bb2386420edd31154979338e71d00a51a7266 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -302,6 +302,7 @@ var gBrowserInit = {
+@@ -307,6 +307,7 @@ var gBrowserInit = {
    },
  
    onLoad() {
@@ -10,7 +10,7 @@ index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
        PopupAndRedirectBlockerObserver.handleEvent(e)
      );
-@@ -496,6 +497,7 @@ var gBrowserInit = {
+@@ -501,6 +502,7 @@ var gBrowserInit = {
  
      this._handleURIToLoad();
  

src/browser/base/content/browser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2616b2946 100644
+index 1026474bb1bc026987be01a8c18fa0927cb911bc..60294e0587147d86ace8e6d6985d8c6eae8248b6 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -34,6 +34,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -24,7 +24,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
      if (backDisabled) {
        backCommand.removeAttribute("disabled");
      } else {
-@@ -3715,7 +3721,7 @@ function warnAboutClosingWindow() {
+@@ -3719,7 +3725,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -33,7 +33,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3755,7 +3761,7 @@ function warnAboutClosingWindow() {
+@@ -3759,7 +3765,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3780,7 +3786,7 @@ function warnAboutClosingWindow() {
+@@ -3784,7 +3790,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -51,13 +51,20 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4720,6 +4726,9 @@ var ConfirmationHint = {
+@@ -4744,6 +4750,16 @@ var ConfirmationHint = {
      }
  
-     document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
+     document.l10n.setAttributes(this._message, messageId, l10nArgs);
 +    if (window.gZenUIManager?.showToast) {
-+      return window.gZenUIManager.showToast(messageId, options);
++      return window.gZenUIManager.showToast(messageId, {
++        hideCheckmark,
++        descriptionId,
++        l10nArgs,
++        showDescription,
++        position,
++        event,
++      });
 +    }
-     if (options.descriptionId) {
-       document.l10n.setAttributes(this._description, options.descriptionId);
+     if (descriptionId) {
+       document.l10n.setAttributes(this._description, descriptionId);
        this._description.hidden = false;

src/browser/base/content/browser-places-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c693951214098b644f7 100644
+index b04e9afe4041b9bcd62527a22f468b84bf0de5d9..9e20e5a9d58fb6752037708f3d1404e00c98b132 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
-@@ -261,6 +261,8 @@ var StarUI = {
+@@ -262,6 +262,8 @@ var StarUI = {
        });
      }
  
@@ -11,7 +11,7 @@ index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c6939512140
      let onPanelReady = fn => {
        let target = this.panel;
        if (target.parentNode) {
-@@ -312,6 +314,21 @@ var StarUI = {
+@@ -313,6 +315,21 @@ var StarUI = {
      }
    },
  
@@ -33,7 +33,7 @@ index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c6939512140
    removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
      this._removeBookmarksOnPopupHidden = true;
      this.panel.hidePopup();
-@@ -1815,6 +1832,7 @@ var BookmarkingUI = {
+@@ -1841,6 +1858,7 @@ var BookmarkingUI = {
        document.getElementById("context-bookmarkpage"),
        PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
        document.getElementById("pageAction-panel-bookmark"),

src/browser/base/content/browser-profiles-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-profiles.js b/browser/base/content/browser-profiles.js
-index fb260896c14b90734182d2f232e33350287f0209..9984a2d18dfd33e3606adac0e8c5f80f7e35e682 100644
+index 35a5fd0c320cdf3cdf42442881d71e5ee6dc865d..6ef175f27c614f74ad32ecefb2854e3b9fc01d13 100644
 --- a/browser/base/content/browser-profiles.js
 +++ b/browser/base/content/browser-profiles.js
 @@ -70,6 +70,7 @@ var gProfiles = {

src/browser/base/content/browser-sets-inc-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.inc.xhtml b/browser/base/content/browser-sets.inc.xhtml
-index 1263856344c4613ea58639a64e747fd0c3f771f7..c83ed7dd6a2482354c5bd37ce2e2cbf88ee6cf60 100644
+index 65ee617216d8a69f29b06fb48078f53a42bd9da7..3373d1a44281496555ab5a256020dd16afa4b823 100644
 --- a/browser/base/content/browser-sets.inc.xhtml
 +++ b/browser/base/content/browser-sets.inc.xhtml
-@@ -418,3 +418,4 @@
+@@ -420,3 +420,4 @@
           internal="true"/>
  #endif
    </keyset>

src/browser/base/content/browser-siteIdentity-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index cff28e1cdb550357662e8a7a41856e80b1de0018..9d569c1a1e6249c58a1e30fbb224c316c52ef204 100644
+index c6d060853cd3dab9d5c02bdc8de707b8fbde4b6d..bb3856be183f815f105a1175b71ee9b3a61c2f65 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
 @@ -464,11 +464,6 @@ var gIdentityHandler = {
@@ -14,7 +14,7 @@ index cff28e1cdb550357662e8a7a41856e80b1de0018..9d569c1a1e6249c58a1e30fbb224c316
  
      let baseDomain = SiteDataManager.getBaseDomainFromHost(this._uri.host);
      if (SiteDataManager.promptSiteDataRemoval(window, [baseDomain])) {
-@@ -853,7 +848,7 @@ var gIdentityHandler = {
+@@ -860,7 +855,7 @@ var gIdentityHandler = {
        // This is a secure internal Firefox page.
        this._identityBox.className = "chromeUI";
        let brandBundle = document.getElementById("bundle_brand");
@@ -23,7 +23,7 @@ index cff28e1cdb550357662e8a7a41856e80b1de0018..9d569c1a1e6249c58a1e30fbb224c316
      } else if (this._pageExtensionPolicy) {
        // This is a WebExtension page.
        this._identityBox.className = "extensionPage";
-@@ -1196,6 +1191,12 @@ var gIdentityHandler = {
+@@ -1198,6 +1193,12 @@ var gIdentityHandler = {
        }
      }
  

src/browser/base/content/main-popupset-inc-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 81b3d0a744b9f40358219696e0e52a8114c53e83..71eb93e50f19af1d8f44fb425970cc87416c84a3 100644
+index ded45fd53f0fd7f0a48283d61cffdda20f79137e..7fc34d89146b723cb01a1432bc1d1fe97e5d2eba 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -235,6 +235,10 @@
+@@ -234,6 +234,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 81b3d0a744b9f40358219696e0e52a8114c53e83..71eb93e50f19af1d8f44fb425970cc87
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -260,6 +264,7 @@
+@@ -259,6 +263,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
@@ -21,7 +21,7 @@ index 81b3d0a744b9f40358219696e0e52a8114c53e83..71eb93e50f19af1d8f44fb425970cc87
      </panel>
    </html:template>
  
-@@ -699,6 +704,8 @@
+@@ -765,6 +770,8 @@
  
  #include popup-notifications.inc.xhtml
  

src/browser/base/content/navigator-toolbox-inc-xhtml.patch

@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f087bbfcf 100644
+index e7e94e13a990c154fb54bda4a3420ca00bdac009..8253b7d403734973729a5982cceafc12bab24f54 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
  # 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/.
  
--<toolbox id="navigator-toolbox">
-+<toolbox id="navigator-toolbox" persist="width style">
+-<toolbox id="navigator-toolbox" class="chrome-block">
++<toolbox id="navigator-toolbox" class="chrome-block" persist="width style">
    <script src="chrome://browser/content/navigator-toolbox.js" />
  
    <!-- Menu -->

src/browser/base/content/navigator-toolbox-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644
+index 10faff18ca0c6df472de81b5dbdba83309fa2eb8..b675df9ad22150f5a1060dedbabf6cb27c951619 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -37,15 +37,15 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          case "back-button":
          case "forward-button":
          case "reload-button":
-@@ -329,6 +341,7 @@ document.addEventListener(
+@@ -331,6 +343,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
          #unified-extensions-button,
 +        #zen-site-data-icon-button,
          #library-button,
+         #ipprotection-button,
          #split-view-button,
-         #smartwindow-ask-button
-@@ -413,6 +426,16 @@ document.addEventListener(
+@@ -416,6 +429,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  

src/browser/base/content/nsContextMenu-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 97cb36e2ed48d00454e169fb0470b47ac994b883..1811a92885620c8a916937f467ebb7d0eb0d3a0e 100644
+index a9173d534626f18adcbfe570cbcdc0cd929cc31d..e09340242048a21ce6b3bd4d26bedc606354235e 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -369,6 +369,9 @@ export class nsContextMenu {
+@@ -373,6 +373,9 @@ export class nsContextMenu {
      this.initTextFragmentItems();
      this.pdfjsContextMenu.initItems();
  

src/browser/base/content/zen-assets.jar.inc.mn

@@ -20,3 +20,4 @@
 #include ../../../zen/fonts/jar.inc.mn
 #include ../../../zen/boosts/jar.inc.mn
 #include ../../../zen/live-folders/jar.inc.mn
+#include ../../../zen/space-routing/jar.inc.mn

src/browser/base/content/zen-commands.inc.xhtml

@@ -35,12 +35,14 @@
   <command id="cmd_zenToggleTabsOnRight" />
 
   <command id="cmd_zenReplacePinnedUrlWithCurrent" />
+  <command id="cmd_zenEditPinnedUrl" />
   <command id="cmd_contextZenAddToEssentials" />
   <command id="cmd_contextZenRemoveFromEssentials" />
 
   <command id="cmd_zenCtxDeleteWorkspace" />
   <command id="cmd_zenUnloadWorkspace" />
   <command id="cmd_zenUnloadAllOtherWorkspace" />
+  <command id="cmd_zenOpenSpaceRoutingSettings" />
   <command id="cmd_zenChangeWorkspaceName" />
   <command id="cmd_zenChangeWorkspaceIcon" />
   <command id="cmd_zenReorderWorkspaces" />

src/browser/base/content/zen-locales.inc.xhtml

@@ -11,4 +11,5 @@
 <link rel="localization" href="browser/zen-folders.ftl"/>
 <link rel="localization" href="browser/zen-boosts.ftl"/>
 <link rel="localization" href="browser/zen-live-folders.ftl"/>
+<link rel="localization" href="browser/zen-space-routing.ftl"/>
 </linkset>

src/browser/base/content/zen-panels/emojis-picker.inc

@@ -14,7 +14,7 @@
   <hbox id="PanelUI-zen-emojis-picker-pages">
     <vbox emojis="true">
       <hbox id="PanelUI-zen-emojis-picker-header">
-        <html:input type="search" id="PanelUI-zen-emojis-picker-search" placeholder="Search emojis" />
+        <html:input type="search" id="PanelUI-zen-emojis-picker-search" data-l10n-id="zen-emojis-picker-search" />
       </hbox>
       <hbox id="PanelUI-zen-emojis-picker-list" />
     </vbox>

src/browser/base/content/zen-panels/folders-search.inc

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <panel id="zen-folder-tabs-popup"
-    nonnativepopover="true"
+    nonnative=""
     type="arrow"
     orient="vertical"
     side="left"

src/browser/base/content/zen-panels/popups.inc

@@ -33,6 +33,8 @@
   <menuseparator/>
   <menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation"/>
   <menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete" command="cmd_zenCtxDeleteWorkspace"/>
+  <menuseparator/>
+  <menuitem id="context_zenSpaceRoutingSettings" data-l10n-id="zen-space-routing-settings" command="cmd_zenOpenSpaceRoutingSettings"/>
 </menupopup>
 
 <menupopup id="zenFolderActions">

src/browser/base/jar-mn.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index 7eaca95f7e876809552da5a3af3449b7e7b1a34d..00f1e3047c59565c8830a40da3a85f3b228f7c93 100644
+index dd0f873535224344c8015d00a00d56e0b9392951..fcc013514836f2e26ea5c4cef2aa443f0368a3e6 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -110,3 +110,5 @@ browser.jar:
+@@ -108,3 +108,5 @@ browser.jar:
  
  # L10n resources and overrides.
  % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties

src/browser/base/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 286e17552e2ab2d7e44c6ba99c84630cadd24e94..076f813aea971db1e1c1429fc0b64c1784a22722 100644
+index 33b90b64e2773efdb0376779907b6ef7125c0fff..8446118edb56260a59115b048dde087a50805a62 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -78,3 +78,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -79,3 +79,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
  DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]

src/browser/components/BrowserContentHandler-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 430c6877c81824d8ab318cacc997d4eda4cb6a11..e8a195e1fe09952b90a0d73d13c6c15da2006bd4 100644
+index 4bfb4199dafac004486dfc61db954173742a010a..542c156432b9d7c2190c0d14ce9cfd09814422bf 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
 @@ -603,6 +603,28 @@ nsBrowserContentHandler.prototype = {

src/browser/components/BrowserGlue-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e91c2961ce 100644
+index d07aaa3fbb8ccb02ae00d845649dc9c1d623cba5..68d3a4800f14fef5b5e7df9cd9afe3bc85358bed 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";

src/browser/components/aboutlogins/content/aboutLogins-html.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
-index ca69defe40c57704ab6ec331ce11c95a98b03e8f..bc5be4555adbe3389bceee0f01730ee57f1e69ef 100644
+index 9bbf5e69b17139d5063977334a869db090af3de1..9778bf2843afbb60b470ee637534946e6f7917a8 100644
 --- a/browser/components/aboutlogins/content/aboutLogins.html
 +++ b/browser/components/aboutlogins/content/aboutLogins.html
 @@ -6,7 +6,7 @@