fix: Fixed pinned tabs loading at startup, b=closes #9967, c=folders, workspaces

* feat: Multiselected tabs support

* refactor(folders): Store active tabs as direct references in folders and better handling collapsed items

* fix: Refine tab visibility and state management

* feat:  Add ungroup for multiple selected tabs drag and drop, b=no-bug, c=folders, tabs

* fix: Fixed wrong calculation of indentation and other small refactoring, b=no-bug, c=common, folders, tabs

* fix: Fixed restoring split views, b=no-bug, c=folders, workspaces

* test: Added tests for visible tab, b=no-bug, c=folders, tests, tabs

* feat: Folder active tabs are always visible, b=no-bug, c=folders

* fix: Fixed duplicate tabs appearing on the tab search list, b=no-bug, c=folders

* feat: Added support for active folder unload, b=no-bug, c=folders

* fix: first implementation `expandToSelected`

* fix: Formatting

* fix: Some minor fixes, b=no-bug, c=folders, tabs

* fix: Improve collapse visible tab function, b=no-bug, c=folders

* test: Added folder level tests, b=no-bug, c=folders, tests

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
Co-authored-by: Mr. M <mr.m@tuta.com>

.editorconfig

@@ -1,3 +1,7 @@
+# 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/.
+
 root = true
 
 [*]

.gitattributes

@@ -1,3 +1,7 @@
+# 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/.
+
 *.patch linguist-language=C++
 *.d.ts linguist-language=TypeScript
 

.gitignore

@@ -1,3 +1,7 @@
+# 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/.
+
 .dotbuild/
 engine/
 firefox-*/

.prettierignore

@@ -1,3 +1,7 @@
+# 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/.
+
 engine/
 
 **/*.html

CODEOWNERS

@@ -1 +1 @@
-* @mauro-balades
+* @mr-cheffy

CODE_OF_CONDUCT.md

@@ -1,3 +1,9 @@
+<!--
+   - 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/.
+   -->
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge

README.md

@@ -1,3 +1,8 @@
+<!--
+   - 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/.
+   -->
 <!-- TODO: Get a job -->
 <img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
@@ -29,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 `141.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 141.0.2`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `142.0`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 142.0`!
 
 ### Contributing
 

SECURITY.md

@@ -1,3 +1,9 @@
+<!--
+   - 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/.
+   -->
+
 # Security Policy
 
 ## Reporting a Vulnerability

build/AppDir/AppRun

@@ -1,4 +1,8 @@
 #!/bin/sh
+# 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/.
+
 CURRENTDIR="$(dirname "$(readlink -f "$0")")"
 export PATH="${CURRENTDIR}:${PATH}"
 export MOZ_LEGACY_PROFILES=1          # Prevent per installation profiles

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

@@ -1 +1 @@
-800807ee29855f1008eba2af353488c0a3d7f584
+784e5dbc4955e29ee7a4e0b88adefdd230f2e9fe

build/ts/transform-ts.js

@@ -1,3 +1,7 @@
+// 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/.
+
 const fs = require('fs');
 const MJS_FILES = ['src/zen/split-view/ZenViewSplitter.ts'];
 

build/winsign/bootstrap.ps1

@@ -1,3 +1,7 @@
+# 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/.
+
 (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
 C:\MozillaBuildSetup-Latest.exe /S | out-null
 

build/winsign/firefox_update.ps1

@@ -1,3 +1,6 @@
+# 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/.
 
 Remove-Item -Recurse -Force engine
 Remove-Item -Recurse -Force .surfer

build/winsign/sign.ps1

@@ -1,3 +1,7 @@
+# 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/.
+
 param(
     [string][Parameter(Mandatory=$true)]$SignIdentity,
     [string][Parameter(Mandatory=$true)]$GithubRunId

configs/common/mozconfig

@@ -1,3 +1,7 @@
+# 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/.
+
 # Browser branding
 ac_add_options --with-app-name=${binName}
 ac_add_options --with-app-basename=Zen

configs/linux/mozconfig

@@ -1,3 +1,7 @@
+# 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/.
+
 # 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"
@@ -7,7 +11,8 @@ else
     export CXX=clang++
 fi
 
-if test "$SURFER_COMPAT" = "x86_64"; then
+if test "$ZEN_RELEASE"; then
+    if test "$SURFER_COMPAT" = "x86_64"; then
         ac_add_options --target=x86_64-pc-linux
         ac_add_options --enable-eme=widevine
 
@@ -24,7 +29,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
 
         export LDFLAGS="$LDFLAGS -Wl,-O3"
         export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
-elif test "$SURFER_COMPAT" = "aarch64"; then
+    elif test "$SURFER_COMPAT" = "aarch64"; then
         ac_add_options --target=aarch64-linux-gnu
 
         ac_add_options --enable-optimize="-O3"
@@ -38,17 +43,8 @@ elif test "$SURFER_COMPAT" = "aarch64"; then
         export CXXFLAGS="$CXXFLAGS -O3"
         export LDFLAGS="$LDFLAGS -Wl,-O3"
         export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
-fi
+    fi
 
-    export VERBOSE=1
-    # Uncomment if you want to enable Polly optimizations
-    #export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
-
-# Common options
-ac_add_options --enable-alsa
-ac_add_options --enable-pulseaudio
-
-if test "$ZEN_RELEASE"; then
     # Disable DMD and ELF hacks, enable linker lld
     ac_add_options --disable-dmd
     ac_add_options --enable-linker=lld
@@ -60,3 +56,7 @@ if test "$ZEN_RELEASE"; then
     ac_add_options --enable-strip
     export STRIP_FLAGS="--strip-debug --strip-unneeded"
 fi
+
+# Common options
+ac_add_options --enable-alsa
+ac_add_options --enable-pulseaudio

configs/macos/mozconfig

@@ -1,12 +1,18 @@
+# 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/.
+
 unset MOZ_STDCXX_COMPAT
 
 ac_add_options --disable-dmd
 ac_add_options --enable-eme=widevine
 
-# override LTO settings
-# TODO: Dont use LTO for now, it's causing a lot of issues
-export MOZ_LTO=cross,thin
-ac_add_options --enable-lto=cross,thin
+if test "$ZEN_RELEASE"; then
+  # override LTO settings
+  # TODO: Dont use LTO for now, it's causing a lot of issues
+  export MOZ_LTO=cross,thin
+  ac_add_options --enable-lto=cross,thin
+fi
 
 if test "$ZEN_RELEASE"; then
   if test "$ZEN_GA_DISABLE_PGO"; then
@@ -20,6 +26,7 @@ fi
 if test "$SURFER_COMPAT" = "x86_64"; then
   ac_add_options --target=x86_64-apple-darwin
 
+  if test "$ZEN_RELEASE"; then
     ac_add_options --enable-wasm-avx
     ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
 
@@ -28,10 +35,12 @@ if test "$SURFER_COMPAT" = "x86_64"; then
     export CXXFLAGS="-O3 -march=nehalem"
     export LDFLAGS="-Wl,-O3 -march=nehalem"
     export RUSTFLAGS="-Ctarget-cpu=nehalem"
+  fi
 else
   ac_add_options --enable-clang-plugin
   ac_add_options --target=aarch64-apple-darwin
 
+  if test "$ZEN_RELEASE"; then
     ac_add_options --enable-optimize="-O3 -mcpu=apple-m1 -march=armv8.3-a+simd"
 
     # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
@@ -42,11 +51,5 @@ else
     export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
     export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
     export RUSTFLAGS="-C target-feature=+v8.3a -Ctarget-cpu=apple-m1"
+  fi
 fi
-
-export VERBOSE=1
-
-# Enable polly for macos, since they have a more stable set of GPU drivers,
-# unlike Linux, which has a lot of different drivers.
-# Edit: let's run some experiments, see if RAM usage lowers significantly
-# export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"

configs/windows/mozconfig

@@ -1,3 +1,6 @@
+# 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/.
 
 if test "$ZEN_CROSS_COMPILING"; then
 
@@ -53,7 +56,6 @@ elif test "$SURFER_COMPAT" = "aarch64"; then
 fi
 
 #export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
-export VERBOSE=1
 
 if test "$ZEN_CROSS_COMPILING"; then
   if test "$ZEN_GA_GENERATE_PROFILE"; then

crowdin.yml

@@ -1,3 +1,7 @@
+# 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/.
+
 base_path: locales
 files:
   - source: en-US/browser/browser/zen-general.ftl

docs/changes.md

@@ -1,15 +0,0 @@
-## Changed things that should be tested each release
-
-- Workspaces
-- Sidebar
-- Split views
-- Vertical tabs (expanded and not expanded)
-- Tab groups
-- Welcome Page
-- Overall performance
-- Overall stability
-- Pinning tabs (Grid layout)
-- Overall UX
-- Themes Page
-- Settings Page
-- Keyboard shortcuts, check if there are any missing or not working

docs/contribute.md

@@ -1,3 +1,9 @@
+<!--
+   - 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/.
+   -->
+
 # Branch Structure
 
 The repository is structured as follows:

docs/key-shortcuts.md

@@ -1,18 +0,0 @@
-# Custom Keyboard Shortcuts
-
-```json
-{
-  "<shortcut-id>": {
-    "key": "<key>",
-    "alt": false,
-    "shift": false,
-    "ctrl": false,
-    "meta": false,
-    "keycode": 0
-  }
-}
-```
-
-The `key` field is the key that will trigger the shortcut. The `alt`, `shift`, `ctrl`, and `meta` fields are booleans that indicate if the respective modifier key should be pressed when the shortcut is triggered.
-
-The `keycode` field is the keycode of the key that will trigger the shortcut. This field is optional and can be used to specify the keycode of the key that will trigger the shortcut. If the `keycode` field is specified, the `key` field will be ignored.

docs/workspaces.md

@@ -1,19 +0,0 @@
-# Workspaces Layout
-
-```json
-{
-  "workspaces": [
-    {
-      "uuid": "uuid1",
-      "name": "workspace1",
-      "icon": "icon1",
-      "default": true
-    },
-    ...
-  ]
-}
-```
-
-To save the tabs and identity them, they will contain a `zen-workspace-uuid` attribute with the workspace uuid.
-
-We will make use of Firefox's builtin session restore feature to save the tabs and windows after the user closes the browser.

eslint.config.mjs

@@ -1,3 +1,7 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import js from '@eslint/js';
 import globals from 'globals';
 import { defineConfig } from 'eslint/config';

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = إلى المزيد تعرف
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = مساحات العمل
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = حذف مساحة العمل
     .accesskey = د

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cerca { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Més informació
 zen-close-label = Tanca
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espais de treball
 zen-panel-ui-workspaces-create = 
     .label = Crea un espai
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Suprimeix l'espai de treball
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Hledat { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Přejmenovat složku
+zen-folders-panel-expand-folder = 
+    .label = Rozbalit složku
+zen-folders-panel-delete-folder = 
+    .label = Smazat složku
+zen-folders-panel-convert-folder-to-space = 
+    .label = Převést složku na prostor
+zen-folders-panel-change-folder-space = 
+    .label = Změnit prostor...
+zen-folders-panel-change-icon-folder = 
+    .label = Změnit ikonu
+zen-folders-search-no-results = Žádný panel neodpovídá tomuto hledání 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Zjistit více
 zen-close-label = Zavřít
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Hledat...
+zen-icons-picker-emoji = 
+    .label = Emodži
+zen-icons-picker-svg = 
+    .label = Ikony

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Pracovní prostory
 zen-panel-ui-workspaces-create = 
     .label = Vytvořit prostor
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Odstranit pracovní prostor
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Cau
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D

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

@@ -197,7 +197,7 @@ zen-picture-in-picture-toggle-shortcut-mac = Slå Billede-i-Billede Til/Fra (Mac
 zen-picture-in-picture-toggle-shortcut-mac-alt = Slå Billede-i-Billede Til/Fra (Mac Alt)
 zen-page-source-shortcut-safari = Vis Sidekilde (Safari)
 zen-nav-stop-shortcut = Stop Indlæsning
-zen-history-sidebar-shortcut = Show History Sidebar
+zen-history-sidebar-shortcut = Vis sidepanel for historik
 zen-window-minimize-shortcut = Minimer Vindue
 zen-help-shortcut = Åbn Hjælp
 zen-preferences-shortcut = Åbn Indstillinger
@@ -208,9 +208,9 @@ zen-search-focus-shortcut-alt = Fokuseret Søgning (Alt)
 zen-downloads-shortcut = Open Downloads
 zen-addons-shortcut = Åbn tilføjelser
 zen-file-open-shortcut = Åbn fil
-zen-save-page-shortcut = Save Page
-zen-print-shortcut = Print Page
-zen-close-shortcut-2 = Close Tab
+zen-save-page-shortcut = Gem side
+zen-print-shortcut = Udskriv side
+zen-close-shortcut-2 = Luk fane
 zen-mute-toggle-shortcut = Slå Lyden Til/Fra
 zen-key-delete = Slet nøgle
 zen-key-go-back = Gå tilbage
@@ -233,12 +233,12 @@ zen-find-shortcut = Find på side
 zen-search-find-again-shortcut = Find igen
 zen-search-find-again-shortcut-prev = Find forrige
 zen-search-find-again-shortcut-2 = Find igen (Alt)
-zen-bookmark-this-page-shortcut = Bookmark This Page
+zen-bookmark-this-page-shortcut = Bogmærk denne side
 zen-bookmark-show-library-shortcut = Vis Bogmærkebibliotek
 zen-key-stop = Stop indlæsning
-zen-full-zoom-reduce-shortcut = Zoom Out
-zen-full-zoom-enlarge-shortcut = Zoom In
-zen-full-zoom-reset-shortcut = Reset Zoom
+zen-full-zoom-reduce-shortcut = Zoom ud
+zen-full-zoom-enlarge-shortcut = Zoom ind
+zen-full-zoom-reset-shortcut = Nulstil zoom
 zen-full-zoom-reset-shortcut-alt = Nulstil zoom (Alt)
 zen-full-zoom-enlarge-shortcut-alt = Zoom ind (Alt)
 zen-full-zoom-enlarge-shortcut-alt2 = Zoom ind (Alt 2)
@@ -246,13 +246,13 @@ zen-bidi-switch-direction-shortcut = Skift tekstretning
 zen-private-browsing-shortcut = Privat browsing
 zen-screenshot-shortcut = Tag skærmbillede
 zen-key-sanitize = Ryd browserdata
-zen-quit-app-shortcut = Quit Application
+zen-quit-app-shortcut = Afslut applikation
 zen-key-wr-capture-cmd = WR-optagelseskommando
 zen-key-wr-toggle-capture-sequence-cmd = Slå WR-optagelsessekvens Til/Fra
 zen-nav-reload-shortcut = Genindlæs side
 zen-nav-reload-shortcut-skip-cache = Genindlæs Side (Spring Cache Over)
-zen-close-shortcut = Close Window
-zen-close-tab-shortcut = Close Tab
+zen-close-shortcut = Luk vindue
+zen-close-tab-shortcut = Luk fane
 zen-compact-mode-shortcut-show-sidebar = Flydende sidepanel til/fra
 zen-compact-mode-shortcut-show-toolbar = Flydende værktøjslinje til/fra
 zen-compact-mode-shortcut-toggle = Toggle Compact Mode
@@ -273,7 +273,7 @@ zen-pinned-tab-shortcut-reset = Nulstil fastgjort fane til fastgjort URL
 zen-split-view-shortcut-grid = Opdelt visning i gitter til/fra
 zen-split-view-shortcut-vertical = Lodret opdelt visning til/fra
 zen-split-view-shortcut-horizontal = Vandret opdelt visning til/fra
-zen-split-view-shortcut-unsplit = Close Split View
+zen-split-view-shortcut-unsplit = Luk opdelt visning
 zen-key-select-tab-1 = Vælg fane #1
 zen-key-select-tab-2 = Vælg fane #2
 zen-key-select-tab-3 = Vælg fane #3

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
-    .placeholder = Search { $folder-name }...
+    .placeholder = Søg i { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Lær mere
 zen-close-label = Luk
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Søg...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Arbejdsområder
 zen-panel-ui-workspaces-create = 
     .label = Opret rum
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Slet arbejdsområde
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } durchsuchen...
+zen-folders-panel-rename-folder = 
+    .label = Ordner umbenennen
+zen-folders-panel-expand-folder = 
+    .label = Ordner ausklappen
+zen-folders-panel-delete-folder = 
+    .label = Ordner löschen
+zen-folders-panel-convert-folder-to-space = 
+    .label = Ordner in Arbeitsbereich konvertieren
+zen-folders-panel-change-folder-space = 
+    .label = Arbeitsbereich wechseln...
+zen-folders-panel-change-icon-folder = 
+    .label = Symbol anpassen
+zen-folders-search-no-results = Keine Tabs passend zu dieser Suche 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Mehr erfahren
 zen-close-label = Schließen
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Suchen...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Symbole

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Arbeitsbereiche
 zen-panel-ui-workspaces-create = 
     .label = Arbeitsbereich erstellen
+zen-panel-ui-folder-create = 
+    .label = Ordner erstellen
 zen-workspaces-panel-context-delete = 
     .label = Arbeitsbereich löschen
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Μάθετε Περισσότερα
 zen-close-label = Κλείσιμο
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Αναζήτηση...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Χώροι Εργασίας
 zen-panel-ui-workspaces-create = 
     .label = Δημιουργία Χώρου
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Διαγραφή Χώρου Εργασίας
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -42,3 +42,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Other workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D

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

@@ -1,3 +1,26 @@
 
 zen-folders-search-placeholder =
     .placeholder = Search { $folder-name }...
+
+zen-folders-panel-rename-folder =
+    .label = Rename Folder
+
+zen-folders-panel-unpack-folder =
+    .label = Unpack Folder
+
+zen-folders-new-subfolder =
+    .label = New Subfolder
+
+zen-folders-panel-delete-folder =
+    .label = Delete Folder
+
+zen-folders-panel-convert-folder-to-space =
+    .label = Convert folder to Space
+
+zen-folders-panel-change-folder-space =
+    .label = Change Space...
+
+zen-folders-panel-change-icon-folder =
+    .label = Change Icon
+
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -57,3 +57,8 @@ zen-close-label = Close
 
 zen-singletoolbar-urlbar-placeholder-with-name =
   .placeholder = Search...
+
+zen-icons-picker-emoji =
+  .label = Emojis
+zen-icons-picker-svg =
+  .label = Icons

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

@@ -4,6 +4,9 @@ zen-panel-ui-workspaces-text = Spaces
 zen-panel-ui-workspaces-create =
     .label = Create Space
 
+zen-panel-ui-folder-create =
+    .label = Create Folder
+
 zen-workspaces-panel-context-delete =
     .label = Delete Space
     .accesskey = D
@@ -63,4 +66,4 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 
 zen-workspaces-delete-workspace-title = Delete Space?
-zen-workspaces-delete-workspace-body = Are you sure you want to delete this space? This action cannot be undone.
+zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Buscar { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Renombrar carpeta
+zen-folders-panel-expand-folder = 
+    .label = Expandir carpeta
+zen-folders-panel-delete-folder = 
+    .label = Borrar carpeta
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convertir carpeta en espacio
+zen-folders-panel-change-folder-space = 
+    .label = Cambiar espacio...
+zen-folders-panel-change-icon-folder = 
+    .label = Cambiar icono
+zen-folders-search-no-results = Ninguna pestaña coincide con esa búsqueda 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Más información
 zen-close-label = Cerrar
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Buscar...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Iconos

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espacios de trabajo
 zen-panel-ui-workspaces-create = 
     .label = Crear espacio
+zen-panel-ui-folder-create = 
+    .label = Crear carpeta
 zen-workspaces-panel-context-delete = 
     .label = Eliminar espacio de trabajo
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Rohkem teavet
 zen-close-label = Sulge
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Tööruumid
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Kustuta tööruum
     .accesskey = K

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = دیگر فضاهای کاری
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = حذف فضای کاری
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Työtilat
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Poista Työtila
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Rechercher dans { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Renommer le dossier
+zen-folders-panel-expand-folder = 
+    .label = Développer le dossier
+zen-folders-panel-delete-folder = 
+    .label = Supprimer le dossier
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convertir le dossier en Espace
+zen-folders-panel-change-folder-space = 
+    .label = Changer d'Espace...
+zen-folders-panel-change-icon-folder = 
+    .label = Changer d'icône
+zen-folders-search-no-results = Aucun onglet ne correspond à cette recherche 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = En savoir plus
 zen-close-label = Fermer
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Rechercher...
+zen-icons-picker-emoji = 
+    .label = Émojis
+zen-icons-picker-svg = 
+    .label = Icônes

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

@@ -1,13 +1,15 @@
 zen-panel-ui-workspaces-text = Espaces
 zen-panel-ui-workspaces-create = 
     .label = Créer un Espace
+zen-panel-ui-folder-create = 
+    .label = Créer un dossier
 zen-workspaces-panel-context-delete = 
     .label = Supprimer l’Espace
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Modifier le nom
 zen-workspaces-panel-change-icon = 
-    .label = Changer l'icône
+    .label = Changer d'icône
 zen-workspaces-panel-context-default-profile = 
     .label = Définir le profil
 zen-workspaces-how-to-reorder-title = Comment réordonner les Espaces

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cuardaigh { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Athainmnigh Fillteán
+zen-folders-panel-expand-folder = 
+    .label = Leathnaigh an Fillteán
+zen-folders-panel-delete-folder = 
+    .label = Scrios Fillteán
+zen-folders-panel-convert-folder-to-space = 
+    .label = Tiontaigh fillteán go Spás
+zen-folders-panel-change-folder-space = 
+    .label = Athraigh Spás...
+zen-folders-panel-change-icon-folder = 
+    .label = Athraigh Deilbhín
+zen-folders-search-no-results = Níl aon chluaisíní ann a mheaitseálann an cuardach sin 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Foghlaim Tuilleadh
 zen-close-label = Dún
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cuardaigh...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Deilbhíní

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Spásanna
 zen-panel-ui-workspaces-create = 
     .label = Cruthaigh Spás
+zen-panel-ui-folder-create = 
+    .label = Cruthaigh Fillteán
 zen-workspaces-panel-context-delete = 
     .label = Scrios Spás
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = חיפוש { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = מידע נוסף
 zen-close-label = סגור
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = חיפוש...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = סביבות עבודה
 zen-panel-ui-workspaces-create = 
     .label = צור סביבה
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = מחק סיבת עבודה
     .accesskey = ג

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Keresés { $folder-name } mappában...
+zen-folders-panel-rename-folder = 
+    .label = Mappa átnevezése
+zen-folders-panel-expand-folder = 
+    .label = Mappa kinyitása
+zen-folders-panel-delete-folder = 
+    .label = Mappa törlése
+zen-folders-panel-convert-folder-to-space = 
+    .label = Mappa konvertálása munkakörnyezeté
+zen-folders-panel-change-folder-space = 
+    .label = Környezet váltása...
+zen-folders-panel-change-icon-folder = 
+    .label = Ikon módosítása
+zen-folders-search-no-results = Nincsenek a keresésnek megfelelő lapok 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Tudjon meg többet
 zen-close-label = Bezárás
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Keresés...
+zen-icons-picker-emoji = 
+    .label = Emojik
+zen-icons-picker-svg = 
+    .label = Ikonok

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

@@ -1,8 +1,10 @@
 zen-panel-ui-workspaces-text = Más munkakörnyezetek
 zen-panel-ui-workspaces-create = 
     .label = Környezet létrehozása
+zen-panel-ui-folder-create = 
+    .label = Mappa létrehozása
 zen-workspaces-panel-context-delete = 
-    .label = Munkakörnyezet törlése
+    .label = Környezet törlése
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Átnevezés
@@ -18,7 +20,7 @@ zen-workspaces-panel-context-open =
     .label = Munkakörnyezet megnyitása
     .accesskey = O
 zen-workspaces-panel-context-edit = 
-    .label = Munkakörnyezet módosítása
+    .label = Környezet módosítása
     .accesskey = E
 context-zen-change-workspace-tab = 
     .label = Lap(ok) mozgatása munkakörnyezetbe

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cari { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Pelajari Lebih Lanjut
 zen-close-label = Tutup
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cari...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Ruang Kerja Lainnya
 zen-panel-ui-workspaces-create = 
     .label = Buat Ruang
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Hapus Ruang Kerja
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Læra Meira
 zen-close-label = Loka
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -42,3 +42,7 @@ zen-learn-more-text = Scopri di più
 zen-close-label = Chiudi
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspace
 zen-panel-ui-workspaces-create = 
     .label = Crea Spazio
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Elimina lo spazio di lavoro
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = 閉じる
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = ワークスペース
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = ワークスペースを削除
     .accesskey = D

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

@@ -14,7 +14,7 @@ sync-engine-workspaces =
     .accesskey = W
 zen-glance-title = 글랜스
 zen-glance-header = 글랜스 기본 설정
-zen-glance-description = 새로운 탭을 열지 않고도 빠르게 링크를 열어볼 수 있습니다
+zen-glance-description = 새로운 탭을 열지 않고도 한눈에 링크를 미리 볼 수 있습니다
 zen-glance-trigger-label = 트리거 방식
 zen-glance-enabled = 
     .label = 글랜스 활성화
@@ -28,14 +28,14 @@ zen-glance-trigger-meta-click =
     .label = Meta (Command) + 클릭
 zen-glance-trigger-mantain-click = 
     .label = 길게 클릭 (Coming Soon!)
-zen-look-and-feel-compact-view-header = 컴팩트 모드로 보기
+zen-look-and-feel-compact-view-header = 사이드바 축소 모드로 보기
 zen-look-and-feel-compact-view-description = 사용하는 툴바만 보세요!
 zen-look-and-feel-compact-view-enabled = 
-    .label = { -brand-short-name }의 컴팩트 모드 활성화
+    .label = { -brand-short-name }의 사이드바 축소 모드 활성화
 zen-look-and-feel-compact-view-top-toolbar = 
-    .label = 컴팩트 모드에서 상단 툴바 숨기기
+    .label = 사이드바 축소 모드에서 상단 툴바 숨기기
 zen-look-and-feel-compact-toolbar-flash-popup = 
-    .label = 컴팩트 모드에서 새 탭을 전환하거나 열 때 툴바를 간략하게 팝업으로 표시합니다.
+    .label = 사이드바 축소 모드에서 새 탭을 전환하거나 열 때 툴바를 간략하게 팝업으로 표시합니다
 pane-zen-tabs-title = 탭 관리
 category-zen-workspaces = 
     .tooltiptext = { pane-zen-tabs-title }
@@ -43,9 +43,9 @@ pane-settings-workspaces-title = 워크스페이스
 zen-tabs-unloader-enabled = 
     .label = 탭 언로더 활성화
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = 컴팩트 툴바에 테마 배경 사용
+    .label = 축소된 툴바에 테마 배경 사용
 zen-look-and-feel-compact-sidebar-themed = 
-    .label = 컴팩트 사이드바에 테마 배경 사용
+    .label = 축소된 사이드바에 테마 배경 사용
 zen-workspace-continue-where-left-off = 
     .label = 종료했던 탭에서 다시 시작하기
 pane-zen-pinned-tab-manager-title = 고정된 탭
@@ -89,7 +89,7 @@ zen-vertical-tabs-newtab-top-button-up =
     .label = 새 탭 버튼을 위에 표시하기
 zen-vertical-tabs-expand-tabs-by-default = 기본값으로 탭을 확장하기
 zen-vertical-tabs-dont-expand-tabs-by-default = 기본값으로 탭을 확장하지 않기
-zen-vertical-tabs-expand-tabs-on-hover = 커서를 올려 탭 확장 (컴팩트 모드에서는 작동하지 않음)
+zen-vertical-tabs-expand-tabs-on-hover = 커서를 올려 탭 확장 (사이드바 축소 모드에서는 작동하지 않음)
 zen-vertical-tabs-expand-tabs-header = 탭 확장 방식
 zen-vertical-tabs-expand-tabs-description = 사이드바 탭이 어떻게 확장될지 선택하세요
 zen-theme-marketplace-header = Zen 모드
@@ -167,7 +167,7 @@ zenCKSOption-group-searchAndFind = 검색 & 찾기
 zenCKSOption-group-pageOperations = 페이지 작동
 zenCKSOption-group-historyAndBookmarks = 방문기록 & 북마크
 zenCKSOption-group-mediaAndDisplay = 미디어 & 화면
-zenCKSOption-group-zen-compact-mode = 컴팩트 모드
+zenCKSOption-group-zen-compact-mode = 사이드바 축소 모드
 zenCKSOption-group-zen-workspace = 워크스페이스
 zenCKSOption-group-zen-other = 다른 Zen 기능들
 zenCKSOption-group-zen-split-view = 나눠서 보기
@@ -255,7 +255,7 @@ zen-close-shortcut = 창 닫기
 zen-close-tab-shortcut = 탭 닫기
 zen-compact-mode-shortcut-show-sidebar = 떠 있는 사이드바 켜기/끄기
 zen-compact-mode-shortcut-show-toolbar = 떠 있는 툴바 켜기/끄기
-zen-compact-mode-shortcut-toggle = 컴팩트 모드 켜기/끄기
+zen-compact-mode-shortcut-toggle = 사이드바 축소 모드 켜기/끄기
 zen-workspace-shortcut-switch-1 = 워크스페이스 1로 전환
 zen-workspace-shortcut-switch-2 = 워크스페이스 2로 전환
 zen-workspace-shortcut-switch-3 = 워크스페이스 3으로 전환

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } 검색...
+zen-folders-panel-rename-folder = 
+    .label = 폴더 이름 변경
+zen-folders-panel-expand-folder = 
+    .label = 폴더 확장
+zen-folders-panel-delete-folder = 
+    .label = 폴더 삭제
+zen-folders-panel-convert-folder-to-space = 
+    .label = 폴더를 스페이스로 변환
+zen-folders-panel-change-folder-space = 
+    .label = 스페이스 변경...
+zen-folders-panel-change-icon-folder = 
+    .label = 아이콘 변경
+zen-folders-search-no-results = 검색어에 맞는 탭이 없습니다 🤔

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

@@ -29,7 +29,7 @@ zen-general-cancel-label =
     .label = 취소
 zen-general-confirm = 
     .label = 확인
-zen-pinned-tab-replaced = 탭의 고정된 URL이 현재 URL로 변경되었습니다.
+zen-pinned-tab-replaced = 고정 URL이 현재 URL로 변경되었습니다!
 zen-tabs-renamed = 탭의 이름이 성공적으로 변경되었습니다!
 zen-background-tab-opened-toast = 새 백그라운드 탭이 열렸습니다!
 zen-workspace-renamed-toast = 워크스페이스 이름이 변경되었습니다!
@@ -44,3 +44,7 @@ zen-learn-more-text = 더 알아보기
 zen-close-label = 닫기
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 검색...
+zen-icons-picker-emoji = 
+    .label = 이모티콘
+zen-icons-picker-svg = 
+    .label = 아이콘

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

@@ -2,10 +2,10 @@ zen-toolbar-context-tabs-right =
     .label = 탭을 우측으로 놓기
     .accesskey = R
 zen-toolbar-context-compact-mode = 
-    .label = 컴팩트 모드
+    .label = 사이드바 축소 모드
     .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
-    .label = 컴팩트 모드 활성화
+    .label = 사이드바 축소 모드 활성화
     .accesskey = D
 zen-toolbar-context-compact-mode-just-tabs = 
     .label = 사이드바 숨기기

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

@@ -19,7 +19,7 @@ zen-welcome-start-browsing-title =
     준비됐나요?<br/>
     이제 시작합시다!
 zen-welcome-start-browsing-description-1 = 브라우저가 준비되었습니다. 아래 버튼을 눌러 { -brand-short-name }과 브라우징을 시작하세요.
-zen-welcome-start-browsing = 들어가기!
+zen-welcome-start-browsing = 시작하기!
 zen-welcome-default-search-title = 기본 검색 엔진
 zen-welcome-default-search-description = 기본 검색 엔진을 선택하세요. 나중에 언제든지 바꿀 수 있습니다!
 zen-welcome-skip-button = 건너뛰기

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = 다른 워크스페이스
 zen-panel-ui-workspaces-create = 
     .label = 스페이스 만들기
+zen-panel-ui-folder-create = 
+    .label = 폴더 생성
 zen-workspaces-panel-context-delete = 
     .label = 워크스페이스 삭제
     .accesskey = D
@@ -18,7 +20,7 @@ zen-workspaces-panel-context-open =
     .label = 워크스페이스 열기
     .accesskey = O
 zen-workspaces-panel-context-edit = 
-    .label = 워크스페이스 편집
+    .label = 스페이스 편집
     .accesskey = E
 context-zen-change-workspace-tab = 
     .label = 다른 워크스페이스로 이동

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Ieškoti „{ $folder-name }“...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Sužinoti daugiau
 zen-close-label = Užverti
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Ieškokite...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Darbo sritys
 zen-panel-ui-workspaces-create = 
     .label = Kurti erdvę
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Ištrinti darbo sritį
     .accesskey = D

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

@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Zoek { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔

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

@@ -44,3 +44,7 @@ zen-learn-more-text = Meer leren
 zen-close-label = Sluiten
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Zoeken…
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons

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

@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Ruimtes
 zen-panel-ui-workspaces-create = 
     .label = Ruimte aanmaken
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Ruimte verwijderen
     .accesskey = D