Merge branch 'main' of https://github.com/zen-browser/core

Align Theme Store layout

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,4 +1,4 @@
-name: Bug Report Or Feature Request
+name: Bug Report
 description: File a bug report
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -3,30 +3,16 @@ description: File a feature request
 labels: 
   - "kind: enhancement"
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for filing a feature request.
   - type: textarea
-    id: what-happened
+    id: feature-description
     attributes:
       label: What feature would you like to see?
       description: Please describe the feature you would like to see.
-      placeholder: Tell us what you would like to see!
+      placeholder: I would like to see…
-    validations:
-      required: true
-  - type: dropdown
-    id: platform
-    attributes:
-      label: What platform are you seeing the problem on?
-      options:
-        - Linux
-        - macOS
-        - Windows
     validations:
       required: true
   - type: textarea
-    id: logs
+    id: other-details
     attributes:
-      label: Additional context
+      label: Other details
-      description: Add any other context about the feature request here.
+      placeholder: Add any additional details about the feature request here.

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

@@ -97,6 +97,9 @@ jobs:
           SURFER_COMPAT: ${{ matrix.generic == true }}
         run: pnpm surfer import
 
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
       - name: Bootstrap
         run: |
           cd engine

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

@@ -105,6 +105,9 @@ jobs:
         run: |
           pnpm surfer import
         
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
       - name: build Zen
         env:
           SURFER_COMPAT: ${{ matrix.arch == 'x64' }}

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

@@ -141,6 +141,9 @@ jobs:
           SURFER_COMPAT: ${{ matrix.generic == true }}
         run: pnpm surfer import --verbose
 
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
       - name: Build
         env:
           SURFER_COMPAT: ${{ matrix.generic == true }}

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/browser/base/content/zen-components"]
 	path = src/browser/base/content/zen-components
 	url = https://github.com/zen-browser/components
+[submodule "l10n"]
+	path = l10n
+	url = https://github.com/zen-browser/l10n-packs

README.md

@@ -16,20 +16,24 @@ Experience tranquillity while browsing the web without people tracking you!
 
 Zen is currently built using firefox version `129.0.2`!
 
-* Checkout the latest [releases notes](https://www.zen-browser.app/release-notes)!
+* Check out the latest [release notes](https://www.zen-browser.app/release-notes)!
 
 # Performance
 
 Zen is built with performance in mind, and we have optimized the browser to be as fast as possible!
 
-* Checkout the latest [performance benchmarks](./docs/performance.md)!
+* Checkout the latest [performance benchmarks](https://docs.zen-browser.app/benchmarks)!
+
+# Core Components
+
+Some components used by @zen-browser as an attempt to make firefox forks a better place. You can find them [here](https://github.com/zen-browser/components).
 
 ## 🚀 Run Locally
 
 Clone the project
 
 ```bash
-git clone https://github.com/zen-browser/desktop.git
+git clone https://github.com/zen-browser/desktop.git --recurse-submodules
 cd desktop
 ```
 
@@ -62,6 +66,7 @@ npm start
 - [IAmJafeth](https://github.com/IAmJafeth) (For sponsoring the domain)
 - [Donno 🐒](https://www.onnno.nl/) (For making the logo)
 - [ptr1337](https://github.com/ptr1337) (AUR Packages and optimization flags)
+- [nitro](https://github.com/n7itro) (For the amazing work on the browser)
 
 ## Third Party Code
 
@@ -71,5 +76,15 @@ Zen coudn't be in its current state without the help of these amazing projects!
 
 ## License
 
-[MPL LICENSE](/LICENSE)
+[MPL LICENSE](./LICENSE)
+
+## Star History
+
+<a href="https://star-history.com/#zen-browser/desktop&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
+ </picture>
+</a>
 

configs/branding/alpha/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>

configs/branding/alpha/content/about-logo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.f{fill:#000;}.f,.g,.h{stroke-width:0px;}.g{fill:url(#e);}.h{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><rect class="f" width="256" height="256" rx="58.4" ry="58.4"/><rect class="g" width="256" height="256" rx="58.4" ry="58.4"/><path class="h" d="M202.9973,184.5702c-.1715,10.2808-8.7737,18.4298-19.0559,18.4298h-77.2885c-3.0056,0-5.0458-3.0553-3.894-5.8314l.0262-.0632c5.0822-12.2707,13.3289-22.6249,23.8591-30.1785,1.3098-.9395,2.8903-1.4269,4.5023-1.4269h53.1034c10.462,0,18.9225,8.5681,18.7473,19.0702Z"/><path class="h" d="M149.3471,53c3.0056,0,5.0458,3.0553,3.894,5.8314l-.0262.0631c-5.0822,12.2708-13.3289,22.6249-23.8591,30.1785-1.3098.9396-2.8903,1.427-4.5023,1.427h-52.7949c-10.2822,0-18.8844-8.149-19.0559-18.4298-.1752-10.5021,8.2853-19.0702,18.7473-19.0702h77.5971Z"/><path class="h" d="M71.7465,203c-2.3913,0-4.8207-.46-7.1673-1.4319-9.5666-3.9624-14.1096-14.9301-10.1472-24.4964,6.0943-14.7127,14.8294-27.9027,25.9634-39.2034,11.5341-11.7073,25.1364-20.8551,40.4297-27.1898,21.021-8.7076,37.393-25.0792,46.0995-46.0995,3.9624-9.567,14.9305-14.1093,24.4964-10.1472,9.5666,3.9624,14.1096,14.9301,10.1472,24.4964-6.0943,14.7127-14.8294,27.9027-25.9634,39.2034-11.5341,11.7073-25.1364,20.8551-40.4297,27.1898-21.021,8.7076-37.393,25.0792-46.0995,46.0995-2.9905,7.22-9.9725,11.5791-17.329,11.5791Z"/></svg>

configs/branding/alpha/content/about-wordmark.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 260 56">
+  <defs>
+    <style>
+      .cls-1 {
+        fill="context-fill #20123a"
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M10.7,34.7h15.2v5.3H2.7v-3.8l15.1-21.2H2.6v-5.3h23.2v3.8l-15.2,21.2ZM50.7,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM45.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM72.8,18c-1.2-.7-2.6-1-4.1-1s-3.1.4-4.3,1.2c-1.2.8-2,1.8-2.5,3.1h-.3v-4h-6v22.7h6.3v-13.2c0-1,.2-1.8.6-2.5.4-.7.9-1.2,1.5-1.6.6-.4,1.4-.5,2.2-.5,1.3,0,2.3.4,3,1.2.7.8,1.1,1.9,1.1,3.3v13.4h6.3v-14.5c0-1.8-.3-3.3-1-4.6-.7-1.3-1.6-2.3-2.7-3ZM113.8,27.8c.6,1.1.9,2.4.9,3.9s-.4,3-1.2,4.3c-.8,1.3-2,2.3-3.5,3-1.6.7-3.5,1.1-5.7,1.1h-13V9.7h12.1c2.2,0,4.1.3,5.6,1,1.5.7,2.6,1.6,3.4,2.7.8,1.2,1.1,2.5,1.1,4s-.2,2.2-.7,3.1c-.5.9-1.1,1.6-1.9,2.2-.8.6-1.8,1-2.8,1.2v.3c1.2,0,2.2.4,3.3,1,1,.6,1.8,1.4,2.5,2.5ZM97.7,22.4h4.8c.9,0,1.7-.2,2.3-.5.7-.3,1.2-.8,1.6-1.3.4-.6.6-1.3.6-2.1s-.4-2-1.2-2.7c-.8-.7-1.9-1-3.3-1h-4.9v7.5ZM108.1,31c0-.8-.2-1.6-.6-2.2-.4-.6-1-1.1-1.7-1.5-.7-.4-1.6-.5-2.7-.5h-5.4v8.1h5.2c1.8,0,3.1-.3,3.9-1,.8-.7,1.2-1.6,1.2-2.7ZM130.6,16.9c-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2s-.7,0-1,0ZM154.9,22.5c.9,1.8,1.4,3.8,1.4,6.2s-.5,4.4-1.4,6.1c-.9,1.8-2.2,3.1-3.9,4.1-1.7,1-3.7,1.5-6,1.5s-4.3-.5-6-1.5c-1.7-1-3-2.4-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.1s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.9-4.1,1.7-1,3.7-1.5,6-1.5s4.3.5,6,1.5c1.7,1,3,2.4,3.9,4.1ZM149.8,28.7c0-1.3-.2-2.5-.5-3.5-.4-1-.9-1.9-1.6-2.5-.7-.6-1.6-.9-2.6-.9s-1.9.3-2.7.9c-.7.6-1.3,1.4-1.6,2.5-.4,1-.5,2.2-.5,3.5s.2,2.5.5,3.5c.4,1,.9,1.9,1.6,2.5.7.6,1.6.9,2.7.9s1.9-.3,2.6-.9c.7-.6,1.2-1.4,1.6-2.5.4-1,.5-2.2.5-3.5ZM182,32.4h-.2l-3.7-15.2h-6.3l-3.7,15.3h-.2l-3.5-15.3h-6.4l6.2,22.7h6.7l3.9-14.3h.3l3.9,14.3h6.7l6.2-22.7h-6.4l-3.5,15.2ZM208.1,26.8l-4.1-.8c-1.1-.2-1.8-.5-2.2-.9-.4-.4-.7-.8-.7-1.4s.3-1.2,1-1.6c.7-.4,1.5-.6,2.5-.6s1.4.1,1.9.4c.5.2,1,.6,1.3,1,.3.4.5.8.6,1.3l5.8-.4c-.3-2.1-1.2-3.7-2.9-5-1.7-1.2-3.9-1.8-6.8-1.8s-3.6.3-5.1.9c-1.4.6-2.6,1.4-3.4,2.4-.8,1.1-1.2,2.3-1.2,3.8s.5,3.1,1.6,4.2c1.1,1.1,2.7,1.9,5,2.3l3.9.8c1,.2,1.7.5,2.2.9.5.4.7.8.7,1.4,0,.7-.4,1.2-1,1.7-.7.4-1.6.6-2.7.6s-2-.2-2.8-.7c-.7-.5-1.2-1.2-1.4-2.1l-6.2.3c.3,2.2,1.4,3.9,3.1,5.1,1.8,1.3,4.2,1.9,7.2,1.9s3.7-.3,5.2-.9c1.5-.6,2.7-1.5,3.6-2.6.9-1.1,1.3-2.4,1.3-3.9s-.5-3-1.6-4c-1.1-1-2.7-1.7-4.9-2.2ZM238.6,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM233.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM256.4,17c-.4,0-.7,0-1,0-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2Z"/>
+</svg>

configs/branding/alpha/content/firefox-wordmark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="56">
+  <polygon fill="context-fill #20123a" points="26.2482 13.468 26.2482 9.6633 3.0262 9.6633 3.0262 14.9495 18.1924 14.9495 3.055 36.1877 3.055 39.9942 26.2787 39.9942 26.2787 34.7063 11.0972 34.7063 26.2482 13.468"/><path fill="context-fill #20123a" d="M48.7982,19.8217c-.9724-.9572-2.1077-1.675-3.4059-2.1536-1.2999-.4785-2.6982-.7195-4.2001-.7195-2.2316,0-4.173.4938-5.8276,1.4815-1.6529.9877-2.9341,2.3657-3.8438,4.1323-.9079,1.7683-1.361,3.8217-1.361,6.1619,0,2.3979.4531,4.4751,1.361,6.2264.9096,1.7531,2.2044,3.1056,3.8879,4.0593,1.6835.9521,3.6961,1.4289,6.0363,1.4289,1.8752,0,3.5315-.2885,4.9689-.8671,1.4357-.577,2.6117-1.3865,3.5247-2.4285.913-1.042,1.5172-2.2638,1.8141-3.6656l-5.8361-.3852c-.2172.5736-.5328,1.0573-.9469,1.4509-.4158.3954-.913.6924-1.4968.8893-.5821.1968-1.2236.2969-1.9244.2969-1.0573,0-1.9703-.2223-2.7407-.6669-.7704-.4446-1.3644-1.0759-1.7836-1.8956-.4208-.8196-.6296-1.7921-.6296-2.9189v-.0135h15.4904v-1.7327c0-1.9363-.2715-3.6265-.8146-5.0724-.543-1.4476-1.2999-2.649-2.2723-3.6078ZM36.4088,26.3247c.0375-.8157.2407-1.5665.6223-2.2435.4141-.7365.9893-1.3237,1.7258-1.7632.7348-.4395,1.5817-.6584,2.5388-.6584.9198,0,1.7259.1985,2.4216.5991.6975.4005,1.2422.9503,1.6376,1.6512.3937.7009.5923,1.507.5923,2.4149h-9.5385Z"/><path fill="context-fill #20123a" d="M75.9964,20.94c-.6517-1.2778-1.5646-2.2621-2.739-2.9545-1.1761-.6907-2.5524-1.0369-4.1323-1.0369-1.6885,0-3.1242.3887-4.3104,1.1625-1.1846.7756-2.028,1.8243-2.532,3.148h-.2664v-4.0135h-6.0126v22.7486h6.3079v-13.1519c.0102-.9775.1951-1.8141.5566-2.5099.3598-.6958.8638-1.227,1.5104-1.5918.6465-.3649,1.395-.5482,2.2435-.5482,1.2643,0,2.2553.392,2.9766,1.1777.7213.784,1.0759,1.8735,1.0674,3.2651v13.3589h6.3078v-14.4841c0-1.7683-.3258-3.2905-.9775-4.5701Z"/>
+</svg>

configs/branding/beta/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>

configs/branding/beta/content/about-logo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.f{fill:#000;}.f,.g,.h{stroke-width:0px;}.g{fill:url(#e);}.h{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><rect class="f" width="256" height="256" rx="58.4" ry="58.4"/><rect class="g" width="256" height="256" rx="58.4" ry="58.4"/><path class="h" d="M202.9973,184.5702c-.1715,10.2808-8.7737,18.4298-19.0559,18.4298h-77.2885c-3.0056,0-5.0458-3.0553-3.894-5.8314l.0262-.0632c5.0822-12.2707,13.3289-22.6249,23.8591-30.1785,1.3098-.9395,2.8903-1.4269,4.5023-1.4269h53.1034c10.462,0,18.9225,8.5681,18.7473,19.0702Z"/><path class="h" d="M149.3471,53c3.0056,0,5.0458,3.0553,3.894,5.8314l-.0262.0631c-5.0822,12.2708-13.3289,22.6249-23.8591,30.1785-1.3098.9396-2.8903,1.427-4.5023,1.427h-52.7949c-10.2822,0-18.8844-8.149-19.0559-18.4298-.1752-10.5021,8.2853-19.0702,18.7473-19.0702h77.5971Z"/><path class="h" d="M71.7465,203c-2.3913,0-4.8207-.46-7.1673-1.4319-9.5666-3.9624-14.1096-14.9301-10.1472-24.4964,6.0943-14.7127,14.8294-27.9027,25.9634-39.2034,11.5341-11.7073,25.1364-20.8551,40.4297-27.1898,21.021-8.7076,37.393-25.0792,46.0995-46.0995,3.9624-9.567,14.9305-14.1093,24.4964-10.1472,9.5666,3.9624,14.1096,14.9301,10.1472,24.4964-6.0943,14.7127-14.8294,27.9027-25.9634,39.2034-11.5341,11.7073-25.1364,20.8551-40.4297,27.1898-21.021,8.7076-37.393,25.0792-46.0995,46.0995-2.9905,7.22-9.9725,11.5791-17.329,11.5791Z"/></svg>

configs/branding/beta/content/about-wordmark.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 260 56">
+  <defs>
+    <style>
+      .cls-1 {
+        fill="context-fill #20123a"
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M10.7,34.7h15.2v5.3H2.7v-3.8l15.1-21.2H2.6v-5.3h23.2v3.8l-15.2,21.2ZM50.7,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM45.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM72.8,18c-1.2-.7-2.6-1-4.1-1s-3.1.4-4.3,1.2c-1.2.8-2,1.8-2.5,3.1h-.3v-4h-6v22.7h6.3v-13.2c0-1,.2-1.8.6-2.5.4-.7.9-1.2,1.5-1.6.6-.4,1.4-.5,2.2-.5,1.3,0,2.3.4,3,1.2.7.8,1.1,1.9,1.1,3.3v13.4h6.3v-14.5c0-1.8-.3-3.3-1-4.6-.7-1.3-1.6-2.3-2.7-3ZM113.8,27.8c.6,1.1.9,2.4.9,3.9s-.4,3-1.2,4.3c-.8,1.3-2,2.3-3.5,3-1.6.7-3.5,1.1-5.7,1.1h-13V9.7h12.1c2.2,0,4.1.3,5.6,1,1.5.7,2.6,1.6,3.4,2.7.8,1.2,1.1,2.5,1.1,4s-.2,2.2-.7,3.1c-.5.9-1.1,1.6-1.9,2.2-.8.6-1.8,1-2.8,1.2v.3c1.2,0,2.2.4,3.3,1,1,.6,1.8,1.4,2.5,2.5ZM97.7,22.4h4.8c.9,0,1.7-.2,2.3-.5.7-.3,1.2-.8,1.6-1.3.4-.6.6-1.3.6-2.1s-.4-2-1.2-2.7c-.8-.7-1.9-1-3.3-1h-4.9v7.5ZM108.1,31c0-.8-.2-1.6-.6-2.2-.4-.6-1-1.1-1.7-1.5-.7-.4-1.6-.5-2.7-.5h-5.4v8.1h5.2c1.8,0,3.1-.3,3.9-1,.8-.7,1.2-1.6,1.2-2.7ZM130.6,16.9c-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2s-.7,0-1,0ZM154.9,22.5c.9,1.8,1.4,3.8,1.4,6.2s-.5,4.4-1.4,6.1c-.9,1.8-2.2,3.1-3.9,4.1-1.7,1-3.7,1.5-6,1.5s-4.3-.5-6-1.5c-1.7-1-3-2.4-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.1s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.9-4.1,1.7-1,3.7-1.5,6-1.5s4.3.5,6,1.5c1.7,1,3,2.4,3.9,4.1ZM149.8,28.7c0-1.3-.2-2.5-.5-3.5-.4-1-.9-1.9-1.6-2.5-.7-.6-1.6-.9-2.6-.9s-1.9.3-2.7.9c-.7.6-1.3,1.4-1.6,2.5-.4,1-.5,2.2-.5,3.5s.2,2.5.5,3.5c.4,1,.9,1.9,1.6,2.5.7.6,1.6.9,2.7.9s1.9-.3,2.6-.9c.7-.6,1.2-1.4,1.6-2.5.4-1,.5-2.2.5-3.5ZM182,32.4h-.2l-3.7-15.2h-6.3l-3.7,15.3h-.2l-3.5-15.3h-6.4l6.2,22.7h6.7l3.9-14.3h.3l3.9,14.3h6.7l6.2-22.7h-6.4l-3.5,15.2ZM208.1,26.8l-4.1-.8c-1.1-.2-1.8-.5-2.2-.9-.4-.4-.7-.8-.7-1.4s.3-1.2,1-1.6c.7-.4,1.5-.6,2.5-.6s1.4.1,1.9.4c.5.2,1,.6,1.3,1,.3.4.5.8.6,1.3l5.8-.4c-.3-2.1-1.2-3.7-2.9-5-1.7-1.2-3.9-1.8-6.8-1.8s-3.6.3-5.1.9c-1.4.6-2.6,1.4-3.4,2.4-.8,1.1-1.2,2.3-1.2,3.8s.5,3.1,1.6,4.2c1.1,1.1,2.7,1.9,5,2.3l3.9.8c1,.2,1.7.5,2.2.9.5.4.7.8.7,1.4,0,.7-.4,1.2-1,1.7-.7.4-1.6.6-2.7.6s-2-.2-2.8-.7c-.7-.5-1.2-1.2-1.4-2.1l-6.2.3c.3,2.2,1.4,3.9,3.1,5.1,1.8,1.3,4.2,1.9,7.2,1.9s3.7-.3,5.2-.9c1.5-.6,2.7-1.5,3.6-2.6.9-1.1,1.3-2.4,1.3-3.9s-.5-3-1.6-4c-1.1-1-2.7-1.7-4.9-2.2ZM238.6,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM233.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM256.4,17c-.4,0-.7,0-1,0-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2Z"/>
+</svg>

configs/branding/beta/content/firefox-wordmark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="56">
+  <polygon fill="context-fill #20123a" points="26.2482 13.468 26.2482 9.6633 3.0262 9.6633 3.0262 14.9495 18.1924 14.9495 3.055 36.1877 3.055 39.9942 26.2787 39.9942 26.2787 34.7063 11.0972 34.7063 26.2482 13.468"/><path fill="context-fill #20123a" d="M48.7982,19.8217c-.9724-.9572-2.1077-1.675-3.4059-2.1536-1.2999-.4785-2.6982-.7195-4.2001-.7195-2.2316,0-4.173.4938-5.8276,1.4815-1.6529.9877-2.9341,2.3657-3.8438,4.1323-.9079,1.7683-1.361,3.8217-1.361,6.1619,0,2.3979.4531,4.4751,1.361,6.2264.9096,1.7531,2.2044,3.1056,3.8879,4.0593,1.6835.9521,3.6961,1.4289,6.0363,1.4289,1.8752,0,3.5315-.2885,4.9689-.8671,1.4357-.577,2.6117-1.3865,3.5247-2.4285.913-1.042,1.5172-2.2638,1.8141-3.6656l-5.8361-.3852c-.2172.5736-.5328,1.0573-.9469,1.4509-.4158.3954-.913.6924-1.4968.8893-.5821.1968-1.2236.2969-1.9244.2969-1.0573,0-1.9703-.2223-2.7407-.6669-.7704-.4446-1.3644-1.0759-1.7836-1.8956-.4208-.8196-.6296-1.7921-.6296-2.9189v-.0135h15.4904v-1.7327c0-1.9363-.2715-3.6265-.8146-5.0724-.543-1.4476-1.2999-2.649-2.2723-3.6078ZM36.4088,26.3247c.0375-.8157.2407-1.5665.6223-2.2435.4141-.7365.9893-1.3237,1.7258-1.7632.7348-.4395,1.5817-.6584,2.5388-.6584.9198,0,1.7259.1985,2.4216.5991.6975.4005,1.2422.9503,1.6376,1.6512.3937.7009.5923,1.507.5923,2.4149h-9.5385Z"/><path fill="context-fill #20123a" d="M75.9964,20.94c-.6517-1.2778-1.5646-2.2621-2.739-2.9545-1.1761-.6907-2.5524-1.0369-4.1323-1.0369-1.6885,0-3.1242.3887-4.3104,1.1625-1.1846.7756-2.028,1.8243-2.532,3.148h-.2664v-4.0135h-6.0126v22.7486h6.3079v-13.1519c.0102-.9775.1951-1.8141.5566-2.5099.3598-.6958.8638-1.227,1.5104-1.5918.6465-.3649,1.395-.5482,2.2435-.5482,1.2643,0,2.2553.392,2.9766,1.1777.7213.784,1.0759,1.8735,1.0674,3.2651v13.3589h6.3078v-14.4841c0-1.7683-.3258-3.2905-.9775-4.5701Z"/>
+</svg>

configs/common/mozconfig

@@ -3,6 +3,9 @@ ac_add_options --with-app-name=${binName}
 ac_add_options --with-app-basename=Zen
 ac_add_options --enable-official-branding
 
+# Localization
+ac_add_options --with-l10n-base="$PWD/browser/locales"
+
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
@@ -89,7 +92,6 @@ ac_add_options --enable-eme=widevine
 ac_add_options --allow-addon-sideload
 ac_add_options --with-unsigned-addon-scopes=app,system
 
-mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0

docs/performance.md

@@ -24,7 +24,7 @@ https://web.basemark.com/
 | 1.0.0-a.6 | 1747.98 | 59% | 91%   | 91%                          | 76%         |
 | 1.0.0-a.4 | 470.49  | 59% | 91%   | 97%                          | 76%         |
 | 1.0.0-a.3 | 475.52  |59% | 91%   | 97%                          | 76%         |
-| other | last | utpdate | 31/7   | 2024                         | -        |
+| other | last | update | 31/7   | 2024                         | -        |
 | Librewolf 128.0-2 | 1953.65 | 59.66% | 89.01%   | 91.72%                         | 76.12% |
 | FF nightly 130.0a1 | 1912.77 | 59.66% | 90.91%   | 91.72%                         | 76.12% |
 

package.json

@@ -27,6 +27,6 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.2.14"
+    "@zen-browser/surfer": "^1.3.4"
   }
 }

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.2.14
+        specifier: ^1.3.4
-        version: 1.2.14
+        version: 1.3.4
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.2.14':
+  '@zen-browser/surfer@1.3.4':
-    resolution: {integrity: sha512-v83Iig29BUsVlMfMDER+y99DMDf2lD9IXnXuWAfLEE02AAYugYpTYu1tZ5aUffpLjZqCj46GUH8xdSUmUZQxzA==}
+    resolution: {integrity: sha512-xnZK6D5/DPy5BZonucUAYZQXg+BUisPJbWSvXypno1Ns0InlpiI0saYSON3hQ+VbLzwBB8LTfGLYphFnskkw7w==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -786,7 +786,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.2.14':
+  '@zen-browser/surfer@1.3.4':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

scripts/download-language-packs.sh

@@ -0,0 +1,67 @@
+
+set -ex
+
+CURRENT_DIR=$(pwd)
+
+git config --global init.defaultBranch main
+git config --global fetch.prune true
+
+mkdir ~/tools
+cd ~/tools
+git clone https://github.com/glandium/git-cinnabar.git
+cd git-cinnabar
+git checkout 0.5.11
+export PATH=~/tools/git-cinnabar:$PATH
+cd ~
+git cinnabar download
+cd $CURRENT_DIR
+
+update_language() {
+  langId=$1
+  cd ./l10n
+  cd $langId
+
+  echo "Updating $langId"
+  rm -rf .git
+
+  git init 
+  git remote add upstream hg://hg.mozilla.org/l10n-central/$langId
+  git remote set-url upstream hg://hg.mozilla.org/l10n-central/$langId
+  git pull upstream branches/default/tip
+
+  cd $CURRENT_DIR
+}
+
+export PATH=~/tools/git-cinnabar:$PATH
+for lang in $(cat ./l10n/supported-languages); do
+  update_language $lang
+done
+cd $CURRENT_DIR
+
+# Move all the files to the correct location
+browser_locales=engine/browser/locales
+copy_browser_locales() {
+  langId=$1
+  only_en=$2
+  mkdir -p $browser_locales/$langId
+  if [ "$only_en" = true ]; then
+    rsync -av --exclude=.git ./l10n/en-US/browser/ $browser_locales/$langId/
+    return
+  fi
+  rm -rf $browser_locales/$langId/
+  rsync -av --exclude=.git ./l10n/$langId/ $browser_locales/$langId/
+}
+
+copy_browser_locales en-US true
+for lang in $(cat ./l10n/supported-languages); do
+  copy_browser_locales $lang false
+done
+
+echo "Cleaning up"
+rm -rf ~/tools
+rm -rf ~/.git-cinnabar
+
+for lang in $(cat ./l10n/supported-languages); do
+  # remove every file except if it starts with "zen"
+  find ./l10n/$lang -type f -not -name "zen*" -delete
+done

src/browser/app/profile/zen-browser.js

@@ -16,6 +16,9 @@ pref("browser.tabs.cardPreview.delayMs", 100);
 pref("devtools.debugger.prompt-connection", false);
 #endif
 
+// Dont download the multilingual dictionary
+pref("intl.multilingual.downloadEnabled", false);
+
 // Theme
 pref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
 pref('browser.compactmode.show', true);
@@ -56,6 +59,9 @@ pref("browser.ping-centre.telemetry", false);
 pref("browser.attribution.enabled", false);
 pref("toolkit.telemetry.pioneer-new-studies-available", false);
 
+pref("browser.contentblocking.category", "standard");
+pref("app.update.checkInstallTime.days", 2);
+
 // CUSTOM ZEN PREFS
 
 pref('zen.welcomeScreen.enabled', true);
@@ -132,9 +138,13 @@ pref('dom.script_loader.bytecode_cache.strategy', 2);
 // Extremly experimental features
 pref("dom.webgpu.enabled", true);
 
-// Font rendering
+// Font rendering, not for MacOSX and Linux
+#ifndef XP_UNIX
+#ifndef XP_MACOSX
 pref('gfx.font_rendering.cleartype_params.rendering_mode', 5);
 pref('gfx.font_rendering.cleartype_params.gamma', 1750);
+#endif
+#endif
 
 #include better-fox.js
 

src/browser/base/content/ZenStartup.mjs

@@ -3,6 +3,7 @@ var ZenStartup = {
   init() {
     this._changeSidebarLocation();
     this._zenInitBrowserLayout();
+    this._focusSearchBar();
   },
 
   _zenInitBrowserLayout() {
@@ -101,6 +102,10 @@ var ZenStartup = {
     const titlebar = document.getElementById("navigator-toolbox");
     titlebar.insertAdjacentElement("afterend", splitter);
   },
+
+  _focusSearchBar() {
+    gURLBar.focus();
+  },
 };
 
 ZenStartup.init();

src/browser/base/content/ZenUIManager.mjs

@@ -21,6 +21,10 @@ var gZenUIManager = {
     const button = document.getElementById('zen-bookmark-button');
     SidebarController.toggle('viewBookmarksSidebar', button);
   },
+
+  createValidXULText(text) {
+    return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  }
 };
 
 var gZenVerticalTabsManager = {

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

@@ -15,6 +15,7 @@
         content/browser/zen-styles/zen-buttons.css              (content/zen-styles/zen-buttons.css)
         content/browser/zen-styles/zen-tabs.css                 (content/zen-styles/zen-tabs.css)
         content/browser/zen-styles/zen-tabs/vertical-tabs.css   (content/zen-styles/zen-tabs/vertical-tabs.css)
+        content/browser/zen-styles/zen-tabs/horizontal-tabs.css (content/zen-styles/zen-tabs/horizontal-tabs.css)
         content/browser/zen-styles/zen-browser-ui.css           (content/zen-styles/zen-browser-ui.css)
         content/browser/zen-styles/zen-animations.css           (content/zen-styles/zen-animations.css)
         content/browser/zen-styles/zen-panel-ui.css             (content/zen-styles/zen-panel-ui.css)

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

@@ -1,4 +1,5 @@
 <link rel="localization" href="browser/zen-web-side-panels.ftl"/>
 <link rel="localization" href="browser/zen-workspaces.ftl"/>
 <link rel="localization" href="browser/zen-split-view.ftl"/>
+<link rel="localization" href="browser/zen-general.ftl"/>
 <link rel="localization" href="browser/zen-vertical-tabs.ftl"/>

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

@@ -132,5 +132,5 @@
   <menuitem id="context_zenOpenWorkspace" oncommand="ZenWorkspaces.openWorkspace();" data-l10n-id="zen-workspaces-panel-context-open"/>
   <menuseparator/>
   <menuitem id="context_zenSetAsDefaultWorkspace" oncommand="ZenWorkspaces.setDefaultWorkspace();" data-l10n-id="zen-workspaces-panel-context-set-default"/>
-  <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete();" data-l10n-id="zen-workspaces-panel-context-delete"/>
+  <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/>
 </menupopup>

src/browser/base/content/zen-styles/zen-browser-container.css

@@ -4,8 +4,8 @@
     width: -moz-available;
     margin: 0 var(--zen-element-separation) var(--zen-element-separation) 0;
     box-shadow: 0 0 0 1px var(--zen-colors-border);
-    clip-path: inset(-5px -5px -5px round var(--zen-border-radius));
+    clip-path: inset(-5px -5px -5px round var(--zen-webview-border-radius, var(--zen-border-radius)));
-    border-radius: var(--zen-border-radius);
+    border-radius: var(--zen-webview-border-radius, var(--zen-border-radius));
     transform: translate3d(0, 0, 0);
     overflow: hidden;
   }

src/browser/base/content/zen-styles/zen-browser-ui.css

@@ -1,11 +1,15 @@
  
-#navigator-toolbox, 
 #browser,
 #appcontent,
 #tabbrowser-tabpanels {
   background: transparent !important;
 }
 
+#navigator-toolbox {
+  /* see issue #426 */
+  background: var(--zen-navigator-toolbox-background, transparent) !important;
+}
+
 #browser {
   width: 100%;
 }

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -17,14 +17,13 @@
     position: absolute;
     display: block;
     transition: 200ms ease-in-out !important;
-    transform: translateX(calc(-100% + var(--zen-compact-toolbox-margin-single) + 2px));
+    transform: translateX(calc(-100% + (var(--zen-compact-toolbox-margin-single) / 2)));
     opacity: 0;
     line-height: 0;
     z-index: 1;
     height: 100%;
     margin: 0;
     padding: var(--zen-compact-toolbox-margin) !important;
-    padding-top: calc(var(--zen-compact-toolbox-margin-single) - 5px) !important;
 
     & #titlebar {
       border: 1px solid var(--zen-colors-border);
@@ -34,6 +33,10 @@
       border-radius: var(--zen-panel-radius);
     }
 
+    & > * {
+      pointer-events: none;  
+    }
+
     &, & #titlebar {
       min-width: calc(var(--zen-navigation-toolbar-min-width) + var(--zen-compact-toolbox-margin-single) * 4) !important;
     }
@@ -69,7 +72,7 @@
   @media not (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
     #navigator-toolbox {
       /* Remove the top margin */
-      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 3) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
+      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
     }
 
     #zen-sidebar-web-panel-wrapper,
@@ -85,9 +88,13 @@
   #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) {
     transform: none !important;
     opacity: 1;
+
+    & > * {
+      pointer-events: all;  
+    }
   }
   
-  #navigator-toolbox > *{ line-height: normal; pointer-events: auto }
+  #navigator-toolbox > *{ line-height: normal; }
   
   #navigator-toolbox,
   #navigator-toolbox > *{
@@ -115,10 +122,6 @@
   }
 
   @media (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
-    #navigator-toolbox {
-      padding-top: var(--zen-compact-toolbox-margin);
-    }
-
     #zen-appcontent-navbar-container {
       --urlbar-height: unset;
       transition: .2s ease-in-out;

src/browser/base/content/zen-styles/zen-tabs.css

@@ -1,6 +1,6 @@
 
 /* Styles for both vertical and horizontal tabs */
-/*@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");*/
+@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");
 @import url("chrome://browser/content/zen-styles/zen-tabs/vertical-tabs.css");
 
 #zen-tabbox-wrapper {

src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css

@@ -0,0 +1,3 @@
+@media not (-moz-bool-pref: "zen.tabs.vertical") {
+  
+}

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -9,7 +9,7 @@
     margin-top: 0; /* Issue #156 */
   }
   
-  :root[inFullscreen="true"] #navigator-toolbox {
+  #navigator-toolbox {
     margin-top: 0 !important;
   }
   
@@ -395,10 +395,13 @@
       z-index: 1;
     }
 
+    #navigator-toolbox, #titlebar, #TabsToolbar {
+      transition: 0s !important;
+    }
+
     #TabsToolbar {
       --hovered-verticaltab-width: 20em;
 
-      transition: 200ms, margin 200ms, border-color 0 ease-in-out !important;
       z-index: 1;
       background-repeat: no-repeat !important;
       background-position: center center !important;
@@ -418,12 +421,8 @@
       visibility: hidden !important;
     }
 
-    #TabsToolbar-customization-target:hover > .toolbarbutton-1 > .toolbarbutton-text {
+    #navigator-toolbox:hover {
-      transition-delay: 0.2s !important;
+      --zen-navigation-toolbar-min-width: 3.7rem !important;
-    }
-    
-    #TabsToolbar-customization-target:hover > .toolbarbutton-1 > .toolbarbutton-text {
-      transition-delay: 0.2s !important;
     }
         
     #navigator-toolbox:hover #TabsToolbar {

src/browser/components/customizableui/content/customizeMode-inc-xhtml.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/components/customizableui/content/customizeMode.inc.xhtml b/browser/components/customizableui/content/customizeMode.inc.xhtml
-index 2788cc6a8fb42b7b968eb45aafc02f8d6fcf771d..5142e65576aebaac0e31677b707a5e05f88dae76 100644
---- a/browser/components/customizableui/content/customizeMode.inc.xhtml
-+++ b/browser/components/customizableui/content/customizeMode.inc.xhtml
-@@ -94,7 +94,7 @@
-         class="footer-button"
-         oncommand="gCustomizeMode.togglePong(this.checked);"
-         hidden="true"/>
--
-+#include zenCustomizationMode.inc.xhtml
- <spacer id="customization-footer-spacer"/>
- #ifdef XP_MACOSX
-     <button id="customization-touchbar-button"

src/browser/components/preferences/zen-settings.js

@@ -122,8 +122,8 @@ var gZenMarketplaceManager = {
     this.themesList.innerHTML = "";
     for (let theme of Object.values(themes)) {
       const fragment = window.MozXULElement.parseXULToFragment(`
-        <hbox class="zenThemeMarketplaceItem">
+        <hbox class="zenThemeMarketplaceItem" align="center">
-          <vbox class="zenThemeMarketplaceItemContent">
+          <vbox class="zenThemeMarketplaceItemContent" flex="1">
             <label><h3 class="zenThemeMarketplaceItemTitle"></h3></label>
             <description class="description-deemphasized zenThemeMarketplaceItemDescription"></description>
           </vbox>

src/browser/installer/package-manifest-in.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e1d90c5ea 100644
+index da760e143740a166df14d055cf3ec7b095b93d10..093dacee4356d4084432d53639873e3da006dd94 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -370,8 +370,8 @@ bin/libfreebl_64int_3.so
+@@ -377,17 +377,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
@@ -13,3 +13,23 @@ index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e
  #endif
  
  ; [Crash Reporter]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+ #ifdef XP_MACOSX
+-@BINPATH@/crashreporter.app/
++;@BINPATH@/crashreporter.app/
+ #else
+-@BINPATH@/crashreporter@BIN_SUFFIX@
++;@BINPATH@/crashreporter@BIN_SUFFIX@
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
+ #endif
+@@ -397,7 +397,7 @@ bin/libfreebl_64int_3.so
+ ; [ minidump-analyzer ]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+-@BINPATH@/minidump-analyzer@BIN_SUFFIX@
++;@BINPATH@/minidump-analyzer@BIN_SUFFIX@
+ #endif
+ 
+ ; [ Ping Sender ]

src/browser/locales/en-US/browser/appExtensionFields-ftl.patch

@@ -1,32 +0,0 @@
-diff --git a/browser/locales/en-US/browser/appExtensionFields.ftl b/browser/locales/en-US/browser/appExtensionFields.ftl
-index 09d7a076eccd4235fac66156770d8b9ae01a7d16..f32affde0d6f77dadd421ff68bf2050bda9f0cd0 100644
---- a/browser/locales/en-US/browser/appExtensionFields.ftl
-+++ b/browser/locales/en-US/browser/appExtensionFields.ftl
-@@ -8,13 +8,13 @@
- extension-default-theme-name-auto=System theme — auto
- extension-default-theme-description=Follow the operating system setting for buttons, menus, and windows.
- 
--extension-firefox-compact-light-name=Light
-+extension-firefox-compact-light-name=Zen Light
- extension-firefox-compact-light-description=A theme with a light color scheme.
- 
--extension-firefox-compact-dark-name=Dark
-+extension-firefox-compact-dark-name=Zen Dark
- extension-firefox-compact-dark-description=A theme with a dark color scheme.
- 
--extension-firefox-alpenglow-name=Firefox Alpenglow
-+extension-firefox-alpenglow-name=Zen Universe
- extension-firefox-alpenglow-description=Use a colorful appearance for buttons, menus, and windows.
- 
- ## Colorway Themes
-@@ -28,3 +28,9 @@ extension-colorways-balanced-name={ $colorway-name } — Balanced
- # "Bold" is used in the sense of bravery or courage, not in the sense of
- # emphasized text.
- extension-colorways-bold-name={ $colorway-name } — Bold
-+
-+extension-firefox-compact-galaxy-name=Zen Galaxy
-+extension-firefox-compact-galaxy-description=A theme with a dark color scheme and a nice galaxy touch!
-+
-+extension-firefox-compact-dream-name=Zen Dream
-+extension-firefox-compact-dream-description=A theme with a light color scheme and a nice dream-y touch!
-\ No newline at end of file

src/browser/locales/en-US/browser/appmenu-ftl.patch

@@ -1,10 +0,0 @@
-diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
-index 5ad2d75f6215f7da44948cda5ad938db8fd97e8d..da4442ebcd594b602b9e991c9591071dddcaa5f6 100644
---- a/browser/locales/en-US/browser/appmenu.ftl
-+++ b/browser/locales/en-US/browser/appmenu.ftl
-@@ -314,3 +314,5 @@ appmenuitem-relay-title = { -relay-brand-short-name }
- appmenuitem-relay-description = Mask your real email and phone
- appmenuitem-vpn-title = { -mozilla-vpn-brand-name }
- appmenuitem-vpn-description = Protect your online activity
-+
-+zen-panel-ui-current-profile-text = current profile

src/browser/locales/en-US/browser/customizeMode-ftl.patch

@@ -1,11 +0,0 @@
-diff --git a/browser/locales/en-US/browser/customizeMode.ftl b/browser/locales/en-US/browser/customizeMode.ftl
-index e5f54b231738fc8fee505c8c8dcccde820995cfc..ec81ef8e451faa25878830b7d4796708e15fe395 100644
---- a/browser/locales/en-US/browser/customizeMode.ftl
-+++ b/browser/locales/en-US/browser/customizeMode.ftl
-@@ -36,3 +36,5 @@ customize-mode-touchbar-cmd =
-     .label = Customize Touch Bar…
- customize-mode-downloads-button-autohide =
-     .label = Hide button when empty
-+
-+customization-zen-browser-space = Content Space
-\ No newline at end of file

src/browser/locales/en-US/browser/editBookmarkOverlay-ftl.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/locales/en-US/browser/editBookmarkOverlay.ftl b/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-index da74660e48620fe9097d05a51ba4be34f21246e6..3153ee3e3ea534807f7e6c35b016edf25749bbe7 100644
---- a/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-+++ b/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-@@ -13,7 +13,7 @@ bookmark-overlay-url =
- # Location refers to the position of the bookmark within the browser's
- # bookmarks, not to its URL or address.
- bookmark-overlay-location-2 =
--  .value = Location
-+  .value = Folder
-   .accesskey = L
- 
- bookmark-overlay-choose =

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

@@ -1,161 +0,0 @@
-
-pane-zen-looks-title = Look and Feel
-category-zen-looks =
-    .tooltiptext = { pane-zen-looks-title }
-
-zen-warning-language = Changing the default language could make it easier for Websites to track you.
-
-zen-look-and-feel-colors-header = Pick a theme colour
-zen-look-and-feel-colors-description = Make { -brand-short-name } look and feel the way you like
-zen-look-and-feel-themed-toolbar = 
-    .label = Make the toolbar themed with the accent color
-
-pane-zen-side-panels-title = Side Web Panels
-zen-side-panels-header = General settings for web panels
-zen-side-panels-description = Increase productivity by having multiple views at once!
-zen-side-panels-enabled = 
-    .label = Enable Web Side Panels
-
-zen-side-panels-close-on-blur = 
-    .label = Close the panel when it loses focus if it's not pinned
-
-zen-look-and-feel-compact-view-header = Show in compact view
-zen-look-and-feel-compact-view-description = Only show the toolbars you use!
-zen-look-and-feel-compact-view-enabled = 
-    .label = Enable { -brand-short-name }'s compact mode
-
-zen-look-and-feel-compact-view-top-toolbar = 
-    .label = Hide the top toolbar as well in compact mode
-
-zen-look-and-feel-buttons-header = Button style
-zen-look-and-feel-buttons-description = Choose the style of buttons you want to see
-
-zen-look-and-feel-pilled-buttons = 
-    .label = Pilled Buttons
-
-pane-zen-workspaces-title = Workspaces
-category-zen-workspaces =
-    .tooltiptext = { pane-workspaces-title }
-pane-settings-workspaces-title = Workspaces
-
-pane-zen-workspaces-header = Workspaces
-zen-settings-workspaces-header = General settings for workspaces
-zen-settings-workspaces-description = With workspaces, you can have multiple browsing sessions at once!
-zen-settings-workspaces-enabled = 
-    .label = Enable Workspaces (Experimental)
-
-pane-zen-theme-title = Theme Settings
-
-zen-vertical-tabs-title = Sidebar and tabs layout
-zen-vertical-tabs-header = Vertical Tabs
-zen-vertical-tabs-description = Manage your tabs in a vertical layout
-zen-vertical-tabs-show-expand-button = 
-    .label = Show Expand Button
-
-zen-vertical-tabs-expand-tabs-by-default = Expand Tabs by Default
-zen-vertical-tabs-dont-expand-tabs-by-default = Don't Expand Tabs by Default
-zen-vertical-tabs-expand-tabs-on-hover = Expand Tabs on Hover (Wont work on compact mode)
-
-zen-vertical-tabs-expand-tabs-header = How to expand tabs
-zen-vertical-tabs-expand-tabs-description = Choose how to expand tabs in the sidebar
-
-zen-theme-marketplace-header = Theme Store
-zen-theme-marketplace-description = Find and install themes from the store.
-zen-theme-marketplace-remove-button = 
-    .label = Remove Theme
-
-zen-theme-marketplace-link = Visit Store
-
-pane-zen-CKS-title = Keyboard Shortcuts
-category-zen-CKS =
-    .tooltiptext = { pane-zen-CKS-title }
-pane-settings-CKS-title = { -brand-short-name } Keyboard Shortcuts
-
-zen-settings-CKS-header = Customize your keyboard shortcuts
-zen-settings-CKS-description = Change the default keyboard shortcuts to your liking and improve your browsing experience
-
-zen-settings-CKS-disable-firefox = 
-    .label = Disable { -brand-short-name }'s default keyboard shortcuts
-
-zen-cks-group-tab-action = Tab Actions
-zen-cks-group-page-action = Page Actions
-zen-cks-group-visible-action = Visible Actions
-zen-cks-group-history-action = History Actions
-zen-cks-group-search-action = Search Actions
-zen-cks-group-tools-action = Tools Actions
-zen-cks-group-bookmark-action = Bookmark Actions
-zen-cks-group-open-page-action = Open Page Actions
-zen-cks-group-downloads-action = Downloads Actions
-zen-cks-group-sidebar-action = Sidebar Actions
-zen-cks-group-compact-mode-action = Compact Mode Actions
-zen-cks-group-split-view-action = Split View Actions
-zen-cks-group-workspace-action = Workspace Actions
-
-open-new-tab = Open New Tab
-close-tab = Close Tab
-open-new-window = Open New Window
-open-new-private-window = Open New Private Window
-close-window = Close Window
-restore-last-tab = Restore Last Tab
-restore-last-window = Restore Last Window
-show-next-tab = Show Next Tab
-show-previous-tab = Show Previous Tab
-show-all-tabs-panel = Show All Tabs Panel
-send-with-mail = Send Page with Mail
-save-page = Save Page
-print-page = Print Page
-mute-current-tab = Mute Current Tab
-show-source-of-page = Show Source of Page
-show-page-info = Show Page Info
-zoom-in = Zoom In
-zoom-out = Zoom Out
-reset-zoom = Reset Zoom
-back = Back
-forward = Forward
-stop = Stop
-reload = Reload
-force-reload = Force Reload
-search-in-this-page = Search in This Page
-show-next-search-result = Show Next Search Result
-show-previous-search-result = Show Previous Search Result
-search-the-web = Search the Web
-open-migration-wizard = Open Migration Wizard
-quit-from-application = Quit Application
-enter-into-customize-mode = Enter Customize Mode
-enter-into-offline-mode = Enter Offline Mode
-open-screen-capture = Open Screen Capture
-bookmark-this-page = Bookmark This Page
-open-bookmark-add-tool = Open Bookmark Add Tool
-open-bookmarks-manager = Open Bookmarks Manager
-toggle-bookmark-toolbar = Toggle Bookmark Toolbar
-open-general-preferences = Open General Preferences
-open-privacy-preferences = Open Privacy Preferences
-open-workspaces-preferences = Open Workspaces Preferences
-open-containers-preferences = Open Containers Preferences
-open-search-preferences = Open Search Preferences
-open-sync-preferences = Open Sync Preferences
-open-task-manager = Open Task Manager
-open-addons-manager = Open Add-ons Manager
-open-home-page = Open Home Page
-forget-history = Forget History
-quick-forget-history = Quick Forget History
-clear-recent-history = Clear Recent History
-restore-last-session = Restore Last Session
-search-history = Search History
-manage-history = Manage History
-open-downloads = Open Downloads
-show-bookmark-sidebar = Show Bookmark Sidebar
-show-history-sidebar = Show History Sidebar
-show-synced-tabs-sidebar = Show Synced Tabs Sidebar
-reverse-sidebar = Reverse Sidebar Position
-hide-sidebar = Hide Sidebar
-toggle-sidebar = Toggle Sidebar
-zen-toggle-web-panels = Toggle Web Panels
-zen-toggle-compact-mode = Toggle Compact Mode
-zen-toggle-compact-mode-sidebar = Toggle Compact Mode Sidebar
-zen-toggle-compact-mode-toolbar = Toggle Compact Mode Toolbar
-zen-change-workspace = Cycle Workspaces
-zen-split-view-grid = Split View Grid
-zen-split-view-vertical = Split View Vertical
-zen-split-view-horizontal = Split View Horizontal
-zen-split-view-close = Close Split View

src/browser/locales/en-US/browser/sidebarMenu-ftl.patch

@@ -1,14 +0,0 @@
-diff --git a/browser/locales/en-US/browser/sidebarMenu.ftl b/browser/locales/en-US/browser/sidebarMenu.ftl
-index e050a2302c6699ffcabad2db4d45267912297519..d4ff03ace4d08482b4a6de62c4f00016486cad84 100644
---- a/browser/locales/en-US/browser/sidebarMenu.ftl
-+++ b/browser/locales/en-US/browser/sidebarMenu.ftl
-@@ -19,3 +19,8 @@ sidebar-menu-close =
- 
- sidebar-close-button =
-   .tooltiptext = Close sidebar
-+
-+sidebar-zen-sidepanel =
-+  .label = Side Panels
-+sidebar-zen-expand =
-+  .label = Expand Sidebar
-\ No newline at end of file

src/browser/locales/en-US/browser/tabContextMenu-ftl.patch

@@ -1,19 +0,0 @@
-diff --git a/browser/locales/en-US/browser/tabContextMenu.ftl b/browser/locales/en-US/browser/tabContextMenu.ftl
-index 5ace34fd8a3950777c88d680b0ba5d6b6878ad7a..780c75eb3705244d3f752aec4695547315669dd3 100644
---- a/browser/locales/en-US/browser/tabContextMenu.ftl
-+++ b/browser/locales/en-US/browser/tabContextMenu.ftl
-@@ -26,12 +26,12 @@ duplicate-tabs =
- # The following string is displayed on a menuitem that will close the tabs from the start of the tabstrip to the currently targeted tab (excluding the currently targeted and any other selected tabs).
- # In left-to-right languages this should use "Left" and in right-to-left languages this should use "Right".
- close-tabs-to-the-start =
--    .label = Close Tabs to Left
-+    .label = Close Tabs Above
-     .accesskey = l
- # The following string is displayed on a menuitem that will close the tabs from the end of the tabstrip to the currently targeted tab (excluding the currently targeted and any other selected tabs).
- # In left-to-right languages this should use "Right" and in right-to-left languages this should use "Left".
- close-tabs-to-the-end =
--    .label = Close Tabs to Right
-+    .label = Close Tabs Below
-     .accesskey = i
- close-other-tabs =
-     .label = Close Other Tabs

src/browser/locales/en-US/browser/unifiedExtensions-ftl.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/locales/en-US/browser/unifiedExtensions.ftl b/browser/locales/en-US/browser/unifiedExtensions.ftl
-index 8db0d9488ac334ada07bf3f537f78cdc99577fb7..acc1d60d5577ffafe982557757c868fa691a1d96 100644
---- a/browser/locales/en-US/browser/unifiedExtensions.ftl
-+++ b/browser/locales/en-US/browser/unifiedExtensions.ftl
-@@ -10,6 +10,8 @@ unified-extensions-header-title = Extensions
- unified-extensions-manage-extensions =
-     .label = Manage extensions
- 
-+unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }. 
-+
- ## An extension in the main list
- 
- # Each extension in the unified extensions panel (list) has a secondary button

src/browser/locales/en-US/browser/zen-split-view.ftl

@@ -1,12 +0,0 @@
-
-tab-zen-split-tabs =
-    .label =
-        { $tabCount ->
-            [1] Split Tab (multiple selected tabs needed)
-           *[other] Split { $tabCount } Tabs
-        }
-    .accesskey = S
-
-zen-split-link =
-    .label = Split link to new tab
-    .accesskey = S

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

@@ -1,4 +0,0 @@
-
-zen-toolbar-context-tabs-right =
-    .label = Tabs on the right
-    .accesskey = R

src/browser/locales/en-US/browser/zen-web-side-panels.ftl

@@ -1,31 +0,0 @@
-zen-web-side-panel-context-mute-panel =
-    .label = Mute Web Panel
-    .accesskey = M
-zen-web-side-panel-context-unmute-panel =
-    .label = Unmute Web Panel
-    .accesskey = m
-
-zen-web-side-panel-context-disable-ua =
-    .label = Disable Mobile UserAgent
-    .accesskey = U
-zen-web-side-panel-context-enable-ua =
-    .label = Enable Mobile UserAgent
-    .accesskey = M
-
-zen-web-side-panel-context-unload =
-    .label = Unload Web Panel
-    .accesskey = W
-zen-web-side-panel-context-delete =
-    .label = Delete Web Panel
-    .accesskey = D
-zen-web-side-panel-open-in-new-tab =
-    .label = Open in New Tab
-    .accesskey = N
-
-
-zen-web-side-panel-context-add-to-panel =
-    .label = Add to Web Panels
-    .accesskey = A
-
-zen-sidebar-introduction-title = Welcome to Zen Sidebar
-zen-sidebar-introduction-description = Zen Sidebar is a new way to browse the web. Click on any of the icons to open a web panel.

src/browser/locales/en-US/browser/zen-welcome.ftl

@@ -1,26 +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/.
-
-welcome-dialog-welcome = 👋 Welcome to { -brand-short-name }
-welcome-dialog-welcome-subtext = Fast. Beautiful. Private.
-welcome-dialog-get-started = Get started
-
-welcome-dialog-import = 😍 Bring your favourites to { -brand-short-name }
-welcome-dialog-import-subtext = Pick up where you left off in your last browser
-welcome-dialog-import-action = Import your data
-
-welcome-dialog-theme = Make yourself at home
-welcome-dialog-theme-subtext = Personalize your experience with your favorite look!
-
-welcome-dialog-theme-header-1 = Choose your perfect color
-welcome-dialog-theme-header-2 = Choose your theme
-
-welcome-dialog-search = 🔍 Choose a search engine
-welcome-dialog-search-subtext = Select your preferred search engine to tailor your browsing experience!
-
-welcome-dialog-thanks = Thank You So Much! ❤️
-welcome-dialog-thanks-subtext = Your appreciation means the world to us!
-
-welcome-dialog-back-action = Back
-welcome-dialog-next-action = Next

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

@@ -1,29 +0,0 @@
-
-zen-panel-ui-current-window-text = Current Window
-
-zen-panel-ui-workspaces-text = Other Workspaces
-
-zen-panel-ui-workspaces-create-text = Create Workspace
-
-zen-panel-ui-workspaces-create-save =
-  .label = Create Workspace
-  .accesskey = S
-zen-panel-ui-workspaces-create-cancel =
-  .label = Cancel
-  .accesskey = C
-
-zen-workspaces-panel-context-delete = 
-    .label = Delete Workspace
-    .accesskey = D
-
-zen-workspaces-panel-context-open = 
-    .label = Open Workspace
-    .accesskey = O
-
-zen-workspaces-panel-context-set-default =
-    .label = Set As Default Workspace
-    .accesskey = S
-
-context-zen-change-workspace-tab = 
-    .label = Change Tab(s) To Workspace
-    .accesskey = C

src/browser/locales/en-US/browser/zenNewWebPanel.ftl

@@ -1,7 +0,0 @@
-
-zen-new-web-panel-url =
-  .value = Initial URL
-  .accesskey = I
-zen-new-web-panel-user-agent =
-  .value = Display this web panel in mobile mode
-  .accesskey = m

src/browser/themes/shared/customizableui/customizeMode-css.patch

@@ -1,20 +0,0 @@
-diff --git a/browser/themes/shared/customizableui/customizeMode.css b/browser/themes/shared/customizableui/customizeMode.css
-index b3ee1ada6cbaef46ade98323d43bf72d84db3b88..a87a7511ba19d02849d1ccab487684156f7d8698 100644
---- a/browser/themes/shared/customizableui/customizeMode.css
-+++ b/browser/themes/shared/customizableui/customizeMode.css
-@@ -547,3 +547,15 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox {
-   80% { border-color: rgb(20,155,249); color: rgb(20,155,249); }
-   100% { border-color: rgb(195,17,206); color: rgb(195,17,206); }
- }
-+
-+#customization-zen-browser-space {
-+  width: 200px;
-+  height: 5px;
-+}
-+
-+#zen-customization-uidensity-separator {
-+  height: 100%;
-+  width: 1px;
-+  margin: 0 5px;
-+  border-left: 1px solid rgba(0,0,0,.15);
-+}

src/toolkit/locales/en-US/toolkit/branding/brandings-ftl.patch

@@ -1,34 +0,0 @@
-diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
-index cc95fbc3b8e1123b6bf3d0fb4cd35a456e413da4..9a090c6a238bdeada9e22514b21bd2b9d39a2b88 100644
---- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
-+++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
-@@ -20,10 +20,10 @@
- -mozmonitor-brand-name = Mozilla Monitor
- -pocket-brand-name = Pocket
- -send-brand-name = Firefox Send
---screenshots-brand-name = Firefox Screenshots
-+-screenshots-brand-name = Zen Screenshots
- -mozilla-vpn-brand-name = Mozilla VPN
---profiler-brand-name = Firefox Profiler
---translations-brand-name = Firefox Translations
-+-profiler-brand-name = Zen Profiler
-+-translations-brand-name = Zen Translations
- -focus-brand-name = Firefox Focus
- -relay-brand-name = Firefox Relay
- -relay-brand-short-name = Relay
-@@ -37,12 +37,12 @@
- 
- # “Suggest” can be localized, “Firefox” must be treated as a brand
- # and kept in English.
---firefox-suggest-brand-name = Firefox Suggest
-+-firefox-suggest-brand-name = Zen Suggest
- 
- # ”Home" can be localized, “Firefox” must be treated as a brand
- # and kept in English.
---firefox-home-brand-name = Firefox Home
-+-firefox-home-brand-name = Zen Home
- 
- # View" can be localized, “Firefox” must be treated as a brand
- # and kept in English.
---firefoxview-brand-name = Firefox View
-+-firefoxview-brand-name = Zen View

src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
-index af0b02444a47cee2a26d859086d52dff5dd3067c..68f382a4d2cf375858f3988b35e1a24b7ed9a761 100644
+index 0e02963b7e2f44e7669a34ded9f0f0636e36e66c..03e203b4eb0c9436ff9767756bfe8e64dd49096e 100644
 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
 +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
-@@ -140,7 +140,7 @@ const KEY_APP_GLOBAL = "app-global";
+@@ -137,7 +137,7 @@ const KEY_APP_GLOBAL = "app-global";
  const KEY_APP_PROFILE = "app-profile";
  const KEY_APP_TEMPORARY = "app-temporary";
  
@@ -11,3 +11,12 @@ index af0b02444a47cee2a26d859086d52dff5dd3067c..68f382a4d2cf375858f3988b35e1a24b
  
  // Properties to cache and reload when an addon installation is pending
  const PENDING_INSTALL_METADATA = [
+@@ -214,7 +214,7 @@ const SIGNED_TYPES = new Set(["extension", "locale", "theme"]);
+ // Time to wait before async save of XPI JSON database, in milliseconds
+ const ASYNC_SAVE_DELAY_MS = 20;
+ 
+-const l10n = new Localization(["browser/appExtensionFields.ftl"], true);
++const l10n = new Localization(["browser/appExtensionFields.ftl", "browser/zenAppExtensionFields.ftl"], true);
+ 
+ /**
+  * Schedules an idle task, and returns a promise which resolves to an

surfer.json

@@ -27,7 +27,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.0-a.26",
+        "displayVersion": "1.0.0-a.29",
         "github": {
           "repo": "zen-browser/desktop"
         },