diff --git a/README.md b/README.md
index 9b344a2a7..b23dca1c4 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,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 `139.0.4`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `140.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.1`!
### Contributing
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 95e73b02b..a77d8f540 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-667950575bde54b8d83db2a25ccf468522d4e0c9
\ No newline at end of file
+d5e5ed08dac5a263dbc7784dff272198b17bbc4f
\ No newline at end of file
diff --git a/src/browser/app/profile/features/workspaces.inc b/src/browser/app/profile/features/workspaces.inc
index 117158f86..2d9548639 100644
--- a/src/browser/app/profile/features/workspaces.inc
+++ b/src/browser/app/profile/features/workspaces.inc
@@ -11,7 +11,7 @@ pref('zen.workspaces.wrap-around-navigation', true);
pref('zen.workspaces.natural-scroll', false);
pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key
pref('services.sync.engine.workspaces', false);
-pref('zen.workspaces.container-specific-essentials-enabled', false);
+pref('zen.workspaces.separate-essentials', true);
#ifdef MOZILLA_OFFICIAL
pref('zen.workspaces.debug', false);
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 1579b56fc..09bbf767f 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -742,19 +742,13 @@ var gZenWorkspacesSettings = {
};
Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs
- Services.prefs.addObserver(
- 'zen.workspaces.container-specific-essentials-enabled',
- tabsUnloaderPrefListener
- );
+ Services.prefs.addObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
window.addEventListener('unload', () => {
Services.prefs.removeObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener);
Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
- Services.prefs.removeObserver(
- 'zen.workspaces.container-specific-essentials-enabled',
- tabsUnloaderPrefListener
- );
+ Services.prefs.removeObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
});
},
};
@@ -1153,7 +1147,7 @@ Preferences.addAll([
default: true,
},
{
- id: 'zen.workspaces.container-specific-essentials-enabled',
+ id: 'zen.workspaces.separate-essentials',
type: 'bool',
default: false,
},
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 5ee4a810c..46a921c8f 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -47,7 +47,7 @@
preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
+ preference="zen.workspaces.separate-essentials"/>
diff --git a/src/zen/common/ZenUIMigration.mjs b/src/zen/common/ZenUIMigration.mjs
index 13f190b3b..0bb03d940 100644
--- a/src/zen/common/ZenUIMigration.mjs
+++ b/src/zen/common/ZenUIMigration.mjs
@@ -51,6 +51,10 @@ class nsZenUIMigration {
if (userChromeFile.exists() || userContentFile.exists()) {
Services.prefs.setBoolPref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
}
+ Services.prefs.setBoolPref(
+ 'zen.workspaces.separate-essentials',
+ Services.prefs.getBoolPref('zen.workspaces.container-specific-essentials-enabled', false)
+ );
}
}
diff --git a/src/zen/tests/container_essentials/browser.toml b/src/zen/tests/container_essentials/browser.toml
index 91470302b..2da4992fc 100644
--- a/src/zen/tests/container_essentials/browser.toml
+++ b/src/zen/tests/container_essentials/browser.toml
@@ -1,5 +1,5 @@
[DEFAULT]
-prefs = ["zen.workspaces.container-specific-essentials-enabled=true"]
+prefs = ["zen.workspaces.separate-essentials=true"]
["browser_container_auto_switch.js"]
["browser_container_specific_essentials.js"]
\ No newline at end of file
diff --git a/src/zen/tests/pinned/browser.toml b/src/zen/tests/pinned/browser.toml
index fd78aab36..1ff8ac558 100644
--- a/src/zen/tests/pinned/browser.toml
+++ b/src/zen/tests/pinned/browser.toml
@@ -1,3 +1,5 @@
+[DEFAULT]
+prefs = ["zen.workspaces.separate-essentials=false"]
["browser_pinned_unload_changed.js"]
["browser_pinned_unload_noreset.js"]
diff --git a/src/zen/tests/workspaces/browser.toml b/src/zen/tests/workspaces/browser.toml
index c68d45ddc..9903e2a83 100644
--- a/src/zen/tests/workspaces/browser.toml
+++ b/src/zen/tests/workspaces/browser.toml
@@ -1,4 +1,5 @@
[DEFAULT]
+prefs = ["zen.workspaces.separate-essentials=false"]
support-files = [
"head.js",
]
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 8f3b3e75a..6d21d4ad0 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -100,7 +100,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
false
);
this.containerSpecificEssentials = Services.prefs.getBoolPref(
- 'zen.workspaces.container-specific-essentials-enabled',
+ 'zen.workspaces.separate-essentials',
false
);
ChromeUtils.defineLazyGetter(this, 'tabContainer', () =>
diff --git a/surfer.json b/surfer.json
index 8578e4cd2..3b549e6e0 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
"binaryName": "zen",
"version": {
"product": "firefox",
- "version": "139.0.4",
- "candidate": "140.0"
+ "version": "140.0.1",
+ "candidate": "140.0.1"
},
"buildOptions": {
"generateBranding": true
@@ -19,7 +19,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
- "displayVersion": "1.13.2b",
+ "displayVersion": "1.14b",
"github": {
"repo": "zen-browser/desktop"
},
@@ -39,7 +39,7 @@
"brandShortName": "Twilight",
"brandFullName": "Zen Twilight",
"release": {
- "displayVersion": "1.14t",
+ "displayVersion": "1.15t",
"github": {
"repo": "zen-browser/desktop"
}