From a7eceabf2f1f43909b8cd6918e01032d8383db9d Mon Sep 17 00:00:00 2001
From: onemen <tabmix.onemen@gmail.com>
Date: Wed, 12 Feb 2025 13:26:54 +0200
Subject: [PATCH] refactor: remove obsolete code

---
 addon/chrome/content/click/click.js           |    8 +-
 addon/chrome/content/click/listeners.js       |    8 -
 addon/chrome/content/dialogs/promptservice.js |  285 --
 .../content/dialogs/promptservice.xhtml       |   46 -
 addon/chrome/content/extensions/extensions.js |   59 +-
 addon/chrome/content/links/setup.js           |   69 +-
 addon/chrome/content/links/userInterface.js   |    4 +-
 addon/chrome/content/minit/minit.js           |   62 +-
 addon/chrome/content/minit/tabView.js         |  581 ---
 addon/chrome/content/minit/tablib.js          |  227 +-
 addon/chrome/content/overlay/tsconfig.json    |    2 +-
 .../content/preferences/appearance.xhtml      |    6 -
 .../content/preferences/incompatible.xhtml    |    2 +-
 addon/chrome/content/preferences/menu.js      |   21 -
 addon/chrome/content/preferences/menu.xhtml   |   11 -
 .../chrome/content/preferences/preferences.js |   46 +-
 addon/chrome/content/preferences/session.js   |   85 -
 .../chrome/content/preferences/session.xhtml  |  208 +-
 .../subdialogs/pref-appearance.css            |    1 +
 addon/chrome/content/scripts/content.js       |    9 -
 addon/chrome/content/session/session.js       | 3720 -----------------
 addon/chrome/content/session/sessionStore.js  |  137 +-
 addon/chrome/content/tab/tab.js               |   57 -
 addon/chrome/content/tabmix.js                |   54 +-
 addon/chrome/content/tabmix.xhtml             |   10 -
 addon/chrome/content/utils.js                 |   50 +-
 addon/chrome/locale/bg-BG/misc.dtd            |    3 -
 addon/chrome/locale/bg-BG/pref-tabmix.dtd     |   28 -
 .../locale/bg-BG/session-manager.properties   |  110 -
 addon/chrome/locale/bg-BG/tabmix.dtd          |    2 -
 addon/chrome/locale/ca/misc.dtd               |    3 -
 addon/chrome/locale/ca/pref-tabmix.dtd        |   28 -
 .../locale/ca/session-manager.properties      |  110 -
 addon/chrome/locale/ca/tabmix.dtd             |    2 -
 addon/chrome/locale/cs-CZ/misc.dtd            |    3 -
 addon/chrome/locale/cs-CZ/pref-tabmix.dtd     |   28 -
 .../locale/cs-CZ/session-manager.properties   |  110 -
 addon/chrome/locale/cs-CZ/tabmix.dtd          |    2 -
 addon/chrome/locale/da/misc.dtd               |    3 -
 addon/chrome/locale/da/pref-tabmix.dtd        |   28 -
 .../locale/da/session-manager.properties      |  110 -
 addon/chrome/locale/da/tabmix.dtd             |    2 -
 addon/chrome/locale/de/misc.dtd               |    3 -
 addon/chrome/locale/de/pref-tabmix.dtd        |   28 -
 .../locale/de/session-manager.properties      |  110 -
 addon/chrome/locale/de/tabmix.dtd             |    2 -
 addon/chrome/locale/el/misc.dtd               |    3 -
 addon/chrome/locale/el/pref-tabmix.dtd        |   28 -
 .../locale/el/session-manager.properties      |  110 -
 addon/chrome/locale/el/tabmix.dtd             |    2 -
 addon/chrome/locale/en-US/misc.dtd            |    3 -
 addon/chrome/locale/en-US/pref-tabmix.dtd     |   28 -
 .../locale/en-US/session-manager.properties   |  110 -
 addon/chrome/locale/en-US/tabmix.dtd          |    2 -
 addon/chrome/locale/es-ES/misc.dtd            |    3 -
 addon/chrome/locale/es-ES/pref-tabmix.dtd     |   28 -
 .../locale/es-ES/session-manager.properties   |  110 -
 addon/chrome/locale/es-ES/tabmix.dtd          |    2 -
 addon/chrome/locale/et-EE/misc.dtd            |    3 -
 addon/chrome/locale/et-EE/pref-tabmix.dtd     |   28 -
 .../locale/et-EE/session-manager.properties   |  110 -
 addon/chrome/locale/et-EE/tabmix.dtd          |    2 -
 addon/chrome/locale/fa-IR/misc.dtd            |    3 -
 addon/chrome/locale/fa-IR/pref-tabmix.dtd     |   28 -
 .../locale/fa-IR/session-manager.properties   |  110 -
 addon/chrome/locale/fa-IR/tabmix.dtd          |    2 -
 addon/chrome/locale/fr/misc.dtd               |    3 -
 addon/chrome/locale/fr/pref-tabmix.dtd        |   28 -
 .../locale/fr/session-manager.properties      |  110 -
 addon/chrome/locale/fr/tabmix.dtd             |    2 -
 addon/chrome/locale/he-IL/misc.dtd            |    3 -
 addon/chrome/locale/he-IL/pref-tabmix.dtd     |   28 -
 .../locale/he-IL/session-manager.properties   |  110 -
 addon/chrome/locale/he-IL/tabmix.dtd          |    2 -
 addon/chrome/locale/hr-HR/misc.dtd            |    3 -
 addon/chrome/locale/hr-HR/pref-tabmix.dtd     |   28 -
 .../locale/hr-HR/session-manager.properties   |  110 -
 addon/chrome/locale/hr-HR/tabmix.dtd          |    2 -
 addon/chrome/locale/hu-HU/misc.dtd            |    3 -
 addon/chrome/locale/hu-HU/pref-tabmix.dtd     |   28 -
 .../locale/hu-HU/session-manager.properties   |  110 -
 addon/chrome/locale/hu-HU/tabmix.dtd          |    2 -
 addon/chrome/locale/it/misc.dtd               |    3 -
 addon/chrome/locale/it/pref-tabmix.dtd        |   28 -
 .../locale/it/session-manager.properties      |  110 -
 addon/chrome/locale/it/tabmix.dtd             |    2 -
 addon/chrome/locale/ja/misc.dtd               |    3 -
 addon/chrome/locale/ja/pref-tabmix.dtd        |   28 -
 .../locale/ja/session-manager.properties      |  110 -
 addon/chrome/locale/ja/tabmix.dtd             |    2 -
 addon/chrome/locale/ko-KR/misc.dtd            |    3 -
 addon/chrome/locale/ko-KR/pref-tabmix.dtd     |   28 -
 .../locale/ko-KR/session-manager.properties   |  110 -
 addon/chrome/locale/ko-KR/tabmix.dtd          |    2 -
 addon/chrome/locale/nl/misc.dtd               |    3 -
 addon/chrome/locale/nl/pref-tabmix.dtd        |   28 -
 .../locale/nl/session-manager.properties      |  110 -
 addon/chrome/locale/nl/tabmix.dtd             |    2 -
 addon/chrome/locale/pl/misc.dtd               |    3 -
 addon/chrome/locale/pl/pref-tabmix.dtd        |   28 -
 .../locale/pl/session-manager.properties      |  110 -
 addon/chrome/locale/pl/tabmix.dtd             |    2 -
 addon/chrome/locale/pt-BR/misc.dtd            |    3 -
 addon/chrome/locale/pt-BR/pref-tabmix.dtd     |   28 -
 .../locale/pt-BR/session-manager.properties   |  110 -
 addon/chrome/locale/pt-BR/tabmix.dtd          |    2 -
 addon/chrome/locale/pt-PT/misc.dtd            |    3 -
 addon/chrome/locale/pt-PT/pref-tabmix.dtd     |   28 -
 .../locale/pt-PT/session-manager.properties   |  110 -
 addon/chrome/locale/pt-PT/tabmix.dtd          |    2 -
 addon/chrome/locale/ro/misc.dtd               |    3 -
 addon/chrome/locale/ro/pref-tabmix.dtd        |   28 -
 .../locale/ro/session-manager.properties      |  110 -
 addon/chrome/locale/ro/tabmix.dtd             |    2 -
 addon/chrome/locale/ru-RU/misc.dtd            |    3 -
 addon/chrome/locale/ru-RU/pref-tabmix.dtd     |   28 -
 .../locale/ru-RU/session-manager.properties   |  110 -
 addon/chrome/locale/ru-RU/tabmix.dtd          |    2 -
 addon/chrome/locale/sk-SK/misc.dtd            |    3 -
 addon/chrome/locale/sk-SK/pref-tabmix.dtd     |   28 -
 .../locale/sk-SK/session-manager.properties   |  110 -
 addon/chrome/locale/sk-SK/tabmix.dtd          |    2 -
 addon/chrome/locale/sr/misc.dtd               |    3 -
 addon/chrome/locale/sr/pref-tabmix.dtd        |   28 -
 .../locale/sr/session-manager.properties      |  110 -
 addon/chrome/locale/sr/tabmix.dtd             |    2 -
 addon/chrome/locale/sv-SE/misc.dtd            |    3 -
 addon/chrome/locale/sv-SE/pref-tabmix.dtd     |   28 -
 .../locale/sv-SE/session-manager.properties   |  110 -
 addon/chrome/locale/sv-SE/tabmix.dtd          |    2 -
 addon/chrome/locale/tr/misc.dtd               |    3 -
 addon/chrome/locale/tr/pref-tabmix.dtd        |   28 -
 .../locale/tr/session-manager.properties      |  110 -
 addon/chrome/locale/tr/tabmix.dtd             |    2 -
 addon/chrome/locale/uk-UA/misc.dtd            |    3 -
 addon/chrome/locale/uk-UA/pref-tabmix.dtd     |   28 -
 .../locale/uk-UA/session-manager.properties   |  110 -
 addon/chrome/locale/uk-UA/tabmix.dtd          |    2 -
 addon/chrome/locale/vi/misc.dtd               |    3 -
 addon/chrome/locale/vi/pref-tabmix.dtd        |   28 -
 .../locale/vi/session-manager.properties      |  110 -
 addon/chrome/locale/vi/tabmix.dtd             |    2 -
 addon/chrome/locale/zh-CN/misc.dtd            |    3 -
 addon/chrome/locale/zh-CN/pref-tabmix.dtd     |   28 -
 .../locale/zh-CN/session-manager.properties   |  110 -
 addon/chrome/locale/zh-CN/tabmix.dtd          |    2 -
 addon/chrome/locale/zh-TW/misc.dtd            |    3 -
 addon/chrome/locale/zh-TW/pref-tabmix.dtd     |   28 -
 .../locale/zh-TW/session-manager.properties   |  110 -
 addon/chrome/locale/zh-TW/tabmix.dtd          |    2 -
 .../app_version/all/preferences-proton.css    |    4 -
 addon/chrome/skin/tabmix-preferences.css      |   21 +-
 addon/defaults/preferences/tabmix.js          |   34 +-
 addon/modules/AutoReload.sys.mjs              |    2 -
 addon/modules/Decode.sys.mjs                  |   58 -
 addon/modules/RenameTab.sys.mjs               |    1 -
 addon/modules/Shortcuts.sys.mjs               |   39 +-
 addon/modules/TabmixSvc.sys.mjs               |   33 +-
 addon/modules/Utils.sys.mjs                   |    6 -
 addon/modules/bootstrap/ScriptsLoader.sys.mjs |    1 -
 addon/modules/extensions/AddonManager.sys.mjs |   52 +-
 .../extensions/CompatibilityCheck.sys.mjs     |   87 +-
 .../extensions/TabGroupsManager.sys.mjs       |  148 -
 config/eslint-plugin-tabmix/index.js          |    9 -
 eslint.config.js                              |    6 -
 types/addon.d.ts                              |   46 +-
 types/autoReload.d.ts                         |    6 +
 types/custom.gecko.dom.d.ts                   |    4 -
 types/customDialog.d.ts                       |   31 -
 types/extraTabmixUtils.d.ts                   |   10 +-
 types/gecko/tools/index.d.ts                  |    5 +
 types/gecko/tools/lib.gecko.dom.d.ts          |  108 +-
 types/gecko/tools/lib.gecko.nsresult.d.ts     |    6 +
 types/gecko/tools/lib.gecko.tweaks.d.ts       |   19 +-
 types/gecko/tools/lib.gecko.xpcom.d.ts        |   73 +-
 types/general.d.ts                            |    5 +-
 types/override.d.ts                           |    4 +-
 types/preferences.d.ts                        |   25 +-
 types/tabmix.d.ts                             |   16 +-
 179 files changed, 400 insertions(+), 10660 deletions(-)
 delete mode 100644 addon/chrome/content/dialogs/promptservice.js
 delete mode 100644 addon/chrome/content/dialogs/promptservice.xhtml
 delete mode 100644 addon/chrome/content/minit/tabView.js
 delete mode 100644 addon/chrome/content/session/session.js
 delete mode 100644 addon/chrome/locale/bg-BG/session-manager.properties
 delete mode 100644 addon/chrome/locale/ca/session-manager.properties
 delete mode 100644 addon/chrome/locale/cs-CZ/session-manager.properties
 delete mode 100644 addon/chrome/locale/da/session-manager.properties
 delete mode 100644 addon/chrome/locale/de/session-manager.properties
 delete mode 100644 addon/chrome/locale/el/session-manager.properties
 delete mode 100644 addon/chrome/locale/en-US/session-manager.properties
 delete mode 100644 addon/chrome/locale/es-ES/session-manager.properties
 delete mode 100644 addon/chrome/locale/et-EE/session-manager.properties
 delete mode 100644 addon/chrome/locale/fa-IR/session-manager.properties
 delete mode 100644 addon/chrome/locale/fr/session-manager.properties
 delete mode 100644 addon/chrome/locale/he-IL/session-manager.properties
 delete mode 100644 addon/chrome/locale/hr-HR/session-manager.properties
 delete mode 100644 addon/chrome/locale/hu-HU/session-manager.properties
 delete mode 100644 addon/chrome/locale/it/session-manager.properties
 delete mode 100644 addon/chrome/locale/ja/session-manager.properties
 delete mode 100644 addon/chrome/locale/ko-KR/session-manager.properties
 delete mode 100644 addon/chrome/locale/nl/session-manager.properties
 delete mode 100644 addon/chrome/locale/pl/session-manager.properties
 delete mode 100644 addon/chrome/locale/pt-BR/session-manager.properties
 delete mode 100644 addon/chrome/locale/pt-PT/session-manager.properties
 delete mode 100644 addon/chrome/locale/ro/session-manager.properties
 delete mode 100644 addon/chrome/locale/ru-RU/session-manager.properties
 delete mode 100644 addon/chrome/locale/sk-SK/session-manager.properties
 delete mode 100644 addon/chrome/locale/sr/session-manager.properties
 delete mode 100644 addon/chrome/locale/sv-SE/session-manager.properties
 delete mode 100644 addon/chrome/locale/tr/session-manager.properties
 delete mode 100644 addon/chrome/locale/uk-UA/session-manager.properties
 delete mode 100644 addon/chrome/locale/vi/session-manager.properties
 delete mode 100644 addon/chrome/locale/zh-CN/session-manager.properties
 delete mode 100644 addon/chrome/locale/zh-TW/session-manager.properties
 delete mode 100644 addon/modules/Decode.sys.mjs
 delete mode 100644 addon/modules/extensions/TabGroupsManager.sys.mjs
 delete mode 100644 types/customDialog.d.ts

diff --git a/addon/chrome/content/click/click.js b/addon/chrome/content/click/click.js
index be71c70ef..a219d4492 100644
--- a/addon/chrome/content/click/click.js
+++ b/addon/chrome/content/click/click.js
@@ -546,12 +546,6 @@ var TabmixContext = {
     Tabmix.showItem("context_unpinTab", !multiselectionContext && show && aTab.pinned);
     Tabmix.showItem("context_pinSelectedTabs", multiselectionContext && show && !aTab.pinned);
     Tabmix.showItem("context_unpinSelectedTabs", multiselectionContext && show && aTab.pinned);
-    setTimeout(() => {
-      // we need to set our show/hide after tabGroups extension
-      let tabViewMenu = document.getElementById("context_tabViewMenu") ||
-          document.getElementById("tabGroups-context_tabViewMenu");
-      Tabmix.showItem(tabViewMenu, Tabmix.prefs.getBoolPref("moveToGroup") && !aTab.pinned);
-    });
     Tabmix.showItem("context_moveTabOptions", Tabmix.prefs.getBoolPref("moveTabOptions"));
 
     // make sure not to show menu items that are hidden by Firefox
@@ -1267,7 +1261,7 @@ var TabmixAllTabs = {
     if (typeof window.colorfulTabs == "object") {
       let rule = "none";
       if (window.colorfulTabs.clrAllTabsPopPref) {
-        let tabClr = TabmixSessionData.getTabValue(tab, "tabClr");
+        let tabClr = SessionStore.getCustomTabValue(tab, "tabClr");
         if (tabClr)
           rule = "linear-gradient(rgba(255,255,255,.7),rgba(#1,.5),rgb(#1)),linear-gradient(rgb(#1),rgb(#1))"
               .replace(/#1/g, tabClr);
diff --git a/addon/chrome/content/click/listeners.js b/addon/chrome/content/click/listeners.js
index 3250554e0..38e666f3d 100644
--- a/addon/chrome/content/click/listeners.js
+++ b/addon/chrome/content/click/listeners.js
@@ -23,14 +23,6 @@
   const mainCommandSet = document.getElementById("mainCommandSet");
   mainCommandSet?.addEventListener("command", (/** @type {PopupEvent} */ event) => {
     switch (event.target.id) {
-      case "TabmixSessionUtils:SaveThisWindow":
-        TabmixSessionManager.sessionUtil("save", "thiswindow");
-        event.stopPropagation();
-        break;
-      case "TabmixSessionUtils:SaveAllWindow":
-        TabmixSessionManager.sessionUtil("save", "allwindows");
-        event.stopPropagation();
-        break;
       case "History:UndoCloseTab":
         event.stopPropagation();
         undoCloseTab();
diff --git a/addon/chrome/content/dialogs/promptservice.js b/addon/chrome/content/dialogs/promptservice.js
deleted file mode 100644
index 4fd57c60e..000000000
--- a/addon/chrome/content/dialogs/promptservice.js
+++ /dev/null
@@ -1,285 +0,0 @@
-/// <reference types="../../../../types/customDialog.d.ts" />
-
-/* exported TMP_BUTTON_OK, TMP_BUTTON_CANCEL, TMP_BUTTON_EXTRA1, TMP_SHOW_MENULIST,
-            TMP_SHOW_TEXTBOX, TMP_HIDE_MENUANDTEXT, TMP_CHECKBOX_UNCHECKED,
-            TMP_CHECKBOX_CHECKED, TMP_HIDE_CHECKBOX, TMP_SELECT_DEFAULT,
-            TMP_SELECT_LASTSESSION, TMP_SELECT_CRASH, TMP_SHOW_CLOSED_WINDOW_LIST,
-            TMP_DLG_SAVE, TMP_DLG_RENAME,
-            prompt_init, prompt_extra1 */
-"use strict";
-
-var TMP_BUTTON_OK = 0;
-var TMP_BUTTON_CANCEL = 1;
-var TMP_BUTTON_EXTRA1 = 2;
-var TMP_SHOW_MENULIST = 1;
-var TMP_SHOW_TEXTBOX = 0;
-var TMP_HIDE_MENUANDTEXT = 2;
-var TMP_CHECKBOX_UNCHECKED = 0;
-var TMP_CHECKBOX_CHECKED = 1;
-var TMP_HIDE_CHECKBOX = 2;
-var TMP_SELECT_DEFAULT = 0;
-var TMP_SELECT_LASTSESSION = 1;
-var TMP_SELECT_CRASH = 2;
-var TMP_SHOW_CLOSED_WINDOW_LIST = 3;
-var TMP_DLG_SAVE = 0;
-var TMP_DLG_RENAME = 1;
-
-/** @type {nsIDialogParamBlock} */
-var dialogParams;
-/** @type {number} */
-var gHideElmParam;
-/** @type {string[]} */
-var gSavedName;
-/** @type {string} */
-var gCancelLabel;
-/** @type {string} */
-var gOrigName;
-/** @type {Element} */
-let documentElement;
-
-function prompt_init() {
-  if (!document.documentElement) {
-    // not supposed to happen
-    return;
-  }
-  documentElement = document.documentElement;
-
-  const dialog = documentElement;
-  dialog.addEventListener("dialogaccept", prompt_deinit.bind(dialog, 0));
-  dialog.addEventListener("dialogcancel", prompt_deinit.bind(dialog, 1));
-  dialog.addEventListener("dialogextra1", prompt_extra1.bind(dialog, 2));
-
-  dialogParams = window.arguments[0].QueryInterface(Ci.nsIDialogParamBlock);
-  document.title = dialogParams.GetString(0);
-
-  // display the main text
-  var messageText = dialogParams.GetString(1);
-  var messageParent = document.getElementById("tm_info");
-  var messageParagraphs = messageText.split("\n");
-  gHideElmParam = dialogParams.GetInt(1);
-  for (const paragraphs of messageParagraphs) {
-    const descriptionNode = document.createElement("description");
-    const text = document.createTextNode(paragraphs);
-    descriptionNode.appendChild(text);
-    messageParent.appendChild(descriptionNode);
-  }
-
-  // display the menulist
-  gHideElmParam = dialogParams.GetInt(1);
-  var menuList = document.getElementById("tm_prompt");
-  if (gHideElmParam == TMP_SHOW_MENULIST) {
-    var index, isDisabled, popup = document.getElementById("tm_prompt_menu");
-    if (dialogParams.GetInt(4) == 1)
-      window.opener.Tabmix.Sessions.createMenuForDialog(popup, dialogParams.GetInt(3));
-    else
-      window.opener.TabmixSessionManager.createMenuForDialog(popup, dialogParams.GetInt(3));
-    switch (dialogParams.GetInt(3)) {
-      case TMP_SELECT_CRASH: index = popup.childNodes.length - 1;
-        break;
-      case TMP_SHOW_CLOSED_WINDOW_LIST: index = 1; // 0 is menuseparator
-        break;
-      default:
-        index = menuList.defaultIndex;
-        if (index >= popup.childNodes.length || index < 0) index = 1;
-        isDisabled = popup.childNodes[index]?.getAttribute("disabled") == "true";
-        // select the first entry that isn't menuseparator and not "disabled"
-        if (!isDisabled) break;
-        for (let i = 1; i < popup.childNodes.length; ++i) {
-          const item = popup.childNodes[i];
-          if (item && item.localName != "menuseparator" &&
-            item.getAttribute("disabled") != "true") {
-            index = i;
-            break;
-          }
-        }
-    }
-    menuList.selectedIndex = index;
-  } else {
-    menuList.hidden = true;
-  }
-
-  // display the textBox
-  var textBox = document.getElementById("tm_textbox");
-  if (gHideElmParam == TMP_SHOW_TEXTBOX) {
-    messageParent.lastChild?.setAttribute("style", "height:3em");
-    gSavedName = dialogParams.GetString(2).split("\n");
-    textBox.value = gSavedName.shift() ?? "";
-    gOrigName = textBox.value.toLowerCase();
-  } else {
-    textBox.hidden = true;
-  }
-
-  // display the checkbox
-  var checkBox = document.getElementById("tm_checkbox");
-  var check = dialogParams.GetInt(2);
-  if (check != TMP_HIDE_CHECKBOX) {
-    document.getElementById("checkboxContainer").removeAttribute("collapsed");
-    checkBox.checked = check == TMP_CHECKBOX_CHECKED;
-    setLabelForNode(checkBox, dialogParams.GetString(3));
-  }
-
-  // display the command buttons
-  const buttons = ["accept", "cancel", "extra1"];
-  var btnLabels = dialogParams.GetString(4).split("\n");
-  buttons.forEach((type, i) => {
-    const button = documentElement.getButton(type);
-    if (i < btnLabels.length && btnLabels[i]) {
-      setLabelForNode(button, btnLabels[i]);
-    } else {
-      button.hidden = true; // hide extra button
-    }
-  });
-
-  // Set and focus default button
-  var dButton = buttons[dialogParams.GetInt(0)] ?? "accept";
-  dialog.defaultButton = dButton;
-  if (gHideElmParam == TMP_HIDE_MENUANDTEXT) { // hide menulist & text box and set focus to default Button
-    document.getElementById("space_before_checkbox").hidden = true;
-    dialog.getButton(dButton).focus();
-  }
-
-  if (gHideElmParam == TMP_SHOW_TEXTBOX) {
-    dialog.getButton("extra1").hidden = true;
-    gCancelLabel = dialog.getButton("cancel").label ?? "Cancel";
-    inputText(textBox);
-  }
-
-  // Move to the right location
-  moveToAlertPosition();
-  centerWindowOnScreen();
-}
-
-/** @param {number} button */
-function prompt_deinit(button) {
-  dialogParams.SetInt(4, button); // ok = 0; cancel = 1; extra1 = 2;
-  dialogParams.SetInt(5, Number(document.getElementById("tm_checkbox").checked));
-  if (gHideElmParam < TMP_HIDE_MENUANDTEXT) {
-    if (gHideElmParam == TMP_SHOW_MENULIST) {
-      var item = document.getElementById("tm_prompt").selectedItem;
-      ///XXX item.fileName - in the new Tabmix.Sessions
-      dialogParams.SetString(5, item.session || item.fileName);
-      dialogParams.SetInt(6, parseInt(item.getAttribute("value") ?? ""));
-    } else {
-      dialogParams.SetString(5, document.getElementById("tm_textbox").value);
-    }
-  }
-  // if we are not a modal use a callback function
-  if (typeof window._callBackFunction == "function") {
-    if (window.opener && !window.opener.closed) {
-      let returnData = {
-        button: dialogParams.GetInt(4),
-        checked: dialogParams.GetInt(5) == TMP_CHECKBOX_CHECKED,
-        label: dialogParams.GetString(5),
-        value: dialogParams.GetInt(6)
-      };
-      try {
-        window._callBackFunction(returnData);
-      } catch (ex) {
-        Tabmix.assert(ex, "error in callback " + window._callBackFunction.name);
-      }
-    }
-    delete window._callBackFunction;
-  }
-}
-
-/** @param {number} button */
-function prompt_extra1(button) {
-  prompt_deinit(button);
-  window.close();
-}
-
-// copy from commonDialog.js
-/**
- * @param {HTMLInputElement | HTMLButtonElement} aNode
- * @param {string} aLabel
- * @param {boolean} [aIsLabelFlag]
- */
-function setLabelForNode(aNode, aLabel, aIsLabelFlag) {
-  var accessKey = null;
-  if (/ *\(&([^&])\)(:?)$/.test(aLabel)) {
-    aLabel = RegExp.leftContext + RegExp.$2;
-    accessKey = RegExp.$1;
-  } else if (/^([^&]*)&(([^&]).*$)/.test(aLabel)) {
-    aLabel = RegExp.$1 + RegExp.$2;
-    accessKey = RegExp.$3;
-  }
-
-  // && is the magic sequence to embed an & in your label.
-  aLabel = aLabel.replace(/&&/g, "&");
-  if (aIsLabelFlag) { // Set text for <label> element
-    aNode.setAttribute("value", aLabel);
-  } else { // Set text for other xul elements
-    aNode.label = aLabel;
-  }
-
-  // Need to set this after aNode.setAttribute("value", aLabel);
-  if (accessKey)
-    aNode.accessKey = accessKey;
-}
-
-/** @param {HTMLInputElement} textBox */
-function inputText(textBox) {
-  var btnOK = documentElement.getButton("accept");
-  var btnCancel = documentElement.getButton("cancel");
-  var btnExt = documentElement.getButton("extra1");
-  var msg = [];
-  msg[0] = "";
-  /**
-      var msg1 = "Name must be at least one letter or number."
-      var msg2 = "This name already in use!"
-      var msg3 = "Are you sure you want to replace the session?"
-      var cLabel = "&Don't Replace";
-      */
-  msg[1] = TabmixSvc.getSMString("sm.sessionName.msg1");
-  msg[2] = TabmixSvc.getSMString("sm.sessionName.msg2");
-  msg[3] = msg[2] + ", " + TabmixSvc.getSMString("sm.sessionName.msg3");
-  var cLabel = TabmixSvc.setLabel("sm.replaceStartup.button1");
-  /** @type {CharacterData} */ // @ts-expect-error
-  var description = document.getElementById("tm_info").lastChild.firstChild;
-  textBox.value = textBox.value.replace(/^[\s]+/g, "");
-  var name = textBox.value.toLowerCase();
-  var validName = 0;
-  if (name === "") validName = 1;
-  if (validName === 0) {
-    for (var i = 0; i < gSavedName.length; i++) {
-      if (name == gSavedName[i]?.toLowerCase() && gSavedName[i] !== "") {
-        if (dialogParams.GetInt(3) != TMP_DLG_RENAME) {
-          validName = 3;
-          dialogParams.SetInt(6, i);
-          break;
-        } else if (gOrigName != name) {
-          validName = 2;
-        }
-      }
-    }
-  }
-  switch (validName) {
-    case 0:
-      if (btnOK.disabled) btnOK.disabled = false;
-      if (btnOK.hidden) btnOK.hidden = false;
-      if (!btnExt.hidden) {
-        btnExt.hidden = true;
-        if (dialogParams.GetInt(3) == TMP_DLG_SAVE) setLabelForNode(btnCancel, gCancelLabel);
-      }
-      description.replaceData(0, description.length, "");
-      documentElement.defaultButton = "accept";
-      break;
-    case 1:
-    case 2:
-      if (btnOK.hidden) btnOK.hidden = false;
-      if (!btnOK.disabled) btnOK.disabled = true;
-      if (!btnExt.hidden) {
-        btnExt.hidden = true;
-        if (dialogParams.GetInt(3) == TMP_DLG_SAVE) setLabelForNode(btnCancel, gCancelLabel);
-      }
-      documentElement.defaultButton = "cancel";
-      break;
-    case 3:
-      if (!btnOK.hidden) btnOK.hidden = true;
-      btnExt.hidden = false;
-      if (dialogParams.GetInt(3) == TMP_DLG_SAVE) setLabelForNode(btnCancel, cLabel);
-      documentElement.defaultButton = "cancel";
-      break;
-  }
-  description.replaceData(0, description.length, msg[validName] ?? "");
-}
diff --git a/addon/chrome/content/dialogs/promptservice.xhtml b/addon/chrome/content/dialogs/promptservice.xhtml
deleted file mode 100644
index 63e5c7adb..000000000
--- a/addon/chrome/content/dialogs/promptservice.xhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
-  <!ENTITY % pref-tabmixDTD SYSTEM "chrome://tabmixplus/locale/pref-tabmix.dtd">
-  %pref-tabmixDTD;
-]>
-
-<dialog id="tabmix-prompt"
-   windowtype="mozilla:tabmixprompt"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   resizable="no"
-   onload="prompt_init();"
-   buttons="accept, cancel, extra1"
-   buttonpack="center"
-   style="-moz-user-focus: ignore; padding: 8px 10px 10px 8px;">
-
-  <script type="application/javascript" src="chrome://tabmixplus/content/utils.js"/>
-  <script type="application/javascript" src="chrome://tabmixplus/content/dialogs/promptservice.js"/>
-
-  <hbox >
-    <hbox align="start">
-      <image id="info.icon" class="spaced question-icon"/>
-    </hbox>
-   <vbox>
-      <!-- description -->
-      <vbox id="tm_info" style="width:300px;"/>
-      <!-- menulist -->
-      <menulist id="tm_prompt" sizetopopup="none" style="width:300px;">
-         <menupopup id="tm_prompt_menu">
-            <menuseparator id="tm_prompt-startSeparator" hidden="true"/>
-            <menuseparator id="tm_prompt-endSeparator"/>
-         </menupopup>
-      </menulist>
-      <!-- textbox -->
-      <textbox id="tm_textbox" maxlength="50" oninput="inputText(this);"/>
-      <separator id="space_before_checkbox" class="thin"/>
-      <!-- checkbox -->
-      <vbox id="checkboxContainer" align="start" collapsed="true">
-         <checkbox id="tm_checkbox"/>
-         <separator id="space_after_checkbox" class="thin"/>
-      </vbox>
-   </vbox>
-  </hbox>
-</dialog>
diff --git a/addon/chrome/content/extensions/extensions.js b/addon/chrome/content/extensions/extensions.js
index b29b40bbd..caa0eed27 100644
--- a/addon/chrome/content/extensions/extensions.js
+++ b/addon/chrome/content/extensions/extensions.js
@@ -27,26 +27,6 @@ var TMP_extensionsCompatibility = {
       gIeTab: false, /* for ieTab and ieTab2 */
     };
 
-    // sessionManager extension is restartless since version 0.8
-    Tabmix.extensions.__defineGetter__("sessionManager", () => {
-      return TabmixSvc.sessionManagerAddonInstalled ||
-        "com" in window && com.morac &&
-        typeof com.morac.SessionManagerAddon == "object";
-    });
-
-    try {
-      if ("TabGroupsManagerApiVer1" in window) {
-        Tabmix.extensions.tabGroupManager = true;
-        window.TMP_TabGroupsManager = {};
-        window.TMP_TabGroupsManager.tabmixSessionsManager = function() {};
-        const tmp = ChromeUtils.importESModule("chrome://tabmix-resource/content/extensions/TabGroupsManager.sys.mjs");
-        tmp.TMP_TabGroupsManager.changeCode = Tabmix.changeCode;
-        tmp.TMP_TabGroupsManager.init(window, gBrowser.tabContainer);
-      }
-    } catch (ex) {
-      Tabmix.assert(ex, "error in TabGroupsManager.sys.mjs");
-    }
-
     // fix for Cluster Tabs - Cluster Tab look for TM_init
     // https://addons.mozilla.org/en-US/firefox/addon/cluster-tabs-for-firefox/
     if ("GlaxChrome" in window && typeof window.GlaxChrome == "object") {
@@ -178,29 +158,9 @@ var TMP_extensionsCompatibility = {
       Tabmix.extensions.gIeTab = {obj: "gIeTab2", folder: "ietab2"};
     else if (typeof window.gIeTab == "object")
       Tabmix.extensions.gIeTab = {obj: "gIeTab", folder: "ietab"};
-
-    // prevent faviconize use its own adjustTabstrip/updateCloseButtons
-    // in Firefox 4.0 we check for faviconized tabs in TMP_TabView.firstTab
-    if ("faviconize" in window && "override" in window.faviconize) {
-      Tabmix.changeCode(TMP_TabView, "TMP_TabView.checkTabs")._replace(
-        '!tab.pinned',
-        '$& && !tab.hasAttribute("faviconized")'
-      ).toCode();
-
-      // change adjustTabstrip
-      window.faviconize.override.adjustTabstrip = function() { };
-    }
   },
 
   onWindowOpen: function TMP_EC_onWindowOpen() {
-    // https://addons.mozilla.org/firefox/addon/tabgroups-manager-revived
-    // TabGroupsManager.OverrideMethod set TabmixSessionManager.loadOneWindow to string by error
-    if (Tabmix.extensions.tabGroupManager &&
-        typeof TabmixSessionManager.loadOneWindow == "string") {
-      Tabmix._makeCode("TabmixSessionManager.loadOneWindow", TabmixSessionManager.loadOneWindow);
-      Tabmix.log("typeof TabmixSessionManager.loadOneWindow " + typeof TabmixSessionManager.loadOneWindow);
-    }
-
     this.setVerticalTabs();
 
     if ("openNewsfox" in window)
@@ -384,15 +344,6 @@ var TMP_extensionsCompatibility = {
       Tabmix.set_BrowserOpenTab();
     }
 
-    // Classic Theme Restorer
-    // move appmenu-sessionmanager to its position
-    let ctrBox = document.getElementById("ctraddon_appmenubox_developer");
-    if (ctrBox) {
-      let sessionmanager = document.getElementById("appmenu-sessionmanager");
-      if (sessionmanager)
-        ctrBox.parentNode.insertBefore(sessionmanager, ctrBox.nextSibling);
-    }
-
     // Redirect Remover 2.6.4
     // https://addons.mozilla.org/he/firefox/addon/redirect-remover/
     if (window.rdrb && typeof rdrb.cleanLink == "function") {
@@ -614,10 +565,12 @@ TMP_extensionsCompatibility.treeStyleTab = {
       // Added 2010-04-10
       // TST look for aTab.removeAttribute("tabxleft")
       Tabmix.changeCode(TabmixTabbar, "TabmixTabbar.updateSettings")._replace(
-        'TabmixSessionManager.updateTabProp(aTab);',
-        '$& \
-         gBrowser.treeStyleTab.initTabAttributes(aTab);\
-         Tabmix.TST_initTabContentsOrder(aTab);'
+        'Tabmix.setItem("main-window"[^;]*;',
+        `$&
+         for (const tab of tabBar.allTabs) {
+           gBrowser.treeStyleTab.initTabAttributes(aTab);
+           Tabmix.TST_initTabContentsOrder(aTab);'
+         }`
       ).toCode();
       // Added 2010-04-10
       Tabmix.changeCode(TMP_eventListener, "TMP_eventListener.onTabOpen")._replace(
diff --git a/addon/chrome/content/links/setup.js b/addon/chrome/content/links/setup.js
index 827da0a90..d135a0a2c 100644
--- a/addon/chrome/content/links/setup.js
+++ b/addon/chrome/content/links/setup.js
@@ -58,7 +58,7 @@ Tabmix.beforeBrowserInitOnLoad = function() {
     if (this.isFirstWindowInSession && this.prefs.getBoolPref("disableIncompatible")) {
       setTimeout(function checkCompatibility(aWindow) {
         const {CompatibilityCheck} = ChromeUtils.importESModule("chrome://tabmix-resource/content/extensions/CompatibilityCheck.sys.mjs");
-        return new CompatibilityCheck(aWindow, true);
+        return new CompatibilityCheck(aWindow, true, false);
       }, 0, window);
     }
 
@@ -179,70 +179,3 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
   TMP_extensionsCompatibility.preInit();
 };
 
-Tabmix._updateCloseButtons = function tabContainer_updateCloseButtons(skipUpdateScrollStatus, aUrl) {
-  // modes for close button on tabs - extensions.tabmix.tabs.closeButtons
-  // 1 - alltabs    = close buttons on all tabs
-  // 2 - hovertab   = close buttons on hover tab
-  // 3 - activetab  = close button on active tab only
-  // 4 - hoveractive = close buttons on hover and active tabs
-  // 5 - alltabs wider then  = close buttons on all tabs wider then
-
-  let oldValue = this.getAttribute("closebuttons");
-  var tabs = Tabmix.visibleTabs.tabs;
-  var tabsCount = Tabmix.tabsUtils.getTabsCount(tabs.length);
-  switch (Tabmix.tabsUtils.closeButtonsEnabled ? this.mCloseButtons : 0) {
-    case 0:
-      this.removeAttribute("closebuttons-hover");
-      this.setAttribute("closebuttons", "noclose");
-      break;
-    case 1:
-      this.removeAttribute("closebuttons-hover");
-      this.setAttribute("closebuttons", "alltabs");
-      break;
-    case 2:
-      this.setAttribute("closebuttons-hover", "alltabs");
-      this.setAttribute("closebuttons", "noclose");
-      break;
-    case 3:
-      this.removeAttribute("closebuttons-hover");
-      this.setAttribute("closebuttons", "activetab");
-      break;
-    case 4:
-      this.setAttribute("closebuttons-hover", "notactivetab");
-      this.setAttribute("closebuttons", "activetab");
-      break;
-    case 5:
-      this.removeAttribute("closebuttons-hover");
-      this.tabmix_updateCloseButtons();
-      break;
-  }
-
-  /**
-   *  Don't use return in this function
-   *  TreeStyleTab add some code at the end
-   */
-  let transitionend = Tabmix.callerTrace("onxbltransitionend");
-  if (tabsCount == 1) {
-    let tab = this.selectedItem;
-    if (!aUrl) {
-      let currentURI = gBrowser.currentURI;
-      aUrl = currentURI ? currentURI.spec : null;
-    }
-    // hide the close button if one of this condition is true:
-    //   - if "Do not close window when closing last tab" is set and the tab is blank,
-    //     about:blank or other new tab.
-    //   - if "Prevent last tab from closing" is set.
-    if (
-      Tabmix.tabsUtils._keepLastTab ||
-        !Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab") &&
-          (isBlankPageURL(tab.__newLastTab || null) ||
-            (!aUrl || isBlankPageURL(aUrl)) && gBrowser.isBlankNotBusyTab(tab))
-    ) {
-      this.setAttribute("closebuttons", "noclose");
-      this.removeAttribute("closebuttons-hover");
-    }
-  } else if (!skipUpdateScrollStatus && oldValue != this.getAttribute("closebuttons") ||
-             transitionend) {
-    TabmixTabbar.updateScrollStatus(transitionend);
-  }
-};
diff --git a/addon/chrome/content/links/userInterface.js b/addon/chrome/content/links/userInterface.js
index af25e0464..55128b291 100644
--- a/addon/chrome/content/links/userInterface.js
+++ b/addon/chrome/content/links/userInterface.js
@@ -97,8 +97,8 @@ function TMP_BrowserOpenTab(eventOrObject, aTab, replaceLastTab = false) {
     selectedTab.collapsed = true;
 
   var loadBlank = isBlankPageURL(url);
-  if (!TabmixSessionManager.isPrivateWindow && replaceLastTab && !loadBlank &&
-      typeof privateTab == "object") {
+  if (replaceLastTab && !loadBlank && typeof privateTab == "object" &&
+      !PrivateBrowsingUtils.isWindowPrivate(window)) {
     let privateTab = window.privateTab;
     if (privateTab.isTabPrivate(selectedTab) &&
         TabmixSvc.prefs.get("extensions.privateTab.makeNewEmptyTabsPrivate", 0) === 0) {
diff --git a/addon/chrome/content/minit/minit.js b/addon/chrome/content/minit/minit.js
index 8dce6bcbe..b4ba9f8a8 100644
--- a/addon/chrome/content/minit/minit.js
+++ b/addon/chrome/content/minit/minit.js
@@ -1,4 +1,4 @@
-/* exported TMP_undocloseTabButtonObserver, TMP_TabView */
+/* exported TMP_undocloseTabButtonObserver */
 "use strict";
 
 /****    Drag and Drop observers    ****/
@@ -1075,66 +1075,6 @@ Tabmix.hidePopup = function TMP_hidePopup(aPopupMenu) {
   }
 };
 
-// /** @type {TabmixTabView} */ // @ ts-expect-error - function from tabView.js are not in TMP_TabView
-/** @type {TabmixTabView} */
-var TMP_TabView = {
-  _patchBrowserTabview: () => {},
-  _resetTabviewFrame: () => {},
-  subScriptLoaded: false,
-  init() {
-    try {
-      if (this.installed) {
-        this._patchBrowserTabview();
-      }
-    } catch (ex) {
-      Tabmix.assert(ex);
-    }
-  },
-
-  get installed() {
-    let installed = typeof TabView == "object";
-    if (installed && !this.subScriptLoaded) {
-      Services.scriptloader.loadSubScript("chrome://tabmixplus/content/minit/tabView.js", window);
-    }
-    return installed;
-  },
-
-  exist(id) {
-    return this.installed && typeof TabView[id] == "function";
-  },
-
-  checkTabs(tabs) {
-    var firstTab;
-    for (const tab of tabs) {
-      if (!tab.collapsed && !tab.pinned) {
-        firstTab = tab;
-        break;
-      }
-    }
-    return firstTab;
-  },
-
-  // including _removingTabs
-  currentGroup() {
-    return Array.prototype.filter.call(gBrowser.tabs, tab => !tab.hidden);
-  },
-
-  // visibleTabs don't include  _removingTabs
-  getTabPosInCurrentGroup(aTab) {
-    if (aTab) {
-      let tabs = Array.prototype.filter.call(gBrowser.tabs, tab => !tab.hidden);
-      return tabs.indexOf(aTab);
-    }
-    return -1;
-  },
-
-  getIndexInVisibleTabsFromTab(aTab) {
-    if (aTab)
-      return Tabmix.visibleTabs.tabs.indexOf(aTab);
-    return -1;
-  }
-};
-
 Tabmix.navToolbox = {
   customizeStarted: false,
   toolboxChanged: false,
diff --git a/addon/chrome/content/minit/tabView.js b/addon/chrome/content/minit/tabView.js
deleted file mode 100644
index 67b841575..000000000
--- a/addon/chrome/content/minit/tabView.js
+++ /dev/null
@@ -1,581 +0,0 @@
-// @ts-nocheck
-/* globals TabView TabItems */
-"use strict";
-
-TMP_TabView.subScriptLoaded = true;
-
-TMP_TabView.handleEvent = function(aEvent) {
-  switch (aEvent.type) {
-    case "tabviewshown":
-      TabmixSessionManager.saveTabViewData(TabmixSessionManager.gThisWin, true);
-      break;
-    case "tabviewhidden":
-      TabmixSessionManager.saveTabViewData(TabmixSessionManager.gThisWin, true);
-      TMP_LastTab.tabs = null;
-      if (TabmixTabbar.hideMode != 2) {
-        setTimeout(() => gBrowser.tabContainer._updateCloseButtons(), 0);
-      }
-      break;
-    case "TabShow":
-      if (!gBrowser.tabContainer._onDelayTabShow) {
-        // pass aEvent to this function for use in TGM
-        gBrowser.tabContainer._onDelayTabShow = window.setTimeout(event => {
-          gBrowser.tabContainer._onDelayTabShow = null;
-          TMP_eventListener.onTabOpen_delayUpdateTabBar(event.target);
-        }, 0, aEvent);
-      }
-      break;
-    case "TabHide":
-      if (!gBrowser.tabContainer._onDelayTabHide) {
-        // pass aEvent to this function for use in TGM
-        gBrowser.tabContainer._onDelayTabHide = window.setTimeout(event => {
-          gBrowser.tabContainer._onDelayTabHide = null;
-          let tab = event.target;
-          TMP_eventListener.onTabClose_updateTabBar(tab);
-        }, 0, aEvent);
-      }
-      break;
-    case "willshowtabview":
-      Tabmix.slideshow.cancel();
-      break;
-  }
-};
-
-/* ............... TabView Code Fix  ............... */
-
-/**
- * this code is fixes some bugs in Panorama code when restoring sessions
- *
- */
-
-TMP_TabView._patchBrowserTabview = function SM__patchBrowserTabview() {
-  if (TabView.hasOwnProperty("tabmixInitialized")) {
-    return;
-  }
-  TabView.tabmixInitialized = true;
-
-  var tabView = document.getElementById("tab-view-deck");
-  if (tabView) {
-    tabView.addEventListener("tabviewhidden", this, true);
-    tabView.addEventListener("tabviewshown", this, true);
-    gBrowser.tabContainer.addEventListener("TabShow", this, true);
-    gBrowser.tabContainer.addEventListener("TabHide", this, true);
-  }
-
-  // we need to stop tabs slideShow before Tabview starts
-  if (window.hasOwnProperty("tabGroups")) {
-    // Tab Groups extension by Quicksaver
-    // https://addons.mozilla.org/en-US/firefox/addon/tab-groups-panorama/
-    window.addEventListener("willshowtabview", this, true);
-  } else {
-    let $LF = '\n      ';
-    Tabmix.changeCode(TabView, "TabView.toggle")._replace(
-      'this.show();',
-      '{' + $LF +
-        '  Tabmix.slideshow.cancel();' + $LF +
-        '  $&' + $LF +
-        '}'
-    ).toCode();
-  }
-
-  // don't do anything if Session Manager extension installed
-  if (Tabmix.extensions.sessionManager)
-    return;
-
-  // add our function to the TabView initFrameCallbacks
-  // we don't need our patch for the first run
-  var callback = () => {
-    try {
-      TabmixSessionManager._groupItemPushAway();
-      this._patchTabviewFrame();
-    } catch (ex) {
-      Tabmix.assert(ex);
-    }
-  };
-
-  if (TabView._window)
-    callback();
-  else
-    TabView._initFrameCallbacks.push(callback);
-};
-
-TMP_TabView._patchInitialized = false;
-TMP_TabView._patchTabviewFrame = function SM__patchTabviewFrame() {
-  // Tab Groups extension by Quicksaver includes these changes in its code
-  if (window.hasOwnProperty("tabGroups")) {
-    return;
-  }
-
-  this._patchInitialized = true;
-  TabView._window.GroupItems._original_reconstitute = TabView._window.GroupItems.reconstitute;
-  TabView._window.GroupItems.reconstitute = function(groupItemsData, groupItemData) {
-    let validate = function(groupItem, data) {
-      // This group is re-used by session restore
-      // make sure all of its children still belong to this group.
-      // Do it before setBounds trigger data save that will overwrite
-      // session restore data.
-      // TabView will use TabItems.resumeReconnecting or UI.reset to reconnect the tabItem.
-      groupItem.getChildren().forEach(tabItem => {
-        let tabData = TabmixSessionData.getTabValue(tabItem.tab, "tabview-tab", true);
-        if (!tabData || tabData.groupID != data.id) {
-          tabItem._reconnected = false;
-        }
-      });
-    };
-    if (groupItemData) {
-      let storageSanity = this.groupItemStorageSanity || this.storageSanityGroupItem;
-      let ids = Object.keys(groupItemData);
-      for (let id of ids) {
-        let data = groupItemData[id];
-        if (storageSanity(data)) {
-          let groupItem = this.groupItem(data.id);
-          if (groupItem && !groupItem.hidden) {
-            validate(groupItem, data);
-          }
-        }
-      }
-    }
-    this._original_reconstitute.apply(this, arguments);
-  };
-
-  if (window.hasOwnProperty("tabGroups")) {
-    // reconnect tabs that we disconnected in reconstitute
-    TabView._window.UI.reset = function() {
-      TabItems.resumeReconnecting();
-      this._original_reset.apply(this, arguments);
-    };
-    return;
-  }
-
-  // add tab to the new group on tabs order not tabItem order
-  Tabmix.changeCode(TabView._window.UI, "TabView._window.UI.reset")._replace(
-    '{',
-    '$&' +
-    'let win = TabView._window;' +
-    'let Trenches = win.Trenches;' +
-    'let Items = win.Items;' +
-    'let iQ = win.iQ;' +
-    'let Rect = win.Rect;' +
-    'let GroupItems = win.GroupItems;' +
-    'let GroupItem = win.GroupItem;' +
-    'let TabItems = win.TabItems;' +
-    'let UI = win.UI;', {silent: true}
-  )._replace(
-    'this.',
-    'UI.', {flags: "g", silent: true}
-  )._replace(
-    /items\.forEach\(function\s*\(item\)\s*\{/,
-    'Array.prototype.forEach.call(gBrowser.tabs, function(tab) { \
-       if (tab.pinned) return;\
-       let item = tab._tabViewTabItem;'
-  )._replace(
-    /groupItem.add\(.*\);/,
-    'item._reconnected = true; \
-       $&'
-  ).toCode();
-};
-
-TMP_TabView._resetTabviewFrame = function SM__resetTabviewFrame() {
-  var tabView = document.getElementById("tab-view-deck");
-  if (tabView) {
-    tabView.removeEventListener("tabviewhidden", this, true);
-    tabView.removeEventListener("tabviewshown", this, true);
-    gBrowser.tabContainer.removeEventListener("TabShow", this, true);
-    gBrowser.tabContainer.removeEventListener("TabHide", this, true);
-  }
-  window.removeEventListener("willshowtabview", this, true);
-
-  if (this._patchInitialized && TabView._window) {
-    TabView._window.GroupItems.reconstitute = TabView._window.GroupItems._original_reconstitute;
-    delete TabView._window.GroupItems._original_reconstitute;
-    TabView._window.UI.reset = TabView._window.UI._original_reset;
-    delete TabView._window.UI._original_reset;
-  }
-};
-
-/* ............... TabmixSessionManager TabView Data ............... */
-
-// winData: SessionStore window state
-TabmixSessionManager._setWindowStateBusy = function(winData) {
-  this._beforeRestore(winData);
-  if (!this.tabViewInstalled) {
-    return;
-  }
-
-  this._getSessionTabviewData(winData);
-  this._updateUIpageBounds = false;
-};
-
-TabmixSessionManager._setWindowStateReady = function(aOverwriteTabs, showNotification) {
-  TabmixSvc.SessionStore._setWindowStateReady(window);
-  if (!this.tabViewInstalled) {
-    return;
-  }
-
-  if (!aOverwriteTabs)
-    this._groupItems = this._tabviewData["tabview-group"];
-
-  var parsedData = TabmixSessionData.getWindowValue(window, "tabview-groups", true);
-  var groupCount = parsedData.totalNumber || 1;
-  TabView.updateGroupNumberBroadcaster(groupCount);
-
-  // show notification
-  ///XXX make sure that we have hidden tabs
-  if (showNotification && (aOverwriteTabs && groupCount > 1 || groupCount > this._groupCount))
-    this.showNotification();
-
-  // update page bounds when we overwrite tabs
-  if (aOverwriteTabs || this._updateUIpageBounds)
-    this._setPageBounds();
-
-  if (TabView._window && !aOverwriteTabs) {
-    // when we don't overwriting tabs try to rearrange the groupItems
-    // when TabView._window is false we call this function after tabviewframeinitialized event
-    this._groupItemPushAway();
-  }
-
-  this.groupUpdates = {};
-  this._tabviewData = {};
-};
-
-TabmixSessionManager.groupUpdates = {};
-TabmixSessionManager._tabviewData = {};
-TabmixSessionManager._groupItems = null;
-
-// winData: SessionStore window state
-TabmixSessionManager._getSessionTabviewData = function(winData) {
-  let extData = winData.extData || {};
-  function _fixData(id, parse, def) {
-    let data = extData[id] || null;
-    if (data) {
-      return parse ? JSON.parse(data) : data;
-    }
-    return def;
-  }
-
-  let groupItems = _fixData("tabview-group", true, {});
-  let groupsData = _fixData("tabview-groups", true, {});
-  this._validateGroupsData(groupItems, groupsData);
-  this._tabviewData["tabview-group"] = groupItems;
-  this._tabviewData["tabview-groups"] = groupsData;
-  this.groupUpdates.lastActiveGroupId = groupsData.activeGroupId;
-
-  this._tabviewData["tabview-ui"] = _fixData("tabview-ui", false, JSON.stringify({}));
-  this._tabviewData["tabview-visibility"] = _fixData("tabview-visibility", false, "false");
-};
-
-TabmixSessionManager._saveTabviewData = function SM__saveTabviewData() {
-  if (!this.tabViewInstalled) {
-    return;
-  }
-
-  for (let id of Object.keys(this._tabviewData)) {
-    this._setTabviewData(id, this._tabviewData[id]);
-  }
-};
-
-TabmixSessionManager._setTabviewData = function SM__setTabviewData(id, data) {
-  if (typeof data != "string")
-    data = JSON.stringify(data);
-  SessionStore.setWindowValue(window, id, data);
-  if (!this.enableBackup)
-    return;
-  if (data !== "" && data != "{}")
-    this.setLiteral(this.gThisWin, id, data);
-  else
-    this.removeAttribute(this.gThisWin, id);
-};
-
-TabmixSessionManager._setTabviewTab = function SM__setTabviewTab(aTab, tabdata, activeGroupId) {
-  if (!this.tabViewInstalled || tabdata.pinned)
-    return;
-
-  let parsedData;
-  function setData(groupID) {
-    let data = {groupID};
-    parsedData = data;
-    return JSON.stringify(data);
-  }
-
-  var update = this.groupUpdates;
-  var id = "tabview-tab";
-  var tabviewData;
-  if (update.newGroupID) {
-    // We are here only when the restored session did not have tabview data
-    // we create new group and fill all the data
-    tabviewData = setData(update.newGroupID);
-  } else {
-    tabviewData = tabdata.extData && tabdata.extData["tabview-tab"] || null;
-    // make sure data is not "null"
-    if (!tabviewData || tabviewData == "null") {
-      if (update.lastActiveGroupId) {
-        tabviewData = setData(update.lastActiveGroupId);
-      } else {
-        // force Panorama to reconnect all reused tabs
-        if (aTab._tabViewTabItem) {
-          // remove any old data
-          aTab._tabViewTabItem._reconnected = false;
-          try {
-            SessionStore.deleteTabValue(aTab, id);
-          } catch {}
-          if (tabdata.extData)
-            delete tabdata.extData["tabview-tab"];
-        }
-        return;
-      }
-    }
-
-    if (update.IDs) {
-      parsedData = JSON.parse(tabviewData);
-      if (parsedData.groupID in update.IDs) {
-        parsedData.groupID = update.IDs[parsedData.groupID];
-        tabviewData = JSON.stringify(parsedData);
-      }
-    }
-  }
-
-  if (tabviewData) {
-    if (!tabdata.extData)
-      tabdata.extData = {};
-    tabdata.extData["tabview-tab"] = tabviewData;
-    // we did not saved hidden attribute when we use TGM
-    // hide all tabs that are not in the active group
-    if (!Tabmix.extensions.tabGroupManager && activeGroupId !== null) {
-      if (!parsedData)
-        parsedData = JSON.parse(tabviewData);
-      if (parsedData.groupID != activeGroupId)
-        tabdata.hidden = true;
-    }
-  } else if (tabdata.extData) {
-    delete tabdata.extData["tabview-tab"];
-  }
-};
-
-TabmixSessionManager.isEmptyObject = function SM_isEmptyObject(obj) {
-  return Object.keys(obj).length === 0;
-};
-
-// return true if there are no visible tabs that are not in the exclude array
-TabmixSessionManager._noNormalTabs = function SM__noNormalTabs(excludeTabs) {
-  if (!excludeTabs)
-    excludeTabs = [];
-
-  return !Array.prototype.some.call(gBrowser.tabs, tab => {
-    return !tab.pinned && !tab.hidden && !tab.closing &&
-          !excludeTabs.includes(tab);
-  });
-};
-
-TabmixSessionManager._addGroupItem = function SM__addGroupItem(aGroupItems, aGroupsData, setAsActive) {
-  let groupID = aGroupsData.nextID++;
-  if (setAsActive) {
-    aGroupsData.activeGroupId = groupID;
-    this._lastSessionGroupName = "";
-  }
-  let bounds = {left: 0, top: 0, width: 350, height: 300};
-  aGroupItems[groupID] = {bounds, userSize: null, title: "", id: groupID, newItem: true};
-  aGroupsData.totalNumber = Object.keys(aGroupItems).length;
-  this._tabviewData["tabview-group"] = aGroupItems;
-  this._tabviewData["tabview-groups"] = aGroupsData;
-};
-
-// Remove current active group only when it's empty and have no title
-TabmixSessionManager._deleteActiveGroup = function SM__deleteActiveGroup(aGroupItems, activeGroupId) {
-  let activeGroup = aGroupItems[activeGroupId];
-  if (activeGroup && activeGroup.title === "") {
-    delete aGroupItems[activeGroupId];
-    this._tabviewData["tabview-group"] = aGroupItems;
-  }
-};
-
-// just in case.... and add totalNumber to firefox 4.0 - 5.0.x
-TabmixSessionManager._validateGroupsData = function SM__validateGroupsData(aGroupItems, aGroupsData) {
-  if (this.isEmptyObject(aGroupItems))
-    return;
-
-  if (aGroupsData.nextID && aGroupsData.activeGroupId && aGroupsData.totalNumber)
-    return;
-  let keys = Object.keys(aGroupItems);
-  if (!aGroupsData.nextID) {
-    let nextID = 0;
-    keys.forEach(key => {
-      nextID = Math.max(aGroupItems[key].id, nextID);
-    });
-    aGroupsData.nextID = nextID++;
-  }
-  if (!aGroupsData.activeGroupId)
-    aGroupsData.activeGroupId = aGroupItems[keys[0]].id;
-  if (!aGroupsData.totalNumber)
-    aGroupsData.totalNumber = keys.length;
-};
-
-/**
- * when we append tab to this window we merge group data from the session into the current group data
- * loadOnStartup: array of tabs that load on startup from application
- * blankTabs: remaining blank tabs in this windows
- */
-TabmixSessionManager._prepareTabviewData = function SM__prepareTabviewData(loadOnStartup, blankTabs) {
-  if (!this.tabViewInstalled) {
-    return;
-  }
-
-  let newGroupItems = this._tabviewData["tabview-group"];
-  let groupItems = TabmixSessionData.getWindowValue(window, "tabview-group", true);
-  let newGroupItemsIsEmpty = this.isEmptyObject(newGroupItems);
-  let groupItemsIsEmpty = this.isEmptyObject(groupItems);
-
-  if (newGroupItemsIsEmpty && groupItemsIsEmpty) {
-    // just to be on the safe side
-    // Tabview will force to add all tabs in one group
-    this._tabviewData["tabview-group"] = {};
-    this._tabviewData["tabview-groups"] = {};
-    return;
-  }
-
-  var noNormalVisibleTabs = this._noNormalTabs(blankTabs.concat(loadOnStartup));
-  if (!noNormalVisibleTabs)
-    this.groupUpdates.hideSessionActiveGroup = true;
-
-  // newGroupItems is not empty
-  if (groupItemsIsEmpty) {
-    // we can get here also on startup before we set any data to current window
-
-    if (noNormalVisibleTabs) {
-      // nothing else to do we use this._tabviewData as is.
-      this._updateUIpageBounds = true;
-    } else {
-      // Tabview did not started
-      // add all normal tabs to new group with the proper id
-      let newGroupsData = this._tabviewData["tabview-groups"];
-      this._addGroupItem(newGroupItems, newGroupsData, true);
-
-      // update tabs data
-      let groupID = newGroupsData.activeGroupId;
-      for (let tab of gBrowser.tabs) {
-        if (tab.pinned || tab.hidden || tab.closing || blankTabs.indexOf(tab) > -1)
-          return;
-        let data = {groupID};
-        data = JSON.stringify(data);
-        SessionStore.setTabValue(tab, "tabview-tab", data);
-        if (this.enableBackup)
-          this.setLiteral(this.getNodeForTab(tab), "tabview-tab", data);
-      }
-    }
-    return;
-  }
-
-  // groupItems is not empty
-  let groupsData = TabmixSessionData.getWindowValue(window, "tabview-groups", true);
-  // just in case data was corrupted
-  this._validateGroupsData(groupItems, groupsData);
-
-  if (newGroupItemsIsEmpty) {
-    let createNewGroup = true;
-    if (noNormalVisibleTabs) {
-      // if active group is empty without title reuse it for
-      // the tabs from the session.
-      let activeGroup = groupItems[groupsData.activeGroupId];
-      if (activeGroup && activeGroup.title === "") {
-        createNewGroup = false;
-        this.groupUpdates.newGroupID = groupsData.activeGroupId;
-        this._tabviewData["tabview-group"] = groupItems;
-        this._tabviewData["tabview-groups"] = groupsData;
-      }
-    }
-
-    if (createNewGroup) {
-      // We create new group here, and set it as active if there is no normal
-      // tabs in this window, later we will create "tabview-tab" data in
-      // SM__setTabviewTab for each normal tab.
-      this.groupUpdates.newGroupID = groupsData.nextID;
-      this._addGroupItem(groupItems, groupsData, noNormalVisibleTabs);
-    }
-
-    this._tabviewData["tabview-ui"] = TabmixSessionData.getWindowValue(window, "tabview-ui");
-    return;
-  }
-
-  // both current window and the session that we are restoring have group data
-
-  let IDs = {};
-  for (let id of Object.keys(newGroupItems)) {
-    newGroupItems[id].newItem = true;
-    // change group id if already used in this window
-    if (id in groupItems) {
-      let newID = groupsData.nextID++;
-      groupItems[newID] = newGroupItems[id];
-      groupItems[newID].id = newID;
-      // we will update tabview-tab data later
-      IDs[id] = newID;
-    } else {
-      groupItems[id] = newGroupItems[id];
-      if (id > groupsData.nextID)
-        groupsData.nextID = id;
-    }
-  }
-
-  // When current active group is empty,
-  // change active group to the active group from the session we are restoring.
-  if (noNormalVisibleTabs) {
-    this._deleteActiveGroup(groupItems, groupsData.activeGroupId);
-    // set new activeGroupId
-    let activeID = this._tabviewData["tabview-groups"].activeGroupId;
-    groupsData.activeGroupId = activeID in IDs ? IDs[activeID] : activeID;
-    this._updateUIpageBounds = true;
-  }
-
-  if (Object.keys(IDs).length) {
-    let id = this.groupUpdates.lastActiveGroupId;
-    this.groupUpdates.lastActiveGroupId = IDs[id] || id;
-    this.groupUpdates.IDs = IDs;
-  }
-
-  // update totalNumber
-  groupsData.totalNumber = Object.keys(groupItems).length;
-  // save data
-  this._tabviewData["tabview-group"] = groupItems;
-  this._tabviewData["tabview-groups"] = groupsData;
-};
-
-TabmixSessionManager.showNotification = function SM_showNotification() {
-  var msg = TabmixSvc.getSMString("sm.tabview.hiddengroups");
-  try {
-    let alerts = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
-    alerts.showAlertNotification("chrome://tabmixplus/skin/tmp.png", "Tab Mix Plus", msg, false, "", null);
-  } catch {}
-};
-
-/* ............... TabView Code Fix  ............... */
-
-// update page bounds when we overwrite tabs
-TabmixSessionManager._setPageBounds = function SM__setPageBounds() {
-  if (TabView._window) {
-    let data = TabmixSessionData.getWindowValue(window, "tabview-ui", true);
-    if (this.isEmptyObject(data))
-      return;
-
-    let UI = TabView._window.UI;
-    let storageSanity = UI._storageSanity || UI.storageSanity;
-    if (storageSanity(data) && data.pageBounds) {
-      TabView._window.UI._pageBounds = data.pageBounds;
-    }
-  }
-};
-
-// when not overwriting tabs try to rearrange the groupItems
-TabmixSessionManager._groupItemPushAway = function SM__groupItemPushAway() {
-  if (!this._groupItems)
-    return;
-
-  let GroupItems = TabView._window.GroupItems;
-  for (let key of Object.keys(this._groupItems)) {
-    let data = this._groupItems[key];
-    if (data.newItem) {
-      let group = GroupItems.groupItem(data.id);
-      if (group && GroupItems.groupItemStorageSanity(data)) {
-        group.pushAway(true);
-      }
-    }
-  }
-  this._groupItems = null;
-};
diff --git a/addon/chrome/content/minit/tablib.js b/addon/chrome/content/minit/tablib.js
index cb8e2e380..48550b8f3 100644
--- a/addon/chrome/content/minit/tablib.js
+++ b/addon/chrome/content/minit/tablib.js
@@ -211,11 +211,10 @@ Tabmix.tablib = {
 
     Tabmix.changeCode(gBrowser, "gBrowser._endRemoveTab")._replace(
       'this._blurTab(aTab);',
-      'Tabmix.tablib.onRemoveTab(aTab); \
-       if (window.matchMedia("(prefers-reduced-motion: no-preference)").matches) { \
-         TMP_eventListener.onTabClose_updateTabBar(aTab);\
-       } \
-       $&'
+      `if (window.matchMedia("(prefers-reduced-motion: no-preference)").matches) {
+         TMP_eventListener.onTabClose_updateTabBar(aTab);
+       }
+       $&`
     )._replace(
       // we call gURLBar.select from Tabmix.clearUrlBarIfNeeded
       // see TMP_BrowserOpenTab
@@ -236,8 +235,7 @@ Tabmix.tablib = {
 
       let newIndex = this.selectIndexAfterRemove(aTab);
       if (newIndex > -1) {
-        let tabs = TMP_TabView.currentGroup();
-        let tab = tabs[newIndex];
+        let tab = gBrowser.visibleTabs[newIndex];
         if (tab && !tab.closing) {
           this.selectedTab = tab;
           return;
@@ -546,6 +544,75 @@ Tabmix.tablib = {
         '$1$2'
       ).toCode();
     }
+
+    Tabmix.originalFunctions.tabContainer_updateCloseButtons = gBrowser.tabContainer._updateCloseButtons;
+    gBrowser.tabContainer._updateCloseButtons = function(skipUpdateScrollStatus, aUrl) {
+      // modes for close button on tabs - extensions.tabmix.tabs.closeButtons
+      // 1 - alltabs    = close buttons on all tabs
+      // 2 - hovertab   = close buttons on hover tab
+      // 3 - activetab  = close button on active tab only
+      // 4 - hoveractive = close buttons on hover and active tabs
+      // 5 - alltabs wider then  = close buttons on all tabs wider then
+
+      let oldValue = this.getAttribute("closebuttons");
+      var tabs = Tabmix.visibleTabs.tabs;
+      var tabsCount = Tabmix.tabsUtils.getTabsCount(tabs.length);
+      switch (Tabmix.tabsUtils.closeButtonsEnabled ? this.mCloseButtons : 0) {
+        case 0:
+          this.removeAttribute("closebuttons-hover");
+          this.setAttribute("closebuttons", "noclose");
+          break;
+        case 1:
+          this.removeAttribute("closebuttons-hover");
+          this.setAttribute("closebuttons", "alltabs");
+          break;
+        case 2:
+          this.setAttribute("closebuttons-hover", "alltabs");
+          this.setAttribute("closebuttons", "noclose");
+          break;
+        case 3:
+          this.removeAttribute("closebuttons-hover");
+          this.setAttribute("closebuttons", "activetab");
+          break;
+        case 4:
+          this.setAttribute("closebuttons-hover", "notactivetab");
+          this.setAttribute("closebuttons", "activetab");
+          break;
+        case 5:
+          this.removeAttribute("closebuttons-hover");
+          Tabmix.originalFunctions.tabContainer_updateCloseButtons.call(this, skipUpdateScrollStatus, aUrl);
+          break;
+      }
+
+      /**
+       *  Don't use return in this function
+       *  TreeStyleTab add some code at the end
+       */
+      let transitionend = Tabmix.callerTrace("onxbltransitionend");
+      if (tabsCount == 1) {
+        let tab = this.selectedItem;
+        if (!aUrl) {
+          let currentURI = gBrowser.currentURI;
+          aUrl = currentURI ? currentURI.spec : null;
+        }
+        // hide the close button if one of this condition is true:
+        //   - if "Do not close window when closing last tab" is set and the tab is blank,
+        //     about:blank or other new tab.
+        //   - if "Prevent last tab from closing" is set.
+        if (
+          Tabmix.tabsUtils._keepLastTab ||
+            !Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab") &&
+              (isBlankPageURL(tab.__newLastTab || null) ||
+                (!aUrl || isBlankPageURL(aUrl)) && gBrowser.isBlankNotBusyTab(tab))
+        ) {
+          this.setAttribute("closebuttons", "noclose");
+          this.removeAttribute("closebuttons-hover");
+        }
+      } else if (!skipUpdateScrollStatus && oldValue != this.getAttribute("closebuttons") ||
+                 transitionend) {
+        TabmixTabbar.updateScrollStatus(transitionend);
+      }
+    };
   },
 
   change_utility: function change_utility() {
@@ -740,37 +807,6 @@ Tabmix.tablib = {
       }
     };
 
-    /**
-     * only apply for sessionManager
-    Tabmix.changeCode(window, "warnAboutClosingWindow")._replace(
-      /gBrowser\.warnAboutClosingTabs\(\n?\s*closingTabs,\n?\s* gBrowser\.closingTabsEnum\.ALL,?\n?\s*(source)?\n?\s*\)/g,
-      'Tabmix.tablib.closeWindow(true)'
-    )._replace(
-      /os\.notifyObservers\(null, "browser-lastwindow-close-granted"(?:, null)?\);/,
-      'if (!TabmixSvc.isMac && !Tabmix.tablib.closeWindow(true)) return false;\
-       $&'
-    ).toCode();
-
-    Tabmix.changeCode(window, "WindowIsClosing")._replace(
-      '{',
-      '{Tabmix._warnedBeforeClosing = false;'
-    )._replace(
-      /if \(!closeWindow\(false, warnAboutClosingWindow(, source)?\)\)/,
-      `let reallyClose = closeWindow(false, warnAboutClosingWindow$1);
-  if (reallyClose && !Tabmix._warnedBeforeClosing)
-    reallyClose = Tabmix.tablib.closeWindow();
-  if (!reallyClose)`
-    ).toCode();
-    */
-
-    Tabmix.changeCode(window, "goQuitApplication")._replace(
-      'Services.startup.quit',
-      'let closedByToolkit = Tabmix.callerTrace("toolkitCloseallOnUnload");' +
-      'if (!TabmixSessionManager.canQuitApplication(closedByToolkit))' +
-      '  return false;' +
-      '$&'
-    ).toCode();
-
     // if user changed mode to single window mode while having closed window
     // make sure that undoCloseWindow will open the closed window in the most recent non-private window
     Tabmix.changeCode(window, "undoCloseWindow")._replace(
@@ -1261,7 +1297,6 @@ Tabmix.tablib = {
       }
       aTab.linkedBrowser.tabmix_allowLoad = !aTab.hasAttribute("locked");
       TabmixSvc.setCustomTabValue(aTab, "_locked", aTab.getAttribute("_locked"));
-      TabmixSessionManager.updateTabProp(aTab);
     };
 
     gBrowser.protectTab = function(aTab) {
@@ -1272,7 +1307,6 @@ Tabmix.tablib = {
       else
         aTab.setAttribute("protected", "true");
       TabmixSvc.setCustomTabValue(aTab, "protected", aTab.getAttribute("protected"));
-      TabmixSessionManager.updateTabProp(aTab);
       if (TabmixTabbar.widthFitTitle) {
         TabmixTabbar.updateScrollStatus();
       }
@@ -1295,7 +1329,6 @@ Tabmix.tablib = {
       aTab.linkedBrowser.tabmix_allowLoad = !aTab.hasAttribute("locked");
       TabmixSvc.setCustomTabValue(aTab, "_locked", aTab.getAttribute("_locked"));
       TabmixSvc.setCustomTabValue(aTab, "protected", aTab.getAttribute("protected"));
-      TabmixSessionManager.updateTabProp(aTab);
       if (TabmixTabbar.widthFitTitle) {
         TabmixTabbar.updateScrollStatus();
       }
@@ -1373,7 +1406,7 @@ Tabmix.tablib = {
     };
 
     gBrowser.selectIndexAfterRemove = function(oldTab) {
-      var tabs = TMP_TabView.currentGroup();
+      var tabs = gBrowser.visibleTabs;
       var currentIndex = tabs.indexOf(this._selectedTab);
       if (this._selectedTab != oldTab)
         return currentIndex;
@@ -1754,23 +1787,6 @@ Tabmix.tablib = {
       TMP_Places.currentTab = null;
   },
 
-  // make sure that our function don't break removeTab function
-  onRemoveTab: function TMP_onRemoveTab(tab) {
-    // Not in use since Firefox 27, see comment in TabmixTabClickOptions
-    if (Tabmix.prefs.getBoolPref("tabbar.click_dragwindow") &&
-        TabmixTabClickOptions._blockDblClick) {
-      setTimeout(() => {
-        TabmixTabClickOptions._blockDblClick = false;
-      }, 0);
-    }
-
-    try {
-      TabmixSessionManager.tabClosed(tab);
-    } catch (ex) {
-      Tabmix.assert(ex, "ERROR in TabmixSessionManager.tabClosed");
-    }
-  },
-
   closeLastTab: function TMP_closeLastTab() {
     if (TabmixSvc.isMac && window.location.href != AppConstants.BROWSER_CHROME_URL) {
       closeWindow(true);
@@ -1783,99 +1799,6 @@ Tabmix.tablib = {
       closeWindow(true);
   },
 
-  /**
-  * only apply for sessionManager
-  closeWindow: function TMP_closeWindow(aCountOnlyBrowserWindows) {
-    // we use this flag in WindowIsClosing
-    Tabmix._warnedBeforeClosing = true;
-
-    // since that some pref can changed by _onQuitRequest we catch it first
-    // by observe browser-lastwindow-close-requested
-    function getSavedPref(aPrefName, type) {
-      let returnVal = {saved: false};
-      if (aPrefName in TabmixSessionManager.savedPrefs) {
-        returnVal.saved = true;
-        returnVal.value = TabmixSessionManager.savedPrefs[aPrefName];
-        returnVal.newValue = Services.prefs[type == "int" ? "getIntPref" : "getBoolPref"](aPrefName);
-        delete TabmixSessionManager.savedPrefs[aPrefName];
-      } else {
-        returnVal.value = Services.prefs[type == "int" ? "getIntPref" : "getBoolPref"](aPrefName);
-      }
-
-      return returnVal;
-    }
-
-    // check if "Save & Quit" or "warn About Closing Tabs" dialog was showed
-    // from BrowserGlue.prototype._onQuitRequest
-    function isAfterFirefoxPrompt() {
-      // There are several cases where Firefox won't show a dialog here:
-      // 1. There is only 1 tab open in 1 window
-      // 2. The session will be restored at startup, indicated by
-      //    browser.startup.page == 3 or browser.sessionstore.resume_session_once == true
-      // 3. browser.warnOnQuit == false
-      // 4. The browser is currently in Private Browsing mode
-      // we check for these cases first
-
-      if (!Services.prefs.getBoolPref("browser.warnOnQuit"))
-        return false;
-
-      if (Services.prefs.getBoolPref("browser.sessionstore.resume_session_once"))
-        return false;
-
-      // try to find non-private window
-      let nonPrivateWindow = BrowserWindowTracker.getTopWindow({private: false});
-      if (!nonPrivateWindow)
-        return false;
-
-      // last windows with tabs
-      var windowtype = aCountOnlyBrowserWindows ? "navigator:browser" : null;
-      if (window.gBrowser.browsers.length < 2 || Tabmix.numberOfWindows(false, windowtype) > 1)
-        return false;
-
-      // since this pref can change by _onQuitRequest we catch it first
-      // by observe browser-lastwindow-close-requested
-      let saveSessionPref = getSavedPref("browser.startup.page", "int");
-      if (saveSessionPref.saved && saveSessionPref.value == 3)
-        return false;
-
-      // we never get to this function by restart
-      // if we are still here we know that we are the last window
-      // before Firefox 63 the return value was based on "browser.showQuitWarning"
-      // if "browser.showQuitWarning" is true firefox show "Save & Quit"
-      // when we quit or close last browser window.
-      // if "browser.showQuitWarning" is false and we close last window firefox design
-      // to show warnAboutClosingTabs dialog but we block it in order to call warnAboutClosingTabs
-      // from here and catch display time here.
-
-      // from Firefox 63 always return true
-      return true;
-    }
-
-    // we always show our prompt on Mac
-    var showPrompt = TabmixSvc.isMac || !isAfterFirefoxPrompt();
-    // get caller caller name and make sure we are not on restart
-    var askBeforeSave = !Tabmix.callerTrace("restartApp", "restart");
-    var isLastWindow = Tabmix.isLastBrowserWindow;
-    var result = TabmixSessionManager.deinit(isLastWindow, askBeforeSave);
-    var canClose = result.canClose;
-    // we only show warnAboutClose if firefox or tabmix didn't do it already
-    // if showPrompt is false then prompt was shown by firefox code from BrowserGlue.prototype._onQuitRequest
-    // or from TabmixSessionManager.deinit
-    if (canClose && showPrompt && result.showMorePrompt) {
-      var pref = "extensions.tabmix.warnAboutClosingTabs.timeout";
-      var startTime = new Date().valueOf();
-      var oldTime = Services.prefs.prefHasUserValue(pref) ? Services.prefs.getCharPref(pref) : 0;
-      let closingTabs = Tabmix.tabsUtils.getTabsCount();
-      canClose = gBrowser.warnAboutClosingTabs(closingTabs, gBrowser.closingTabsEnum.ALL);
-      Services.prefs.setCharPref(pref, Number(oldTime) + (new Date().valueOf() - startTime));
-    }
-
-    TabmixSessionManager.windowIsClosing(canClose, isLastWindow, result.saveSession, result.removeClosedTabs);
-
-    return canClose;
-  },
-  */
-
   whereToOpenDrop(aEvent, aUri) {
     if (!aEvent) {
       return "current";
diff --git a/addon/chrome/content/overlay/tsconfig.json b/addon/chrome/content/overlay/tsconfig.json
index e8616578a..9de8bc21b 100644
--- a/addon/chrome/content/overlay/tsconfig.json
+++ b/addon/chrome/content/overlay/tsconfig.json
@@ -3,6 +3,6 @@
   "include": ["**/*.js", "**/*.sys.mjs"],
   "compilerOptions": {
     "typeRoots": ["../../../../types"],
-    "types": ["general.d.ts", "customDialog.d.ts", "autoReload.d.ts", "tabmix.d.ts"]
+    "types": ["general.d.ts", "autoReload.d.ts", "tabmix.d.ts"]
   }
 }
diff --git a/addon/chrome/content/preferences/appearance.xhtml b/addon/chrome/content/preferences/appearance.xhtml
index 59566ce9f..f4eea30ea 100644
--- a/addon/chrome/content/preferences/appearance.xhtml
+++ b/addon/chrome/content/preferences/appearance.xhtml
@@ -283,12 +283,6 @@
             <html:fieldset id="onPlate">
               <html:legend>&toolbar.hidden.caption;</html:legend>
               <label value="&toolbar.nohidden.label;" class="indent"/>
-              <!--
-              <hbox class="tabmixbuttons">
-                <image id="_btn_sessionmanager"/>
-                <label value="&session.Tools;"/>
-              </hbox>
-              -->
               <hbox class="tabmixbuttons">
                 <image id="_tabmix-closedTabsButton"/>
                 <label value="&closedtabsbtn.label;"/>
diff --git a/addon/chrome/content/preferences/incompatible.xhtml b/addon/chrome/content/preferences/incompatible.xhtml
index 1e215c999..08f496008 100644
--- a/addon/chrome/content/preferences/incompatible.xhtml
+++ b/addon/chrome/content/preferences/incompatible.xhtml
@@ -8,7 +8,7 @@
 <overlay id="IncompatiblePaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <prefpane id="paneIncompatible" helpTopic="paneIncompatible">
+  <prefpane id="paneIncompatible" onpaneload="gIncompatiblePane.init();" helpTopic="introduction">
 
     <tabbox>
       <tabs class="tabs-hidden">
diff --git a/addon/chrome/content/preferences/menu.js b/addon/chrome/content/preferences/menu.js
index cf44272ee..4b04e76ff 100644
--- a/addon/chrome/content/preferences/menu.js
+++ b/addon/chrome/content/preferences/menu.js
@@ -13,10 +13,6 @@ var gMenuPane = {
     $("togglePinTab").setAttribute("label", gPrefWindow.pinTabLabel);
     $("clearClosedTabs").setAttribute("label", TabmixSvc.getString("undoclosetab.clear.label"));
 
-    var browserWindow = Tabmix.getTopWin();
-    /** @type {Functions["getById"]} */
-    let $$ = id => browserWindow.document.getElementById(id);
-
     const [showBmkTab, showBmkTabs] = [$("showBmkTab"), $("showBmkTabs")];
     document.l10n?.translateElements([showBmkTab, showBmkTabs]).then(() => {
       showBmkTab.label = showBmkTab.label.replace("…", "");
@@ -35,15 +31,6 @@ var gMenuPane = {
       gPrefWindow.removeItemAndPrefById("pref_closeDuplicateTabs");
     }
 
-    // if Tabview exist copy its menu label
-    let tabViewMenu = browserWindow.TMP_TabView.installed &&
-        ($$("context_tabViewMenu") || $$("tabGroups-context_tabViewMenu"));
-    if (tabViewMenu) {
-      $("moveToGroup").label = tabViewMenu.getAttribute("label");
-    } else {
-      gPrefWindow.removeItemAndPrefById("pref_showMoveToGroup");
-    }
-
     this.setInverseLinkLabel();
 
     // we can not modify build-in key with reserved attribute
@@ -58,7 +45,6 @@ var gMenuPane = {
     if (!Shortcuts.keys.browserReload.id)
       $("browserReload").hidden = true;
     this.initializeShortcuts();
-    this.updateSessionShortcuts();
     this.setSlideShowLabel();
     let paneMenu = $("paneMenu");
     if (paneMenu.hasAttribute("editSlideShowKey")) {
@@ -116,13 +102,6 @@ var gMenuPane = {
     shortcuts.scrollTop = shortcuts.scrollHeight - shortcuts.clientHeight;
   },
 
-  updateSessionShortcuts() {
-    const permanentPrivateBrowsing = this.PrivateBrowsingUtils.permanentPrivateBrowsing;
-    let block = !($Pref("pref_sessionManager") || $Pref("pref_sessionManager1")).value || permanentPrivateBrowsing;
-    $("saveWindow").blocked = block;
-    $("saveSession").blocked = block;
-  },
-
   // for shortcuts panel
   toggleLinkLabel(item) {
     var panel = $("shortcuts-panel");
diff --git a/addon/chrome/content/preferences/menu.xhtml b/addon/chrome/content/preferences/menu.xhtml
index d15a6c80b..bd501f8c1 100644
--- a/addon/chrome/content/preferences/menu.xhtml
+++ b/addon/chrome/content/preferences/menu.xhtml
@@ -24,7 +24,6 @@
                                                                                             type="int"/>
       <preference id="pref_showOnTabbar"       name="extensions.tabmix.showTabContextMenuOnTabbar"
                                                                                             type="bool"/>
-      <preference id="pref_showMoveToGroup"    name="extensions.tabmix.moveToGroup"         type="bool"/>
       <preference id="pref_showNewTab"         name="extensions.tabmix.newTabMenu"          type="bool"/>
       <preference id="pref_showDuplicate"      name="extensions.tabmix.duplicateMenu"       type="bool"/>
       <preference id="pref_showDuplicateinWin" name="extensions.tabmix.duplicateinWinMenu"  type="bool"/>
@@ -79,14 +78,10 @@
       <preference id="pref_showUndoCloseContent"
                   name="extensions.tabmix.undoCloseTabContent"                              type="bool"/>
       <preference id="pref_optionsToolsMenu"   name="extensions.tabmix.optionsToolMenu"     type="bool"/>
-      <preference id="pref_sessionToolsMenu"   name="extensions.tabmix.sessionToolsMenu"    type="bool"/>
       <preference id="pref_closedWinToolsMenu" name="extensions.tabmix.closedWinToolsMenu"  type="bool"/>
       <preference id="pref_shortcuts"          name="extensions.tabmix.shortcuts"           type="string"
                   onchange="gMenuPane.initializeShortcuts();"/>
       <preference id="pref_slideshow"          name="extensions.tabmix.slideDelay"          type="int"/>
-      <preference id="pref_sessionManager1"
-                  name="extensions.tabmix.sessions.manager"                                 type="bool"
-                  onchange="if (typeof gSessionPane == 'undefined') gMenuPane.updateSessionShortcuts();"/>
    </preferences>
 
 
@@ -125,8 +120,6 @@
                 <checkbox_tmp id="shareTabURL" data-lazy-l10n-id="tab-context-share-url" preference="pref_shareTabURL"/>
                 <!-- Merge Windows -->
                 <checkbox_tmp id="showMergeWin" label="&mergeContext.label;" preference="pref_showMergeWin"/>
-                <!-- move to group -->
-                <checkbox_tmp id="moveToGroup" preference="pref_showMoveToGroup"/>
                 <!-- Rename tab -->
                 <checkbox_tmp id="showRenametab" label="&renametab.label;" preference="pref_showRenametab"/>
                 <!-- Copy tab Url -->
@@ -219,8 +212,6 @@
               <vbox align="start">
                 <checkbox_tmp id="optionsToolsMenu" preference="pref_optionsToolsMenu"
                           label="&page.header.title;…"/>
-                <checkbox_tmp hidden="true" id="sessionToolsMenu" preference="pref_sessionToolsMenu"
-                          label="&session.Tools;"/>
                 <checkbox_tmp id="closedWinToolsMenu" preference="pref_closedWinToolsMenu"
                           label="&closedWin.label;"/>
               </vbox>
@@ -283,8 +274,6 @@
             <shortcut id="undoCloseTab"    label="&clicktab.uctab;"/>
             <shortcut id="clearClosedTabs"/>
             <shortcut id="ucatab"          label="&clicktab.ucatab;"/>
-            <shortcut id="saveWindow"      label="&saveWindow.label;"/>
-            <shortcut id="saveSession"     label="&saveAllWindows.label;"/>
             <shortcut id="switchToLast"    label="&shortcuts.switchToLast;"/>
             <shortcut id="toggleFLST"      label="&shortcuts.toggleFLST;"
                       tooltiptext="&shortcuts.toggleFLST.tooltip;"/>
diff --git a/addon/chrome/content/preferences/preferences.js b/addon/chrome/content/preferences/preferences.js
index 3aec9ca41..0cc329206 100644
--- a/addon/chrome/content/preferences/preferences.js
+++ b/addon/chrome/content/preferences/preferences.js
@@ -132,7 +132,6 @@ var gPrefWindow = {
   deinit() {
     window.removeEventListener("change", this);
     window.removeEventListener("beforeaccept", this);
-    TabmixSvc.sm.settingPreference = false;
     Shortcuts.prefsChangedByTabmix = false;
     window.gIncompatiblePane.deinit();
   },
@@ -151,7 +150,6 @@ var gPrefWindow = {
       case "beforeaccept":
         this.applyBlockedChanges();
         if (!this.instantApply) {
-          TabmixSvc.sm.settingPreference = true;
           Shortcuts.prefsChangedByTabmix = true;
         }
         break;
@@ -477,11 +475,6 @@ function setPrefAfterImport(aPref) {
   return false;
 }
 
-var sessionPrefs = ["browser.sessionstore.resume_from_crash",
-  "browser.startup.page",
-  "extensions.tabmix.sessions.manager",
-  "extensions.tabmix.sessions.crashRecovery"];
-
 ChromeUtils.defineLazyGetter(this, "gPreferenceList", () => {
   // other settings not in extensions.tabmix. branch that we save
   let otherPrefs = [
@@ -518,24 +511,14 @@ ChromeUtils.defineLazyGetter(this, "gPreferenceList", () => {
   return tabmixPrefs;
 });
 
-ChromeUtils.defineLazyGetter(window, "_sminstalled", () => {
-  return Tabmix.getTopWin().Tabmix.extensions.sessionManager;
-});
-
 function defaultSetting() {
   gPrefWindow.resetChanges();
   // set flag to prevent TabmixTabbar.updateSettings from run for each change
   Tabmix.prefs.setBoolPref("setDefault", true);
   Shortcuts.prefsChangedByTabmix = true;
-  let SMinstalled = window._sminstalled;
-  let prefs = !SMinstalled ? gPreferenceList :
-    gPreferenceList.filter(pref => !sessionPrefs.includes(pref));
-  prefs.forEach(pref => {
+  gPreferenceList.forEach(pref => {
     Services.prefs.clearUserPref(pref);
   });
-  // we enable our session manager on default
-  // set resume_from_crash to false
-  Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", false);
 
   gPrefWindow.afterShortcutsChanged();
   Tabmix.prefs.clearUserPref("setDefault");
@@ -603,10 +586,8 @@ function toggleSyncPreference() {
   /** @type {"clearUserPref" | "setBoolPref"} */
   let fn = Tabmix.prefs.getBoolPref("syncPrefs") ? "clearUserPref" : "setBoolPref";
   Tabmix.prefs[fn]("syncPrefs", true);
-  let exclude = ["extensions.tabmix.sessions.onStart.sessionpath"];
   gPreferenceList.forEach(pref => {
-    if (!exclude.includes(pref))
-      Services.prefs[fn](sync + pref, true);
+    Services.prefs[fn](sync + pref, true);
   });
   Services.prefs.savePrefFile(null);
 }
@@ -682,16 +663,6 @@ function loadData(pattern) {
   // set flag to prevent TabmixTabbar.updateSettings from run for each change
   Tabmix.prefs.setBoolPref("setDefault", true);
 
-  // disable both Firefox & Tabmix session manager to prevent our prefs observer to block the change
-  let SMinstalled = window._sminstalled;
-  if (!SMinstalled) {
-    Tabmix.prefs.setBoolPref("sessions.manager", false);
-    Tabmix.prefs.setBoolPref("sessions.crashRecovery", false);
-    Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", false);
-    Services.prefs.setIntPref("browser.startup.page", 0);
-    Services.prefs.savePrefFile(null);
-  }
-
   // set updateOpenedTabsLockState before lockallTabs and lockAppTabs
   let pref = "extensions.tabmix.updateOpenedTabsLockState=";
   let index = pattern.indexOf(pref + true) + pattern.indexOf(pref + false) + 1;
@@ -705,10 +676,8 @@ function loadData(pattern) {
     let valIndex = val.indexOf("=");
     if (valIndex > 0) {
       prefName = val.substring(0, valIndex);
-      if (!SMinstalled || !sessionPrefs.includes(prefName)) {
-        prefValue = val.substring(valIndex + 1, val.length);
-        setPrefByType(prefName, prefValue, true);
-      }
+      prefValue = val.substring(valIndex + 1, val.length);
+      setPrefByType(prefName, prefValue, true);
     }
   }
   gPrefWindow.afterShortcutsChanged();
@@ -768,6 +737,7 @@ function donate() {
 
 window.gIncompatiblePane = {
   lastSelected: "paneLinks",
+  _initialized: false,
 
   get paneButton() {
     return Tabmix.lazyGetter(this, "paneButton",
@@ -775,9 +745,15 @@ window.gIncompatiblePane = {
   },
 
   init() {
+    if (this._initialized) {
+      return;
+    }
+    this._initialized = true;
+
     let radioGroup = this.paneButton.parentNode;
     radioGroup.addEventListener("command", this);
     this.checkForIncompatible(false);
+    gPrefWindow.initPane("paneIncompatible");
   },
 
   deinit() {
diff --git a/addon/chrome/content/preferences/session.js b/addon/chrome/content/preferences/session.js
index d177e5e93..7f6e3710a 100644
--- a/addon/chrome/content/preferences/session.js
+++ b/addon/chrome/content/preferences/session.js
@@ -4,91 +4,6 @@
 /** @type {SessionPane} */
 var gSessionPane = {
   init() {
-    if (TabmixSvc.isLinux)
-      $("sessionManager-panels").setAttribute("linux", "true");
-
-    // while we don't use session manager always set `Advanced Setting` as selected tab
-    $("session").selectedIndex = 2;
-
-    this.isSessionStoreEnabled(true);
-    this.updateSessionShortcuts();
-
     gPrefWindow.initPane("paneSession");
   },
-
-  updateSessionShortcuts() {
-    if (typeof gMenuPane == "object")
-      gMenuPane.updateSessionShortcuts();
-  },
-
-  isSessionStoreEnabled(onStart) {
-    // ##### always show build-in session manager panel #####
-    // var sessionStoreEnabled = Services.prefs.getIntPref("browser.startup.page") == 3 ||
-    //     Services.prefs.getBoolPref("browser.sessionstore.resume_from_crash");
-    const sessionStoreEnabled = true;
-    $("sessionsOptions").checked = sessionStoreEnabled;
-    $("sessionsPanel").setAttribute("manager", !sessionStoreEnabled ? "tabmix" : "firefox");
-    if (!onStart || sessionStoreEnabled)
-      $("session").selectedIndex = sessionStoreEnabled ? 2 : 0;
-    else if ($("session").selectedIndex == 2)
-      $("session").selectedIndex = 0;
-  },
-
-  setSessionsOptions(item) {
-    // ##### disable Session Manager #####
-    item.checked = true;
-    let instantApply = document.documentElement.instantApply;
-    var useSessionManager = !item.checked;
-    $("sessionsPanel").setAttribute("manager", useSessionManager ? "tabmix" : "firefox");
-
-    /** @type {(aItemId: string, aValue: PreferenceValue)=>void} */
-    function updatePrefs(aItemId, aValue) {
-      let preference = $Pref("pref_" + aItemId);
-      preference.batching = true;
-      if (instantApply) {
-        preference.value = aValue;
-      } else {
-        preference.valueFromPreferences = aValue;
-        gPrefWindow.changes.delete(preference);
-      }
-      preference.batching = false;
-    }
-
-    // TMP session pref
-    let sessionPrefs = function() {
-      updatePrefs("sessionManager", useSessionManager);
-      updatePrefs("sessionCrashRecovery", useSessionManager);
-    };
-
-    // sessionstore pref
-    function sessionstorePrefs() {
-      updatePrefs("browser.warnOnQuit", !useSessionManager);
-      updatePrefs("resume_from_crash", !useSessionManager);
-      // "browser.startup.page"
-      updatePrefs("browserStartupPage", useSessionManager ? 1 : 3);
-    }
-
-    TabmixSvc.sm.settingPreference = true;
-    if (useSessionManager) {
-      sessionstorePrefs();
-      sessionPrefs();
-    } else {
-      sessionPrefs();
-      sessionstorePrefs();
-    }
-    TabmixSvc.sm.settingPreference = false;
-
-    if (instantApply)
-      Services.prefs.savePrefFile(null);
-    else
-      gPrefWindow.setButtons(!gPrefWindow.changes.size);
-  },
-
-  setSessionpath(val) {
-    const menuItem = $("onStart.popup").getElementsByAttribute("value", val)[0];
-    if (menuItem) {
-      $Pref("pref_sessionpath").value = menuItem.getAttribute("session");
-    }
-  },
-
 };
diff --git a/addon/chrome/content/preferences/session.xhtml b/addon/chrome/content/preferences/session.xhtml
index a9b3c4088..e36e1b21a 100644
--- a/addon/chrome/content/preferences/session.xhtml
+++ b/addon/chrome/content/preferences/session.xhtml
@@ -12,67 +12,22 @@
   <prefpane id="paneSession" onpaneload="gSessionPane.init();">
 
     <!-- scripts -->
-    <script type="application/javascript" src="chrome://tabmixplus/content/session/session.js"/>
     <script type="application/javascript" src="chrome://tabmixplus/content/preferences/session.js"/>
 
     <!-- preferences - list all preferences in this pane -->
     <preferences>
       <preference id="pref_session"             name="extensions.tabmix.session.selectedTabIndex"
                   type="int"/>
-      <preference id="pref_sessionManager"
-                  name="extensions.tabmix.sessions.manager"                  type="bool"
-                  onchange="gSessionPane.updateSessionShortcuts();"/>
-      <preference id="pref_sessionCrashRecovery"
-                  name="extensions.tabmix.sessions.crashRecovery"            type="bool"/>
       <preference id="pref_browser.warnOnQuit"
                   name="browser.warnOnQuit"                                  type="bool"/>
       <preference id="pref_browserStartupPage"
-                  name="browser.startup.page"                                type="int"
-                  onchange="gSessionPane.isSessionStoreEnabled();"/>
+                  name="browser.startup.page"                                type="int"/>
       <preference id="pref_resume_from_crash"
-                  name="browser.sessionstore.resume_from_crash"              type="bool"
-                  onchange="gSessionPane.isSessionStoreEnabled();"/>
+                  name="browser.sessionstore.resume_from_crash"              type="bool"/>
       <preference id="pref_ss_timeinterval"
                   name="browser.sessionstore.interval"                       type="int"/>
       <preference id="pref_ss_postdata"
                   name="browser.sessionstore.privacy_level"                  type="int"/>
-      <preference id="pref_onStart"
-                  name="extensions.tabmix.sessions.onStart"                  type="int"/>
-      <preference id="pref_onClose"
-                  name="extensions.tabmix.sessions.onClose"                  type="int"/>
-      <preference id="pref_onStart.loadsession"
-                  name="extensions.tabmix.sessions.onStart.loadsession"      type="int"
-                  onchange="gSessionPane.setSessionpath(this.value);"/>
-      <preference id="pref_sessionpath"
-                  name="extensions.tabmix.sessions.onStart.sessionpath"      type="string"/>
-      <preference id="pref_onStart.empty"
-                  name="extensions.tabmix.sessions.onStart.askifempty"       type="bool"/>
-      <preference id="pref_onStart.restorePinned"
-                  name="extensions.tabmix.sessions.onStart.restorePinned"       type="bool"/>
-      <preference id="pref_onRestore.overwritewindows"
-                  name="extensions.tabmix.sessions.restore.overwritewindows" type="bool"/>
-      <preference id="pref_onRestore.overwritetabs"
-                  name="extensions.tabmix.sessions.restore.overwritetabs"    type="bool"/>
-      <preference id="pref_onOverwrite-Save"
-                  name="extensions.tabmix.sessions.restore.saveoverwrite"    type="bool"/>
-      <preference id="pref_onRestore.concatenate"
-                  name="extensions.tabmix.sessions.restore.concatenate"      type="bool"/>
-      <preference id="pref_onRestore.reloadall"
-                  name="extensions.tabmix.sessions.restore.reloadall"        type="bool"/>
-      <preference id="pref_session.History"
-                  name="extensions.tabmix.sessions.save.history"             type="bool"/>
-      <preference id="pref_session.Permissions"
-                  name="extensions.tabmix.sessions.save.permissions"         type="bool"/>
-      <preference id="pref_session.Protect"
-                  name="extensions.tabmix.sessions.save.protected"           type="bool"/>
-      <preference id="pref_session.Lock"
-                  name="extensions.tabmix.sessions.save.locked"              type="bool"/>
-      <preference id="pref_session.ScrollPosition"
-                  name="extensions.tabmix.sessions.save.scrollposition"      type="bool"/>
-      <preference id="pref_session.SelectedTab"
-                  name="extensions.tabmix.sessions.save.selectedtab"         type="bool"/>
-      <preference id="pref_session.closedtabs"
-                  name="extensions.tabmix.sessions.save.closedtabs"          type="bool"/>
     </preferences>
 
     <!-- pane content -->
@@ -85,12 +40,7 @@
           <vbox class="work-in-progress">
             <label class="bold-label" value="Tabmix Session Manager is not ready yet, use built-in Session Manager" />
           </vbox>
-          <html:fieldset align="start">
-            <checkbox_tmp id="sessionsOptions" label="&ss.enable.label;"
-                      checked="true"
-                      tooltiptext="Tabmix Session Manager is not ready yet"
-                      _tooltiptext="&ss.enable.tooltip;"
-                      oncommand="gSessionPane.setSessionsOptions(this);"/>
+          <html:fieldset align="start" flex="1">
             <separator class="thin"/>
             <vbox style="display: inline-block;">
               <label value="&sm.start;" control="browserStartupPage" class="firefox"/>
@@ -101,138 +51,32 @@
                   <menuitem label="&startupLastSession1.label;"  value="3"/>
                 </menupopup>
               </menulist>
-              <checkbox_tmp id="sessionManager" label="&sessionManger.enable;" preference="pref_sessionManager"
-                        class="tabmix" style="margin-top: 15px;"/>
             </vbox>
             <checkbox_tmp id="resume_from_crash" label="&crashRecovery.enable;" preference="pref_resume_from_crash" class="firefox"/>
-            <checkbox_tmp id="sessionCrashRecovery" label="&crashRecovery.enable;" preference="pref_sessionCrashRecovery" class="tabmix"/>
-          </html:fieldset>
-          <tabbox class="groupbox-tabbox sessionManager" flex="1"
-                  onselect="gPrefWindow.tabSelectionChanged(event);">
-            <tabs id="session">
-              <tab label="&sm.StartExit;" class="subtabs tabmix" helpTopic="Session_-_StartExit"/>
-              <tab label="&sm.restore;" class="subtabs tabmix" helpTopic="Session_-_StartExit#Restore"/>
-              <tab label="tab" disabled="true" class="firefox" helpTopic="Session_-_StartExit"/>
-              <tab label="&sm.preserve;" class="subtabs tabmix" helpTopic="Session_-_StartExit#Preserve"/>
-            </tabs>
-            <tabpanels id="sessionManager-panels" flex="1" class="groupbox-panels">
-              <!-- Tabmix Session manager - start/exit -->
-              <tabpanel>
-                <hbox>
-                  <html:fieldset style="min-width: 14.6em;">
-                    <caption label="&sm.start;"/>
-                    <radiogroup id="onStart" align="start" preference="pref_onStart">
-                      <radio value="0" id="onStart.restoresession" label="&sm.start.restore;"/>
-                      <radio value="1" id="onStart.askme" label="&sm.start.ask;"/>
-                      <radio value="2" id="onStart.donothing" label="&sm.start.nothing;"/>
-                    </radiogroup>
-                  </html:fieldset>
-                  <html:fieldset flex="1">
-                    <caption label="&sm.exit;"/>
-                    <radiogroup id="onClose" align="start" preference="pref_onClose"
-                                oncommand="if (this.selectedIndex == 2) alert(TabmixSvc.getString('tmp.sessionempty'));">
-                      <radio value="0" id="onClose.savesession" label="&sm.exit.save;"/>
-                      <radio value="1" id="onClose.askme" label="&sm.exit.ask;"/>
-                      <radio value="2" id="onClose.donothing" label="&sm.exit.nothing;"/>
-                    </radiogroup>
-                  </html:fieldset>
+            <tabpanel style="margin-top: 30px;" orient="horizontal" flex="1">
+              <vbox>
+                <label value="&ss.advanced_setting;" class="font-bold"
+                        style="text-decoration: underline;color: #CC0000;"/>
+                <description class="font-bold">&ss.advanced_setting.warning;</description>
+                <label control="ss_timeinterval" value="&ss.interval;"/>
+                <hbox align="center" pack="end">
+                  <label control="ss_timeinterval" value="&ss.interval.seconds;:"/>
+                  <html:input id="ss_timeinterval" preference="pref_ss_timeinterval"
+                            maxlength="6" size="6" type="number" required="required" min="0"/>
+                </hbox>
+                <label control="ss_postdata" value="&ss.privacy_level;:"/>
+                <hbox pack="end">
+                  <menulist id="ss_postdata" preference="pref_ss_postdata">
+                    <menupopup>
+                      <menuitem label="&ss.privacy_level.allsites;"    value="0"/>
+                      <menuitem label="&ss.privacy_level.unencrypted;" value="1"/>
+                      <menuitem label="&ss.privacy_level.nosites;"     value="2"/>
+                    </menupopup>
+                  </menulist>
                 </hbox>
-                <html:fieldset>
-                  <hbox align="center">
-                    <label value="&sm.startup;"/>
-                    <menulist id="onStart.loadsession" sizetopopup="none" style="width: 15em;"
-                              preference="pref_onStart.loadsession">
-                      <menupopup id="onStart.popup"
-                                 onpopupshowing="TabmixSessionManager.createMenuForDialog(this);">
-                        <menuseparator id="onStart.loadsession-startSeparator" hidden="true"/>
-                        <menuseparator id="onStart.loadsession-endSeparator" hidden="true"/>
-                        <menuitem id="load-last-session" label="&sm.lastsession;" value="-1" session=""/>
-                        <menuitem id="load-previous-session" label="&sm.previouslast;" value="-2" session=""/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                  <checkbox_tmp id="onStart.empty" class="indent" label="&sm.chooseifempty;"
-                            preference="pref_onStart.empty"/>
-                  <separator class="thin"/>
-                  <hbox align="center">
-                    <label value="&sm.notrestore.label;:" control="browserStartupPage1"/>
-                    <menulist id="browserStartupPage1" preference="pref_browserStartupPage">
-                      <menupopup>
-                        <menuitem label="&startupHomePage1.label;"     value="1"/>
-                        <menuitem label="&startupBlankPage.label;"    value="0"/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                  <checkbox_tmp id="onStart.restorePinned" class="indent" label="&sm.restorePinned1.label;"
-                            preference="pref_onStart.restorePinned"/>
-                </html:fieldset>
-              </tabpanel>
-              <!-- Tabmix Session manager - restore -->
-              <tabpanel>
-                <html:fieldset>
-                  <caption label="&sm.restore.options;"/>
-                  <hbox>
-                    <checkbox_tmp id="onRestore.overwritewindows" label="&sm.restore.overwrite;"
-                              preference="pref_onRestore.overwritewindows"/>
-                    <checkbox_tmp id="onRestore.overwritetabs" label="&sm.restore.overwriteTabs;"
-                              preference="pref_onRestore.overwritetabs" observes="obs_onRestore.overwritewindows"/>
-                  </hbox>
-                  <checkbox_tmp id="onOverwrite-Save" class="indent" label="&sm.restore.closedWinList;"
-                            preference="pref_onOverwrite-Save" observes="obs_onRestore.overwritewindows"/>
-                  <checkbox_tmp id="onRestore.concatenate" label="&sm.restore.merge;" preference="pref_onRestore.concatenate"/>
-                  <checkbox_tmp id="onRestore.reloadall" label="&sm.restore.bypassCache;" preference="pref_onRestore.reloadall"/>
-                </html:fieldset>
-              </tabpanel>
-              <!-- Build-in SessionStore (we hide this panel, don't put it in first or last tab)-->
-              <tabpanel orient="horizontal" flex="1">
-                <vbox>
-                  <label value="&ss.advanced_setting;" class="font-bold"
-                         style="text-decoration: underline;color: #CC0000;"/>
-                  <description class="font-bold">&ss.advanced_setting.warning;</description>
-                  <label control="ss_timeinterval" value="&ss.interval;"/>
-                  <hbox align="center" pack="end">
-                    <label control="ss_timeinterval" value="&ss.interval.seconds;:"/>
-                    <html:input id="ss_timeinterval" preference="pref_ss_timeinterval"
-                             maxlength="6" size="6" type="number" required="required" min="0"/>
-                  </hbox>
-                  <label control="ss_postdata" value="&ss.privacy_level;:"/>
-                  <hbox pack="end">
-                    <menulist id="ss_postdata" preference="pref_ss_postdata">
-                      <menupopup>
-                        <menuitem label="&ss.privacy_level.allsites;"    value="0"/>
-                        <menuitem label="&ss.privacy_level.unencrypted;" value="1"/>
-                        <menuitem label="&ss.privacy_level.nosites;"     value="2"/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                </vbox>
-              </tabpanel>
-              <!-- Tabmix Session manager - preserve -->
-              <tabpanel>
-                <html:fieldset>
-                  <caption label="&sm.preserve.options;"/>
-                  <hbox>
-                    <vbox align="start">
-                      <checkbox_tmp id="session.History" label="&sm.preserve.history;" preference="pref_session.History"/>
-                      <checkbox_tmp id="session.Permissions" label="&sm.preserve.permission;" preference="pref_session.Permissions"/>
-                      <checkbox_tmp id="session.ScrollPosition" label="&sm.preserve.scroll1;" preference="pref_session.ScrollPosition"/>
-                    </vbox>
-                    <vbox align="start">
-                      <checkbox_tmp id="session.Protect" label="&sm.preserve.protect;" preference="pref_session.Protect"/>
-                      <checkbox_tmp id="session.Lock" label="&sm.preserve.locked;" preference="pref_session.Lock"/>
-                    </vbox>
-                  </hbox>
-                </html:fieldset>
-                <html:fieldset>
-                  <caption label="&sm.restore.winOptions;"/>
-                  <hbox align="center">
-                    <checkbox_tmp id="session.SelectedTab" label="&sm.restore.selectedTab;" preference="pref_session.SelectedTab"/>
-                    <checkbox_tmp id="session.closedtabs" label="&sm.restore.closedTabs;" preference="pref_session.closedtabs" observes="obs_undoClose"/>
-                  </hbox>
-                </html:fieldset>
-              </tabpanel>
-            </tabpanels>
-          </tabbox>
+              </vbox>
+            </tabpanel>
+          </html:fieldset>
         </tabpanel>
       </tabpanels>
     </tabbox>
diff --git a/addon/chrome/content/preferences/subdialogs/pref-appearance.css b/addon/chrome/content/preferences/subdialogs/pref-appearance.css
index b52ae4e1a..99d781846 100644
--- a/addon/chrome/content/preferences/subdialogs/pref-appearance.css
+++ b/addon/chrome/content/preferences/subdialogs/pref-appearance.css
@@ -16,6 +16,7 @@
   max-height: 11px !important;
 }
 
+.fit-content,
 tabpanels {
   width: fit-content;
 }
diff --git a/addon/chrome/content/scripts/content.js b/addon/chrome/content/scripts/content.js
index 0edc33a6d..fb6a7afde 100644
--- a/addon/chrome/content/scripts/content.js
+++ b/addon/chrome/content/scripts/content.js
@@ -22,7 +22,6 @@ var TabmixContentHandler = {
     "Tabmix:restorePermissions",
     "Tabmix:resetContentName",
     "Tabmix:updateHistoryTitle",
-    "Tabmix:collectScrollPosition",
     "Tabmix:setScrollPosition",
     "Tabmix:collectReloadData",
     "Tabmix:isFrameInContent",
@@ -66,14 +65,6 @@ var TabmixContentHandler = {
         }
         break;
       }
-      case "Tabmix:collectScrollPosition": {
-        let scroll = {
-          scrollX: content.scrollX,
-          scrollY: content.scrollY
-        };
-        sendAsyncMessage("Tabmix:updateScrollPosition", {scroll});
-        break;
-      }
       case "Tabmix:setScrollPosition": {
         content.scrollTo(data.x, data.y);
         break;
diff --git a/addon/chrome/content/session/session.js b/addon/chrome/content/session/session.js
deleted file mode 100644
index d78c11159..000000000
--- a/addon/chrome/content/session/session.js
+++ /dev/null
@@ -1,3720 +0,0 @@
-// @ts-nocheck
-/* globals TabmixConvertSession */
-/* eslint "mozilla/avoid-Date-timing": "off", mozilla/consistent-if-bracing: off */
-"use strict";
-
-Tabmix.BUTTON_OK = 0;
-Tabmix.BUTTON_CANCEL = 1;
-Tabmix.BUTTON_EXTRA1 = 2;
-Tabmix.SHOW_MENULIST = 1;
-Tabmix.SHOW_TEXTBOX = 0;
-Tabmix.HIDE_MENUANDTEXT = 2;
-Tabmix.CHECKBOX_UNCHECKED = 0;
-Tabmix.CHECKBOX_CHECKED = 1;
-Tabmix.HIDE_CHECKBOX = 2;
-Tabmix.SELECT_DEFAULT = 0;
-Tabmix.SELECT_LASTSESSION = 1;
-Tabmix.SELECT_CRASH = 2;
-Tabmix.SHOW_CLOSED_WINDOW_LIST = 3;
-Tabmix.DLG_SAVE = 0;
-Tabmix.DLG_RENAME = 1;
-Tabmix.NO_NEED_TO_REPLACE = -1;
-
-/** @type {TabmixSessionManager} */
-var TabmixSessionManager;
-/** @type {TabmixSessionData} */
-var TabmixSessionData;
-
-/**
- *  sanitize private data by delete the files session.rdf session.old
- */
-Tabmix.Sanitizer = {
-  isSanitizeTMPwithoutPrompet(aOnExit) {
-    /*
-      * The behavior is:
-      *   - Tools > Clear Recent History... - Always show the UI
-      *   - about:privatebrowsing clearing your recent history  - Always show the UI
-      *   - clear private data on exit - NEVER show the UI
-      */
-    var promptOnSanitize = !aOnExit;
-    // if promptOnSanitize is true we call Tabmix.Sanitizer.sanitize from Firefox Sanitizer
-    if (promptOnSanitize)
-      return false;
-
-    return Services.prefs.getBoolPref("privacy.clearOnShutdown.extensions-tabmix", false);
-  },
-
-  tryToSanitize(aOnExit) {
-    if (this.isSanitizeTMPwithoutPrompet(aOnExit)) {
-      this.sanitize();
-      return true;
-    }
-    return false;
-  },
-
-  // XXX need to add test if we fail to delete then alert the user or ....?
-  sanitize: function TMP_SN_sanitize() {
-    // get file references
-    var sessionFile = FileUtils.getDir("ProfD", []);
-    var sessionFileBackup = sessionFile.clone();
-    var sessionsBackupDir = sessionFile.clone();
-    sessionFile.append("session.rdf");
-    sessionFileBackup.append("session.old");
-    sessionsBackupDir.append("sessionbackups");
-
-    // remove the files from the disk
-    this.clearDisk(sessionFile);
-    this.clearDisk(sessionFileBackup);
-    this.clearDisk(sessionsBackupDir);
-
-    // init new DATASource for all open window
-    var enumerator = Tabmix.windowEnumerator();
-    while (enumerator.hasMoreElements()) {
-      let wnd = enumerator.getNext();
-
-      // clear DATASource
-      delete wnd.gBrowser.windowID;
-      let _sessionManager = wnd.TabmixSessionManager;
-      // Make sure to break session manager cycle with the save timer
-      if (_sessionManager._saveTimer) {
-        _sessionManager._saveTimer.cancel();
-        _sessionManager._saveTimer = null;
-      }
-
-      _sessionManager.corruptedFile = false;
-      _sessionManager.RDFService.UnregisterDataSource(_sessionManager.DATASource);
-      // init new DATASource
-      _sessionManager.initDATASource();
-
-      // disable closed window list button
-      wnd.Tabmix.setItem("tmp_closedwindows", "disabled", true);
-
-      // clear closed tabs and disable the button if we use TMP session manager and save close tabs
-      if ((TabmixSessionManager.enableManager || TabmixSessionManager.enableBackup) &&
-          TabmixSessionManager.saveClosedTabs) {
-        wnd.TMP_ClosedTabs.restoreTab(window, -1, "original");
-      }
-    }
-    // for the case Tabmix session manager is off
-    TabmixSessionManager.notifyClosedWindowsChanged();
-
-    // set flag for next start
-    Tabmix.prefs.setBoolPref("sessions.sanitized", true);
-    TabmixSvc.sm.sanitized = true;
-  },
-
-  clearDisk(aFile) {
-    if (aFile.exists()) {
-      try {
-        aFile.remove(aFile.isDirectory());
-      } catch (ex) {
-        Tabmix.assert(ex);
-      } // couldn't remove the file - what now?
-    }
-  }
-
-};
-
-TabmixSessionData = {
-  docShellItems: ["Images", "Subframes", "MetaRedirects", "Plugins", "Javascript"],
-  tabAttribute: ["protected", "locked"],
-
-  getTabProperties: function sData_getTabProperties(aTab, checkPref) {
-    if (typeof checkPref == "undefined") checkPref = false; // pref check is only for session manager
-    var tabProperties = "", temp;
-    for (var j = 0; j < this.tabAttribute.length; j++) {
-      temp = aTab.hasAttribute(this.tabAttribute[j]) ? aTab.getAttribute(this.tabAttribute[j]) : "false";
-      tabProperties += temp == "true" ? "1" : "0";
-    }
-    // if save.permissions is false we save all Permissions as on, so if we change this pref after session
-    // was saved, the session will load with Permissions as on.
-    if (checkPref && !Tabmix.prefs.getBoolPref("sessions.save.permissions")) {
-      tabProperties += "11111";
-    } else {
-      let disallow = Tabmix.docShellCapabilities.collect(aTab);
-      this.docShellItems.forEach(item => {
-        tabProperties += disallow.includes(item) ? "0" : "1";
-      });
-    }
-
-    // save fixed label data
-    if (aTab.hasAttribute("fixed-label")) {
-      temp = " fixed-label=" + encodeURI(aTab.getAttribute("fixed-label"));
-      temp += " label-uri=" + encodeURI(aTab.getAttribute("label-uri"));
-      tabProperties += temp;
-    }
-
-    // save reload data
-    if (aTab.getAttribute("reload-data")) {
-      tabProperties += " reload-data=" + encodeURI(aTab.getAttribute("reload-data"));
-    }
-
-    // TODO: add boolean flag when tabtile is from bookmark
-
-    // save faviconized attribute
-    if (aTab.getAttribute("faviconized") == "true") {
-      tabProperties += " faviconized=true";
-    }
-
-    if (aTab.pinned)
-      tabProperties += " pinned=true";
-    tabProperties += " hidden=" + aTab.hidden;
-
-    if ("colorfulTabs" in window) {
-      let colorfulTabs = window.colorfulTabs;
-      try {
-        let ctreadonly = colorfulTabs.clrSession.getTabValue(aTab, "ctreadonly");
-        if (ctreadonly)
-          tabProperties += " ctreadonly=" + ctreadonly;
-        let tabClr = colorfulTabs.clrSession.getTabValue(aTab, "tabClr");
-        if (tabClr)
-          tabProperties += " tabClr=" + encodeURI(tabClr);
-      } catch {}
-    }
-
-    tabProperties += TMP_extensionsCompatibility.treeStyleTab.getProperties(aTab);
-
-    return tabProperties;
-  },
-
-  getTabValue: function TMP_sData_getTabValue(tab, id, parse) {
-    var existingData = parse ? null : "";
-    try {
-      var tabData = SessionStore.getTabValue(tab, id);
-      if (tabData !== "" && tabData != "{}" && tabData != "null") {
-        if (parse)
-          existingData = JSON.parse(tabData);
-        else
-          existingData = tabData;
-      }
-    } catch (ex) {
-      Tabmix.assert(ex);
-    }
-
-    return existingData;
-  },
-
-  getWindowValue: function TMP_sData_getWindowValue(win, id, parse) {
-    var existingData = parse ? {} : "";
-    try {
-      var data = SessionStore.getWindowValue(win, id);
-      if (data) {
-        if (parse)
-          existingData = JSON.parse(data);
-        else
-          existingData = data;
-      }
-    } catch (ex) {
-      Tabmix.assert(ex);
-    }
-
-    return existingData;
-  },
-
-  /* ............... DEPRECATED ............... */
-
-  // treeStyleTab extension look for it
-  setTabProperties() { }
-};
-
-TabmixSessionManager = {
-  _rdfRoot: "rdf://tabmix",
-  NC_TM: {},
-  gSessionPath: ["", "", "", ""],
-  gThisWin: null,
-  gThisWinTabs: null,
-  gThisWinClosedtabs: null,
-  RDFService: null,
-  CONUtils: null,
-  DATASource: null,
-  IOService: null,
-  overwriteWindow: false,
-  saveThisWindow: true,
-  enableBackup: null,
-  enableManager: null,
-  enableSaveHistory: null,
-  saveClosedtabs: null,
-  corruptedFile: false,
-  afterTabSwap: false,
-  _inited: false,
-  windowClosed: false,
-  overrideHomepage: null,
-  waitForCallBack: false,
-  notifyObservers: false,
-
-  afterCrash: false,
-  lastSessionWasEmpty: false,
-
-  // private window functions
-  globalPrivateBrowsing: false,
-  firstNonPrivateWindow: false,
-
-  initializePrivateStateVars() {
-    this.globalPrivateBrowsing = PrivateBrowsingUtils.permanentPrivateBrowsing;
-    this.isPrivateWindow = this.isWindowPrivate(window);
-    this.firstNonPrivateWindow = TabmixSvc.sm.private && !this.isPrivateWindow;
-    if (this.firstNonPrivateWindow) {
-      // set this flag to false if user opens in a session at least one non-private window
-      TabmixSvc.sm.private = false;
-    }
-  },
-
-  get isPrivateSession() {
-    return this.globalPrivateBrowsing || TabmixSvc.sm.private;
-  },
-
-  isWindowPrivate(aWindow) {
-    return PrivateBrowsingUtils.isWindowPrivate(aWindow);
-  },
-
-  get _statesToRestore() {
-    return TabmixSvc.sm.statesToRestore;
-  },
-
-  get prefBranch() {
-    delete this.prefBranch;
-    return (this.prefBranch = Services.prefs.getBranch("extensions.tabmix.sessions."));
-  },
-
-  // need to disable session manager and do a complete rewrite
-  disableSessionManager: true,
-
-  // call by Tabmix.beforeDelayedStartup
-  init: function SM_init() {
-    if (this.initialized) {
-      return;
-    }
-    this.initialized = true;
-
-    let initializeSM = () => {
-      this._init();
-      if (this._inited && (this.waitForCallBack || TabmixSvc.sm.restoreCount == -1)) {
-        this._sendRestoreCompletedNotifications();
-      }
-      if (!this.waitForCallBack) {
-        this.restoreWindowArguments();
-      }
-    };
-
-    SessionStore.promiseInitialized
-        .then(() => TMP_TabView.init())
-        .then(initializeSM)
-        .then(() => Tabmix.sessionInitialized())
-        .catch(Tabmix.reportError);
-  },
-
-  _init: function SM__init() {
-    if (this.disableSessionManager || this._inited) {
-      return;
-    }
-    this._inited = true;
-
-    ChromeUtils.defineESModuleGetters(TabmixSessionManager, {
-      TabState: "resource:///modules/sessionstore/TabState.sys.mjs",
-      TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
-    });
-
-    // just in case Tabmix.tablib isn't init yet
-    // when Webmail Notifier extension installed and user have master password
-    // we can get here before the browser window is loaded
-    Tabmix.tablib.init();
-
-    var _afterTabduplicated = "_afterTabduplicated" in Tabmix && Tabmix._afterTabduplicated;
-    var isFirstWindow = (Tabmix.isFirstWindow || this.firstNonPrivateWindow) && !_afterTabduplicated;
-
-    this.enableManager = this.prefBranch.getBoolPref("manager") && !this.globalPrivateBrowsing;
-    this.enableBackup = this.prefBranch.getBoolPref("crashRecovery");
-    this.enableSaveHistory = this.prefBranch.getBoolPref("save.history");
-    this.saveClosedtabs = this.prefBranch.getBoolPref("save.closedtabs") &&
-                          Tabmix.prefs.getBoolPref("undoClose");
-    this._lastSaveTime = Date.now();
-
-    var sanitized = this.enableManager && TabmixSvc.sm.sanitized;
-    // check if we need to backup
-    if (Tabmix.isFirstWindowInSession && this.enableManager && !sanitized) {
-      try {
-        this.archiveSessions();
-      } catch (ex) {
-        Tabmix.assert(ex);
-      }
-    }
-
-    if (!this.DATASource)
-      this.initService();
-
-    let obs = Services.obs;
-    obs.addObserver(this, "quit-application-requested", true);
-    obs.addObserver(this, "browser-lastwindow-close-requested", true);
-    if (!isFirstWindow && this.enableBackup && this.canRestoreLastSession)
-      window.__SS_lastSessionWindowID = String(Date.now()) + Math.random();
-    obs.addObserver(this, "sessionstore-last-session-cleared", true);
-
-    if (this.isPrivateWindow) {
-      // disable saving or changing any data on the disk in private window
-      document.getElementById("tmp_contextmenu_ThisWindow").setAttribute("disabled", true);
-      document.getElementById("tmp_contextmenu_AllWindows").setAttribute("disabled", true);
-      document.getElementById("tmp_disableSave").setAttribute("disabled", true);
-    }
-
-    document.getElementById("tm-sm-bookmark").hidden = true;
-
-    // check if last session was crashed
-    let crashed, sm_status;
-    if (this.enableBackup) {
-      let path = this._rdfRoot + "/closedSession/thisSession";
-      sm_status = TabmixSvc.sm.status = this.getLiteralValue(path, "status");
-      crashed = TabmixSvc.sm.crashed = sm_status.includes("crash");
-    }
-
-    // If sessionStore restore the session after restart we do not need to do anything
-    // when all tabs are pinned, session restore add the home page on restart
-    // prepare history sessions
-    if (Tabmix.isFirstWindowInSession && !this.globalPrivateBrowsing &&
-        !sanitized && !Tabmix.isWindowAfterSessionRestore) {
-      if (this.enableManager || crashed) {
-        if (crashed)
-          this.prepareAfterCrash(sm_status);
-        this.prepareSavedSessions();
-      }
-    }
-
-    this.toggleRecentlyClosedWindowsButton();
-    if (this.isPrivateWindow) {
-      this.enableBackup = false;
-      this.updateSettings();
-      this.setLiteral(this.gThisWin, "dontLoad", "true");
-      this.setLiteral(this.gThisWin, "private", "true");
-    }
-
-    if (!this.isPrivateWindow && isFirstWindow) {
-      // if this isn't delete on exit, we know next time that firefox crash
-      this.prefBranch.setBoolPref("crashed", true); // we use this in setup.js;
-      Services.prefs.savePrefFile(null); // store the pref immediately
-      let path = this._rdfRoot + "/closedSession/thisSession";
-      this.setLiteral(path, "status", "crash");
-
-      // if we after sanitize, we have no data to restore
-      if (sanitized) {
-        this.prefBranch.clearUserPref("sanitized");
-        TabmixSvc.sm.sanitized = false;
-        this.loadHomePage();
-        this.saveStateDelayed();
-        return;
-      }
-
-      if (!this.enableManager && (!this.enableBackup || !crashed)) {
-        return;
-      }
-
-      if (Tabmix.isWindowAfterSessionRestore) {
-        setTimeout(() => this.onSessionRestored(), 0);
-      } else if (TabmixSvc.sm.crashed && this.enableBackup) {
-        this.openAfterCrash(TabmixSvc.sm.status);
-      } else if (this.enableManager) {
-        this.openFirstWindow(TabmixSvc.sm.crashed);
-      }
-
-      Tabmix.prefs.clearUserPref("warnAboutClosingTabs.timeout");
-    } else if (this.enableManager && "tabmixdata" in window) {
-      if (TabmixSvc.sm.windowToFocus) {
-        TabmixSvc.sm.windowToFocus.focus();
-      }
-      let {restoreID} = window.tabmixdata;
-      let state = this._statesToRestore[restoreID];
-      this.loadOneWindow(state, "windowopenedbytabmix");
-    } else if (this.enableManager && this.enableBackup && this.saveClosedtabs && TMP_ClosedTabs.count > 0) {
-      // sync rdf list with sessionstore closed tab after restart
-      // we need it when we delete/restore close tab
-      // we need this in case that more then one window where opened before restart
-      this.initSession(this.gSessionPath[0], this.gThisWin);
-      this.copyClosedTabsToRDF(this.gThisWin);
-    }
-    // initialize closed window list broadcaster
-    var status = this.isPrivateWindow ? isFirstWindow || this.isPrivateSession : Tabmix.isFirstWindowInSession;
-    var disabled = this.enableManager ? status || this.isClosedWindowsEmpty() :
-      SessionStore.getClosedWindowCount() === 0;
-    Tabmix.setItem("tmp_closedwindows", "disabled", disabled || null);
-
-    if (!this.isPrivateWindow)
-      this.saveStateDelayed();
-  },
-
-  // we call this function after session restored by sessionStore
-  onSessionRestored: function SM_onSessionRestored(aKeepClosedWindows) {
-    // sync rdf list with sessionstore closed tab after restart
-    // we need it when we delete/restore close tab
-    if (this.enableBackup && this.saveClosedtabs && TMP_ClosedTabs.count > 0) {
-      this.initSession(this.gSessionPath[0], this.gThisWin);
-      this.copyClosedTabsToRDF(this.gThisWin);
-    }
-
-    // we keep the old session after restart.
-    // just remove the restored session from close window list
-    var sessionContainer = this.initContainer(this.gSessionPath[0]);
-    if (!aKeepClosedWindows)
-      this.deleteWithProp(sessionContainer, "status", "saved");
-    // all the windows that opened by restart will save again with new windowID
-    // mark all current data with dontLoad flag
-    var rdfNodeThisWin = this.RDFService.GetResource(this.gThisWin);
-    var windowEnum = sessionContainer.GetElements();
-    while (windowEnum.hasMoreElements()) {
-      var rdfNodeWindow = windowEnum.getNext();
-      // skip this window....
-      if (rdfNodeThisWin != rdfNodeWindow) {
-        this.setLiteral(rdfNodeWindow, "dontLoad", "true");
-      }
-    }
-
-    if (window.toolbar.visible && gBrowser.isBlankNotBusyTab(gBrowser._selectedTab))
-      gURLBar.select();
-  },
-
-  // calls from: Tabmix.tablib.closeWindow, this.onWindowClose and this.canQuitApplication
-  deinit: function SM_deinit(aLastWindow, askBeforeSave, aPopUp) {
-    // When Exit Firefox:
-    //       pref "extensions.tabmix.sessions.onClose"
-    //       0 - Save
-    //       1 - Ask me before Save
-    //       2 (or else) - Don't Save
-    // we check this when last window is about to close for all other window the session is saved
-    // in closed window list.
-    // in the last window if the user pref in not to save we delete the closed window list.
-    var resultData = {canClose: true, showMorePrompt: true, saveSession: true, removeClosedTabs: false};
-    if (this.windowClosed || this.isPrivateSession ||
-        !this.enableManager && !this.enableBackup)
-      return resultData;
-
-    // we set aPopUp only in canQuitApplication
-    if (aPopUp === undefined)
-      aPopUp = !window.toolbar.visible;
-
-    this.lastSaveTabsCount = this.saveOnWindowClose();
-    if (!aLastWindow) {
-      if (!aPopUp && !this.isPrivateWindow) {
-        var thisWinSaveTime = this.getLiteralValue(this.gThisWin, "timestamp", 0);
-        this.setLiteral(this.gSessionPath[0], "timestamp", thisWinSaveTime);
-      }
-      return resultData;
-    }
-    // we are on the last window........
-
-    // we call Tabmix.Sanitizer.tryToSanitize from onWindowClose
-    // we don't need to show warnBeforeSaveSession dialog if we sanitize TMP without prompt on exit
-    if (Services.prefs.getBoolPref("privacy.sanitize.sanitizeOnShutdown") &&
-        Tabmix.Sanitizer.isSanitizeTMPwithoutPrompet(true))
-      return resultData;
-
-    if (this.enableManager) {
-      var result = {button: this.prefBranch.getIntPref("onClose"), checked: this.saveClosedtabs};
-      if (result.button == 1 && !askBeforeSave)
-        result.button = Tabmix.BUTTON_OK;
-      var sessionNotEmpty = this.updateClosedWindowList(aPopUp);
-      if (sessionNotEmpty && result.button == 1) { // Ask me before Save
-        // result:  0 - save; 1 - cancel quit; 2 - don't save
-        result = this.warnBeforeSaveSession();
-        resultData.showMorePrompt = false;
-        if (result.button == Tabmix.BUTTON_CANCEL) {
-          resultData.canClose = false;
-          return resultData;
-        }
-      }
-      resultData.saveSession = result.button == Tabmix.BUTTON_OK;
-      resultData.removeClosedTabs = this.saveClosedTabs && !result.checked;
-    }
-    return resultData;
-  },
-
-  saveOnWindowClose: function SM_saveOnWindowClose() {
-    if (!this.isPrivateWindow && this.enableManager && this.saveThisWindow) {
-      for (var i = 0; i < gBrowser.tabs.length; i++)
-        gBrowser.tabs[i].removeAttribute("inrestore");
-      return this.saveOneWindow(this.gSessionPath[0], "windowclosed");
-    }
-    return 0;
-  },
-
-  warnBeforeSaveSession: function SM_warnBeforeSaveSession() {
-    window.focus();
-    var title = TabmixSvc.getSMString("sm.askBeforeSave.title");
-    var msg = TabmixSvc.getSMString("sm.askBeforeSave.msg0");
-    // add remark - Only non-private windows will save
-    // when there is one private window or more..
-    if (BrowserWindowTracker.getTopWindow({private: true}))
-      msg += "\n" + TabmixSvc.getSMString("sm.askBeforeSave.msg2");
-    msg += "\n\n" + TabmixSvc.getSMString("sm.askBeforeSave.msg1");
-    var chkBoxLabel = TabmixSvc.getSMString("sm.saveClosedTab.chkbox.label");
-    var chkBoxState = this.saveClosedTabs ? Tabmix.CHECKBOX_CHECKED : Tabmix.HIDE_CHECKBOX;
-
-    var buttons = TabmixSvc.setLabel("sm.askBeforeSave.button0") + "\n" +
-        TabmixSvc.getDialogStrings("Cancel") + "\n" +
-        TabmixSvc.setLabel("sm.askBeforeSave.button1");
-    return Tabmix.promptService([Tabmix.BUTTON_OK, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
-      [title, msg, "", chkBoxLabel, buttons]);
-  },
-
-  windowIsClosing: function SM_WindowIsClosing(aCanClose, aLastWindow,
-                                               aSaveSession, aRemoveClosedTabs, aKeepClosedWindows) {
-    if (!this._inited) {
-      return;
-    }
-    if (this.isPrivateWindow) {
-      this.removeSession(this.gThisWin, this.gSessionPath[0]);
-    }
-
-    if (this.windowClosed || this.isPrivateSession)
-      return;
-
-    this.windowClosed = aCanClose;
-    var _flush = false;
-
-    // remove the "dontLoad" flag from current window if user cancel the close
-    if (this.enableManager && !aCanClose && this.removeAttribute(this.gThisWin, "dontLoad"))
-      _flush = true;
-
-    // update status flag for this window
-    // when enableManager is off lastSaveTabsCount is undefined
-    if (!aLastWindow && this.lastSaveTabsCount && aCanClose) {
-      this.setLiteral(this.gThisWin, "status", "saved");
-      this.updateClosedWindowsMenu(false);
-      _flush = true;
-    }
-
-    this.shutDown(aCanClose, aLastWindow, aSaveSession, aRemoveClosedTabs,
-      aKeepClosedWindows, _flush);
-  },
-
-  sessionShutDown: false,
-  shutDown(aCanClose, aLastWindow, aSaveSession, aRemoveClosedTabs,
-           aKeepClosedWindows, _flush) {
-    if (this.sessionShutDown || !this._inited) {
-      return;
-    }
-    if (aLastWindow && aCanClose) {
-      this.sessionShutDown = true;
-      if (this.enableManager) {
-        if (aSaveSession) {
-          var rdfNodeClosedWindows = this.RDFService.GetResource(this.gSessionPath[0]);
-          var sessionContainer = this.initContainer(rdfNodeClosedWindows);
-          if (!aKeepClosedWindows)
-            this.deleteWithProp(sessionContainer, "dontLoad");
-          var count = this.countWinsAndTabs(sessionContainer, "dontLoad");
-          this.setLiteral(rdfNodeClosedWindows, "nameExt", this.getNameData(count.win, count.tab));
-          // delete closed tab list for this session
-          if (aRemoveClosedTabs)
-            this.deleteAllClosedtabs(sessionContainer);
-        } else { // delete ALL closed window list.
-          this.deleteSubtree(this.gSessionPath[0]);
-        }
-      }
-      // clean-up....
-      if (this.enableBackup)
-        this.deleteSession(this.gSessionPath[3]);
-      Tabmix.prefs.clearUserPref("warnAboutClosingTabs.timeout");
-      this.prefBranch.clearUserPref("crashed"); // we use this in setup.js;
-      Services.prefs.savePrefFile(null); // store the pref immediately
-      this.setLiteral(this._rdfRoot + "/closedSession/thisSession", "status", "stopped");
-      if (!this.enableManager && !this.enableBackup)
-        this.deleteSession(this.gSessionPath[0]);
-      _flush = true;
-    }
-    if (_flush || this._saveTimer) {
-      // Make sure to break session manager cycle with the save timer
-      if (this._saveTimer) {
-        this._saveTimer.cancel();
-        this._saveTimer = null;
-      }
-      this.saveState();
-    }
-  },
-
-  // called from goQuitApplication when user apply File > Exit
-  // or when extensions (Mr Tech Toolkit) call goQuitApplication.
-  canQuitApplication: function SM_canQuitApplication(aBackup, aKeepClosedWindows) {
-    // some extension can call goQuitApplication 2nd time (like ToolKit)
-    // we make sure not to run this more the one time
-    if (this.windowClosed || this.isPrivateSession || !this._inited)
-      return true;
-    /*
-        1. save all windows
-        2. call deinit to the current window (if exist ??)
-        3. if user don't cancel the quit mark all windows as closed
-        4. return: true if its ok to close
-                   false if user cancel quit
-      */
-    let enabled = this.enableManager || this.enableBackup;
-    if (enabled)
-      this.saveAllWindows(this.gSessionPath[0], "windowclosed", true);
-    // check if all open windows are popup
-    var allPopups = enabled && !window.toolbar.visible;
-    var wnd, enumerator;
-    enumerator = Tabmix.windowEnumerator();
-    while (allPopups && enumerator.hasMoreElements()) {
-      wnd = enumerator.getNext();
-      allPopups = !wnd.toolbar.visible;
-    }
-    var result = this.deinit(true, !aBackup, allPopups); // we fake that we are the last window
-    this.windowIsClosing(result.canClose, true, result.saveSession, result.removeClosedTabs, aKeepClosedWindows);
-
-    if (result.canClose) {
-      enumerator = Tabmix.windowEnumerator();
-      while (enumerator.hasMoreElements()) {
-        wnd = enumerator.getNext();
-        wnd.TabmixSessionManager.windowClosed = true;
-      }
-    }
-    return result.canClose;
-  },
-
-  onWindowClose: function SM_onWindowClose(isLastWindow) {
-    // check if we need to sanitize on exit without prompt to user
-    var tabmixSanitized;
-    try {
-      tabmixSanitized = isLastWindow &&
-        Services.prefs.getBoolPref("privacy.sanitize.sanitizeOnShutdown") &&
-        Tabmix.Sanitizer.tryToSanitize(true);
-    } catch {
-      tabmixSanitized = false;
-    }
-    if (!tabmixSanitized && this._inited) {
-      this.deinit(isLastWindow, false);
-      this.windowIsClosing(true, isLastWindow, true, false);
-    }
-
-    if (this._inited) {
-      let obs = Services.obs;
-      obs.removeObserver(this, "quit-application-requested");
-      obs.removeObserver(this, "browser-lastwindow-close-requested");
-      obs.removeObserver(this, "sessionstore-last-session-cleared");
-    }
-    if ("tabmixdata" in window) {
-      let {restoreID} = window.tabmixdata;
-      delete this._statesToRestore[restoreID];
-      delete window.tabmixdata;
-    }
-    if (TabmixSvc.sm.windowToFocus && TabmixSvc.sm.windowToFocus == window) {
-      delete TabmixSvc.sm.windowToFocus;
-    }
-  },
-
-  // XXX split this for each pref that has change
-  // XXX need to update after permissions, locked......
-  updateSettings: function SM_updateSettings() {
-    // list of session manager pref
-    //          sessions.manager - ok
-    //          sessions.crashRecovery - ok
-    //          sessions.save.closedtabs - ok
-    //          sessions.save.history - ok
-    //          sessions.save.permissions - ok (update every time this function run because lock is change)
-    //          sessions.save.locked - ok (update every time this function run because lock is change)
-    //          sessions.save.protected - ok (update every time this function run because lock is change)
-    //          sessions.save.selectedtab - ok
-    // xxx      sessions.save.scrollposition - ok (update with history) // xxx need to divide it
-    //          undoClose -
-    //          browser.sessionstore.max_tabs_undo
-    //
-    var sessionManager = Tabmix.prefs.getBoolPref("sessions.manager") && !this.globalPrivateBrowsing;
-    var crashRecovery = Tabmix.prefs.getBoolPref("sessions.crashRecovery") && !this.isPrivateWindow;
-    var enableClosedtabs = Tabmix.prefs.getBoolPref("sessions.save.closedtabs");
-    var enableSaveHistory = Tabmix.prefs.getBoolPref("sessions.save.history");
-    var undoClose = Tabmix.prefs.getBoolPref("undoClose");
-
-    // hide or show session manager buttons & menus
-    document.getElementById("tm-sessionmanager").hidden =
-        !sessionManager || !Tabmix.prefs.getBoolPref("sessionToolsMenu");
-    let sm = document.getElementById("appmenu-sessionmanager");
-    if (sm)
-      sm.hidden = !sessionManager;
-    var hiddenPref = !sessionManager || !Tabmix.prefs.getBoolPref("closedWinToolsMenu");
-    document.getElementById("tm-sm-closedwindows").hidden = hiddenPref;
-    document.getElementById("tm-sessionmanager").firstChild.childNodes[2].hidden = !hiddenPref;
-
-    Tabmix.setItem("tmp_sessionmanagerButton", "disabled", !sessionManager || null);
-
-    // we dont need this function to run before sessionmanager init
-    if (!this.DATASource)
-      return;
-
-    var windowSaved = false, closedTabSaved = false;
-    if (this.enableBackup != crashRecovery) {
-      if (crashRecovery) { // save all open window and tab
-        this.saveAllWindows(this.gSessionPath[0], "windowbackup");
-        windowSaved = true;
-      } else { // remove all backup
-        this.deleteSession(this.gSessionPath[0], "status", "backup");
-        this.initSession(this.gSessionPath[0], this.gThisWin);
-        this.saveStateDelayed();
-      }
-      this.enableBackup = crashRecovery;
-    }
-    var winPath = this.gThisWin;
-    if (crashRecovery)
-      this.tabSelected(); // this is fast so we dont check if the pref is changed ( just for now)
-    if (this.enableManager != sessionManager) {
-      this.enableManager = sessionManager;
-    }
-    // changing in browser.sessionstore.max_tabs_undo or undoClose pref maintained in TMP_PrefObserver observe
-    if (this.saveClosedtabs != enableClosedtabs && undoClose) {
-      this.saveClosedtabs = enableClosedtabs && undoClose;
-      if (enableClosedtabs) {
-        // save if there are closed tabs and we save backup and save closedtab backup
-        if (crashRecovery && TMP_ClosedTabs.count > 0 && undoClose) {
-          this.initSession(this.gSessionPath[0], winPath);
-          this.copyClosedTabsToRDF(winPath);
-        }
-        closedTabSaved = true;
-      } else if (crashRecovery) {
-        // if undoClose = false we delete all in TMP_PrefObserver observe
-        if (undoClose) this.deleteWinClosedtabs(winPath); // flush only closedTabs list in session.RDF
-      }
-    }
-    if (this.enableSaveHistory != enableSaveHistory) {
-      this.enableSaveHistory = enableSaveHistory;
-      if (crashRecovery) {
-        if (!windowSaved) this.saveAllTab(winPath);
-        if (!closedTabSaved && enableClosedtabs && TMP_ClosedTabs.count > 0 && undoClose) {
-          this.initSession(this.gSessionPath[0], winPath);
-          this.deleteWinClosedtabs(winPath);
-          this.copyClosedTabsToRDF(winPath);
-          closedTabSaved = true;
-        }
-      }
-    }
-    if (closedTabSaved) {
-      this.initSession(this.gSessionPath[0], this.gThisWin);
-      this.saveStateDelayed();
-    }
-  },
-
-  restoreWindowArguments() {
-    if (this.overrideHomepage)
-      window.arguments[0] = this.overrideHomepage;
-    this.overrideHomepage = null;
-  },
-
-  loadHomePage: function SM_loadHomePage(addTab) {
-    function afterLoad(aBrowser) {
-      if (!gBrowser.isBlankBrowser(aBrowser))
-        aBrowser.focus();
-    }
-
-    if (this.overrideHomepage) {
-      let homePage = this.overrideHomepage;
-      let URIs = homePage.split("|");
-      this.setStripVisibility(URIs.length);
-      let browser = gBrowser.selectedBrowser;
-      if (homePage !== "") {
-        // This function throws for certain malformed URIs, so use exception handling
-        // so that we don't disrupt startup
-        try {
-          gBrowser.loadTabs(URIs, false, !addTab);
-        } catch {
-          afterLoad(gBrowser.selectedBrowser);
-        }
-      } else {
-        afterLoad(browser);
-      }
-      this.restoreWindowArguments();
-    } else if (gBrowser._selectedTab.loadOnStartup) {
-      for (var i = 0; i < gBrowser.tabs.length; i++)
-        delete gBrowser.tabs[i].loadOnStartup;
-    } else if (window.toolbar.visible &&
-               gBrowser.isBlankNotBusyTab(gBrowser._selectedTab)) {
-      gURLBar.select();
-    }
-  },
-
-  // init common services
-  initService() {
-    // bug 833098: Part 2 - Remove RDF service
-    // this.RDFService = Cc["@mozilla.org/rdf/rdf-service;1"]
-    //     .getService(Ci.nsIRDFService);
-    // this.CONUtils = Cc["@mozilla.org/rdf/container-utils;1"]
-    //     .getService(Ci.nsIRDFContainerUtils);
-    // this.initDATASource();
-  },
-
-  initDATASource: function SM_initDATASource() {
-    var file = this.profileDir;
-    file.append("session.rdf");
-    var uri = Services.io.newFileURI(file).spec;
-    try {
-      this.DATASource = this.RDFService.GetDataSourceBlocking(uri);
-    } catch (e) { // corrupted session.rdf
-      var title = TabmixSvc.getSMString("sm.corrupted.title");
-      var msg = TabmixSvc.getSMString("sm.corrupted.msg0") + "\n" +
-          TabmixSvc.getSMString("sm.corrupted.msg1");
-      var buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
-      this.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, Tabmix.HIDE_CHECKBOX],
-        [title, msg, "", "", buttons], window, () => {});
-      Tabmix.assert(e);
-      file.moveTo(this.profileDir, "session.old");
-      this.DATASource = this.RDFService.GetDataSourceBlocking(uri);
-      this.corruptedFile = true;
-    }
-
-    // set path to session type
-    var path = this._rdfRoot + "/closedSession/";
-    var sessionType = ["thisSession", "lastSession", "previoustolastSession", "crashedsession"];
-    var closedSession = this.initContainer(path);
-    var i, aEntry;
-    if (closedSession.GetCount() === 0) { // create the list
-      for (i = 0; i < sessionType.length; i++) {
-        aEntry = this.RDFService.GetResource(path + sessionType[i]);
-        this.setResource(aEntry, "session", this._rdfRoot + "/closed" + i + "/window");
-        closedSession.AppendElement(aEntry);
-      }
-    }
-    for (i = 0; i < sessionType.length; i++) {
-      this.gSessionPath[i] = this.getResourceValue(path + sessionType[i], "session");
-    }
-    if (typeof gBrowser == "object" && !gBrowser.windowID) {
-      gBrowser.windowID = this.getAnonymousId();
-      this.gThisWin = this.gSessionPath[0] + "/" + gBrowser.windowID;
-      this.gThisWinTabs = this.gThisWin + "/tabs";
-      this.gThisWinClosedtabs = this.gThisWin + "/closedtabs";
-    }
-  },
-
-  get profileDir() {
-    return FileUtils.getDir("ProfD", []);
-  },
-
-  getAnonymousId() {
-    const kSaltTable = [
-      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-      'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-      'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-      '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'];
-
-    var id = "";
-    for (var i = 0; i < 8; ++i) {
-      id += kSaltTable[Math.floor(Math.random() * kSaltTable.length)];
-    }
-    return id;
-  },
-
-  getNC(arc) {
-    if (arc in this.NC_TM)
-      return this.NC_TM[arc];
-    const NC_NS = "http://home.netscape.com/NC-rdf#";
-    return (this.NC_TM[arc] = this.RDFService.GetResource(NC_NS + arc));
-  },
-
-  deleteNode(rdfNode) {
-    var arcOut = this.DATASource.ArcLabelsOut(rdfNode);
-    while (arcOut.hasMoreElements()) {
-      var aLabel = arcOut.getNext();
-      if (aLabel instanceof Ci.nsIRDFResource) {
-        var aTarget = this.DATASource.GetTarget(rdfNode, aLabel, true);
-        this.DATASource.Unassert(rdfNode, aLabel, aTarget);
-      }
-    }
-  },
-
-  deleteSubtree(labelRoot) {
-    var allElements = this.DATASource.GetAllResources();
-    while (allElements.hasMoreElements()) {
-      var aResource = allElements.getNext();
-      if (aResource instanceof Ci.nsIRDFResource && aResource.Value.startsWith(labelRoot))
-        this.deleteNode(aResource);
-    }
-  },
-
-  initContainer(node) {
-    try {
-      if (typeof node == "string")
-        node = this.RDFService.GetResource(node);
-      return this.CONUtils.MakeSeq(this.DATASource, node);
-    } catch (e) {
-      Tabmix.assert(e);
-      return "error";
-    }
-  },
-
-  // return true if node is empty container or node is not container
-  containerEmpty(node) {
-    try {
-      if (typeof node == "string")
-        node = this.RDFService.GetResource(node);
-      if (!this.CONUtils.IsContainer(this.DATASource, node))
-        return true;
-      return this.CONUtils.IsEmpty(this.DATASource, node);
-    } catch (e) {
-      Tabmix.assert(e);
-      return "error";
-    }
-  },
-
-  wrapContainer: function SM_wrapContainer(path, prop) {
-    var root = this.getResource(path, prop);
-    var container = this.initContainer(root);
-    if (container == "error") {
-      Tabmix.log("wrapContainer error path " + path + "\nprop " + prop);
-      return "error";
-    }
-    return {
-      Root: root,
-      Container: container,
-      Enum: container.GetElements(),
-      Count: container.GetCount()
-    };
-  },
-
-  getValue(node, label, typeID, def) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    label = this.getNC(label);
-    var rdfNode = this.DATASource.GetTarget(node, label, true);
-    return rdfNode instanceof Ci[typeID] ? rdfNode.Value : def;
-  },
-
-  getLiteralValue(node, arc, def) {
-    if (typeof def == "undefined") def = "";
-    return this.getValue(node, arc, "nsIRDFLiteral", def);
-  },
-
-  /**
-   * The escape and unescape functions are deprecated we use encodeURI and decodeURI instead.
-   * we use this code only for the case that old escape string was left unused after
-   * unescape was removed.
-   */
-  getDecodedLiteralValue(node, key) {
-    let encodedString = node ? this.getLiteralValue(node, key) : key;
-    // in the past we use escape for encoding, we try first to decode with decodeURI
-    // only if we fail we use deprecated unescape
-    try {
-      return decodeURI(encodedString);
-    } catch {
-      let decodedString;
-      try {
-        // we defined lazy getter for _decode to import from Decode.sys.mjs module
-        decodedString = this._decode.unescape(encodedString);
-      } catch (er) {
-        let msg = "Tabmix is unable to decode " + key;
-        if (node)
-          msg += " from " + node.QueryInterface(Ci.nsIRDFResource).Value;
-        Tabmix.reportError(msg + "\n" + er);
-        return "";
-      }
-      if (node && key) {
-        this.setLiteral(node, key, encodeURI(decodedString));
-        this.saveStateDelayed(10000);
-      }
-      return decodedString;
-    }
-  },
-
-  getIntValue(node, arc, def) {
-    if (typeof def == "undefined") def = 0;
-    return this.getValue(node, arc, "nsIRDFInt", def);
-  },
-
-  getResourceValue(node, arc, def) {
-    if (typeof def == "undefined") def = null;
-    return this.getValue(node, arc, "nsIRDFResource", def);
-  },
-
-  getResource(node, arc) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    arc = this.getNC(arc);
-    return this.DATASource.GetTarget(node, arc, true);
-  },
-
-  nodeHasArc(node, arc) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    arc = this.getNC(arc);
-    return this.DATASource.hasArcOut(node, arc);
-  },
-
-  setLiteral: function SM_setLiteral(node, arc, value) {
-    if (typeof value == "undefined") {
-      this.removeAttribute(node, arc);
-      return;
-    }
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    arc = this.getNC(arc);
-    value = this.RDFService.GetLiteral(value);
-    this.changeValue(node, arc, value);
-  },
-
-  setIntLiteral(node, arc, value) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    arc = this.getNC(arc);
-    value = this.RDFService.GetIntLiteral(value);
-    this.changeValue(node, arc, value);
-  },
-
-  setResource(node, arc, value) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    arc = this.getNC(arc);
-    if (typeof value == "string") value = this.RDFService.GetResource(value);
-    this.changeValue(node, arc, value);
-  },
-
-  changeValue(node, arc, newValue) {
-    if (this.DATASource.hasArcOut(node, arc)) {
-      var oldValue = this.DATASource.GetTarget(node, arc, true);
-      if (newValue != oldValue) this.DATASource.Change(node, arc, oldValue, newValue);
-    } else this.DATASource.Assert(node, arc, newValue, true);
-  },
-
-  // use it only to remove node with literal value
-  removeAttribute(node, arc) {
-    if (typeof node == "string") node = this.RDFService.GetResource(node);
-    if (this.nodeHasArc(node, arc)) {
-      var value = this.getLiteralValue(node, arc);
-      this.DATASource.Unassert(node, this.getNC(arc), this.RDFService.GetLiteral(value));
-      return true;
-    }
-    return false; // arc not found
-  },
-
-  _saveTimer: null,
-  // time in milliseconds (Date.now()) when the session was last written to file
-  _lastSaveTime: 0,
-  // minimal interval between two save operations (in milliseconds)
-  _interval: 2000, // 10000
-  saveStateDelayed: function SM_saveStateDelayed(aDelay) {
-    if (this.windowClosed)
-      return;
-
-    if (!this._saveTimer) {
-      // interval until the next disk operation is allowed
-      var minimalDelay = this._lastSaveTime + this._interval - Date.now();
-
-      // if we have to wait, set a timer, otherwise saveState directly
-      aDelay = Math.max(minimalDelay, aDelay || 2000);
-      if (aDelay > 0) {
-        this._saveTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-        this._saveTimer.init(this, aDelay, Ci.nsITimer.TYPE_ONE_SHOT);
-      } else {
-        this.saveState();
-      }
-    }
-  },
-
-  QueryInterface: ChromeUtils.generateQI(["nsIObserver", "nsISupportsWeakReference"]),
-
-  closeProtectedTabs() {
-    var protectedTabs = gBrowser.tabContainer.getElementsByAttribute("protected", true);
-    for (var i = protectedTabs.length - 1; i >= 0; i--) {
-      var tab = protectedTabs[i];
-      tab.removeAttribute("protected");
-      this.removeTab(tab);
-    }
-  },
-
-  savedPrefs: {},
-  observe: function SM_observe(aSubject, aTopic) {
-    switch (aTopic) {
-      case "quit-application-requested":
-        // TabView
-        if (this.tabViewInstalled && TabView._window) {
-          if (TabView.isVisible())
-            this.setLiteral(this.gThisWin, "tabview-visibility", "true");
-          else
-            this.removeAttribute(this.gThisWin, "tabview-visibility");
-          this.saveStateDelayed();
-        }
-        /* falls through */
-      case "browser-lastwindow-close-requested":
-        this.savedPrefs["browser.startup.page"] = Services.prefs.getIntPref("browser.startup.page");
-        this.savedPrefs["browser.tabs.warnOnClose"] = Services.prefs.getBoolPref("browser.tabs.warnOnClose");
-        break;
-      case "timer-callback": // timer call back for delayed saving
-        this._saveTimer = null;
-        this.saveState();
-        break;
-      case "sessionstore-last-session-cleared":
-        TabmixSvc.sm.lastSessionPath = null;
-        break;
-    }
-  },
-
-  saveState: function SM_saveState() {
-    // if we're in private session, do nothing
-    if (this.isPrivateSession)
-      return;
-
-    try {
-      this.DATASource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
-      this._lastSaveTime = Date.now();
-    } catch {
-      if (this._interval < 10000) {
-        this._interval += 500;
-        this.saveStateDelayed();
-      }
-      Services.console.logStringMessage("TabMix :\nError when tabmix try to write to session.rdf file");
-    }
-  },
-
-  promptReplaceStartup(caller, path) {
-    var loadsession = this.prefBranch.getIntPref("onStart.loadsession");
-    var sessionpath = this.prefBranch.getCharPref("onStart.sessionpath");
-    var result = {button: Tabmix.NO_NEED_TO_REPLACE};
-    if (loadsession < 0 || sessionpath != path) return result;
-    var label = this.getDecodedLiteralValue(path, "name");
-    var selectionFlag = Tabmix.SELECT_DEFAULT;
-    var title, msg, buttons;
-    var areYouSure = TabmixSvc.getSMString("sm.areYouSure.msg");
-    var chooseStartup = TabmixSvc.getSMString("sm.canChooseStartup.msg");
-    switch (caller) {
-      case "addWinToSession":
-        title = TabmixSvc.getSMString("sm.addtoStartup.title");
-        var msgType = caller == "addWinToSession" ? "windows" : "tabs";
-        msg = TabmixSvc.getSMString("sm.addtoStartup.msg." + msgType) + "\n" +
-          label + "\n" + areYouSure + "\n\n" + chooseStartup;
-        buttons = [TabmixSvc.setLabel("sm.addtoStartup.button0"),
-          TabmixSvc.setLabel("sm.addtoStartup.button1")].join("\n");
-        break;
-      case "replaceSession":
-        title = TabmixSvc.getSMString("sm.replaceStartup.title");
-        msg = TabmixSvc.getSMString("sm.replaceStartup.msg") + "\n" +
-          label + "\n" + areYouSure + "\n\n" + chooseStartup;
-        buttons = [TabmixSvc.setLabel("sm.replaceStartup.button0"),
-          TabmixSvc.setLabel("sm.replaceStartup.button1")].join("\n");
-        break;
-      case "removeSavedSession":
-        title = TabmixSvc.getSMString("sm.removeStartup.title");
-        msg = TabmixSvc.getSMString("sm.removeStartup.msg0") + "\n" +
-          label + "\n" + areYouSure + "\n\n" + TabmixSvc.getSMString("sm.removeStartup.msg1");
-        buttons = [TabmixSvc.setLabel("sm.removeStartup.button0"),
-          TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
-        selectionFlag = Tabmix.SELECT_LASTSESSION;
-        break;
-    }
-    return Tabmix.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, Tabmix.HIDE_CHECKBOX, selectionFlag],
-      [title, msg, "", "", buttons]);
-  },
-
-  addWinToSession: function SM_addWinToSession(action, path) {
-    if (!this.isValidtoSave()) return;
-    var result = this.promptReplaceStartup("addWinToSession", path);
-    if (result.button == Tabmix.BUTTON_CANCEL) return;
-    else if (result.button == Tabmix.BUTTON_OK) this.replaceStartupPref(result, "");
-    var saveClosedTabs = this.saveClosedtabs;
-    var rdfNodeSession = this.RDFService.GetResource(path);
-    var sessionContainer = this.initContainer(rdfNodeSession);
-    var oldCount = this.countWinsAndTabs(sessionContainer);
-    var newCount = this.saveOneOrAll(action, path, saveClosedTabs);
-    if (newCount) {
-      var numTabs = oldCount.tab + newCount.tab;
-      var numWindows = oldCount.win + newCount.win;
-      this.setLiteral(rdfNodeSession, "nameExt", this.getNameData(numWindows, numTabs));
-      this.saveStateDelayed();
-    }
-  },
-
-  saveClosedSession: function SM_saveClosedSession(aTriggerNode) {
-    var oldPath = aTriggerNode.session;
-    var id = this.getAnonymousId();
-    var path = this._rdfRoot + "/saved/" + id + "/window";
-    var pathToReplace = "";
-    var session = aTriggerNode.name ||
-        this.getSessionName("saveprevious", this.getDecodedLiteralValue(oldPath, "name"));
-    if (session.button == Tabmix.BUTTON_CANCEL) return; // user cancel
-    else if (session.button == Tabmix.BUTTON_EXTRA1) {
-      // we replace exist session, Tabmix.BUTTON_OK - save new session
-      var result = this.promptReplaceStartup("replaceSession", session.path);
-      if (result.button == Tabmix.BUTTON_CANCEL) return; // user cancel
-      else if (result.button == Tabmix.BUTTON_OK) { // we replace startup session
-        this.replaceStartupPref(result, path);
-      }
-      pathToReplace = session.path;
-    }
-    let container = this.initContainer(path);
-    let node, isClosedWindow, extID = "";
-    if (aTriggerNode.parentNode) {
-      node = aTriggerNode.parentNode.parentNode;
-      isClosedWindow = node.id.startsWith("tm-sm-closedwindows") ||
-        node.id == "btn_closedwindows";
-      if (isClosedWindow) {
-        extID = "/" + id;
-      }
-    }
-    this.copySubtree(oldPath, path + extID);
-    if (isClosedWindow) {
-      node = this.RDFService.GetResource(path + extID);
-      container.InsertElementAt(node, 1, true);
-      this.DATASource.Unassert(node, this.getNC("dontLoad"), this.RDFService.GetLiteral("true"));
-    }
-    var count = this.countWinsAndTabs(container); // we need it just to fix the date
-    if (!session.saveClosedTabs)
-      this.deleteAllClosedtabs(container);
-    if (count) {
-      this.insertSession(count, session.name, path, pathToReplace, aTriggerNode.nameExt);
-    } else {
-      Tabmix.log("Error in saveClosedSession");
-    }
-  },
-
-  copyNode(oldNode, newNode, oldRoot, newRoot) {
-    var newTarget;
-    var arcOut = this.DATASource.ArcLabelsOut(oldNode);
-    while (arcOut.hasMoreElements()) {
-      var aLabel = arcOut.getNext();
-      if (aLabel instanceof Ci.nsIRDFResource) {
-        var aTarget = this.DATASource.GetTarget(oldNode, aLabel, true);
-        if (aTarget instanceof Ci.nsIRDFResource) {
-          newTarget = aTarget.Value.replace(oldRoot, newRoot);
-          aTarget = this.RDFService.GetResource(newTarget);
-        }
-        this.DATASource.Assert(newNode, aLabel, aTarget, true);
-      }
-    }
-  },
-
-  copySubtree(oldRoot, newRoot) {
-    var allElements = this.DATASource.GetAllResources();
-    while (allElements.hasMoreElements()) {
-      var aResource = allElements.getNext();
-      if (aResource instanceof Ci.nsIRDFResource && aResource.Value.startsWith(oldRoot)) {
-        var newNodeLabel = aResource.Value.replace(oldRoot, newRoot);
-        this.copyNode(aResource, this.RDFService.GetResource(newNodeLabel), oldRoot, newRoot);
-      }
-    }
-  },
-
-  replaceStartupPref(result, newPath) {
-    var sessionpath = !newPath ? "--" : this.prefBranch.getCharPref("onStart.sessionpath");
-    this.prefBranch.setIntPref("onStart.loadsession", result.value);
-    if (result.value > -1) {
-      if (result.label == sessionpath) this.prefBranch.setCharPref("onStart.sessionpath", newPath);
-      else this.prefBranch.setCharPref("onStart.sessionpath", result.label);
-    }
-    Services.prefs.savePrefFile(null); // store the pref immediately
-  },
-
-  sessionUtil(action, what, sessionPath) {
-    if (this.disableSessionManager) {
-      return;
-    }
-    // action = save , replace
-    // type = thiswindow , allwindows
-    if (Tabmix.isSingleBrowserWindow)
-      what = "thiswindow";
-    if (what == "thiswindow" && this.isPrivateWindow ||
-        !this.isValidtoSave())
-      return;
-    var oldPath = "", name, saveClosedTabs;
-    var id = this.getAnonymousId();
-    var newPath = this._rdfRoot + "/saved/" + id + "/window";
-    if (action == "save") {
-      // ask the user for new name or for exist name if the user want to replace
-      var session = this.getSessionName("save" + what);
-      if (session.button == Tabmix.BUTTON_CANCEL) return; // user cancel
-      else if (session.button == Tabmix.BUTTON_EXTRA1) oldPath = session.path;
-      name = session.name;
-      saveClosedTabs = session.saveClosedTabs;
-    } else {
-      oldPath = sessionPath;
-      name = this.getLiteralValue(oldPath, "name");
-      saveClosedTabs = this.saveClosedtabs;
-    }
-    if (oldPath !== "") { // oldPath is "" if we save to a new name
-      // check if the user want to replace startup session
-      var result = this.promptReplaceStartup("replaceSession", oldPath);
-      if (result.button == Tabmix.BUTTON_CANCEL) return; // user cancel
-      else if (result.button == Tabmix.BUTTON_OK) this.replaceStartupPref(result, newPath);
-    }
-    var count = this.saveOneOrAll("save" + what, newPath, saveClosedTabs);
-    if (count) this.insertSession(count, name, newPath, oldPath);
-    else Tabmix.log("Error in " + action + " " + what);
-  },
-
-  isValidtoSave() {
-    if (!this.enableManager) return false;
-    if (!this.isWindowValidtoSave()) {
-      var title = TabmixSvc.getSMString("sm.title");
-      var msg = TabmixSvc.getSMString("sm.dontSaveBlank.msg");
-      var buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
-      Tabmix.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT,
-        Tabmix.HIDE_CHECKBOX], [title, msg, "", "", buttons]);
-      return false;
-    }
-    return true;
-  },
-
-  isWindowValidtoSave() {
-    if (gBrowser.isBlankWindow())
-      return false;
-    return typeof privateTab != "object" ||
-      Array.prototype.some.call(gBrowser.tabs, tab => !window.privateTab.isTabPrivate(tab));
-  },
-
-  saveOneOrAll(action, path, saveClosedTabs) {
-    if (this.isPrivateWindow)
-      return false;
-    var numTabs, numWindows;
-    switch (action) {
-      case "savethiswindow":
-        numTabs = this.saveOneWindow(path, "", false, saveClosedTabs);
-        numWindows = 1;
-        break;
-      case "saveallwindows":
-        var didSaved = this.saveAllWindows(path, "", saveClosedTabs);
-        numTabs = didSaved.tab;
-        numWindows = didSaved.win;
-        break;
-      default: return false;
-    }
-    if (numTabs > 0) return {win: numWindows, tab: numTabs};
-    let msg = TabmixSvc.getSMString("sm.sessionSave.error");
-    let title = TabmixSvc.getSMString("sm.title");
-    Services.prompt.alert(window, title, msg);
-    return false;
-  },
-
-  insertSession: function SM_insertSession(count, name, path, oldPath, nameExt) {
-    var container = this.initContainer(this._rdfRoot + "/windows");
-    var index = 0;
-    if (oldPath !== "") index = container.IndexOf(this.RDFService.GetResource(oldPath));
-    var node = this.RDFService.GetResource(path);
-    container.InsertElementAt(node, index + 1, true);
-    if (oldPath !== "") { // remove the session we replace
-      container.RemoveElementAt(index, true);
-      this.removeSession(oldPath, this._rdfRoot + '/windows');
-    }
-    this.setLiteral(node, "name", name);
-    nameExt = nameExt || this.getNameData(count.win, count.tab);
-    this.setLiteral(node, "nameExt", nameExt);
-    this.saveStateDelayed();
-    return true;
-  },
-
-  getSessionName(action, old) {
-    var showCheckbox, closedtabMsg, saveClosedTabs = this.saveClosedtabs;
-    if (action != "rename" && saveClosedTabs) {
-      closedtabMsg = TabmixSvc.getSMString("sm.saveClosedTab.chkbox.label");
-      showCheckbox = Tabmix.CHECKBOX_CHECKED;
-    } else showCheckbox = Tabmix.HIDE_CHECKBOX;
-    var msg = TabmixSvc.getSMString("sm.sessionName.msg0") + "\n";
-    var title = TabmixSvc.getSMString("sm.sessionName.title." + action);
-    var label, buttons, actionFlag;
-    var sessionList = this.getSessionList("saved");
-    if (action == "rename") {
-      label = old;
-      buttons = [TabmixSvc.setLabel("sm.sessionName.button0"),
-        TabmixSvc.setLabel("sm.sessionName.button1")].join("\n");
-      actionFlag = Tabmix.DLG_RENAME;
-    } else {
-      label = action == "saveprevious" ? old : gBrowser._selectedTab.label;
-      buttons = [TabmixSvc.setLabel("sm.askBeforeSave.button0"),
-        TabmixSvc.setLabel("sm.askBeforeSave.button1"),
-        TabmixSvc.setLabel("sm.replaceStartup.button0") + "..."].join("\n");
-      actionFlag = Tabmix.DLG_SAVE;
-    }
-    label = label + "\n" + sessionList.list.join("\n");
-    var result = Tabmix.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_TEXTBOX, showCheckbox, actionFlag],
-      [title, msg, label, closedtabMsg, buttons]);
-    switch (result.button) {
-      case Tabmix.BUTTON_CANCEL: return {button: result.button};
-      case Tabmix.BUTTON_OK:
-      case Tabmix.BUTTON_EXTRA1:
-        var trimResult = result.label.replace(/^[\s]+/g, "").replace(/[\s]+$/g, "");
-        return {
-          button: result.button,
-          name: encodeURI(trimResult),
-          path: sessionList.path[result.value],
-          saveClosedTabs: result.checked
-        };
-    }
-    return {};
-  },
-
-  countWinsAndTabs: function SM_countWinsAndTabs(container, prop) {
-    // count windows and tabs in this session
-    var numTabs = 0, numWindows = 0;
-    var windowEnum = container.GetElements();
-    while (windowEnum.hasMoreElements()) {
-      var rdfNodeWindow = windowEnum.getNext();
-      let skip = prop && this.nodeHasArc(rdfNodeWindow, prop);
-      if (!skip) {
-        numWindows += 1;
-        var rdfNodeTabs = this.getResource(rdfNodeWindow, "tabs");
-        if (rdfNodeTabs instanceof Ci.nsIRDFResource) {
-          var tabContainer = this.initContainer(rdfNodeTabs);
-          numTabs += tabContainer.GetCount();
-        }
-      }
-    }
-    return {win: numWindows, tab: numTabs};
-  },
-
-  getNameData(numWindows, numTabs) {
-    var d = new Date();
-    var date = [d.getFullYear(), '/', d.getMonth() < 9 ? "0" : "",
-      d.getMonth() + 1, '/', d.getDate() < 10 ? "0" : "", d.getDate()].join('');
-    var time = [d.getHours() < 10 ? "0" : "", d.getHours(), ':',
-      d.getMinutes() < 10 ? "0" : "", d.getMinutes(), ':',
-      d.getSeconds() < 10 ? "0" : "", d.getSeconds()].join('');
-    var empty = TabmixSvc.getSMString("sm.session.empty");
-    var T = TabmixSvc.getSMString("sm.session.tabs");
-    var W = TabmixSvc.getSMString("sm.session.windows");
-    if (numWindows === 0) return ", (" + empty + ") (" + date + " " + time + ")";
-    else if (numWindows < 2) return ", (" + numTabs + " " + T + ") (" + date + " " + time + ")";
-    return ", (" + numWindows + " " + W + ", " + numTabs + " " + T + ") (" + date + " " + time + ")";
-  },
-
-  updateSessionMenu(menu) {
-    var triggerNode = menu.triggerNode;
-    if (typeof triggerNode.session == "undefined")
-      return false;
-
-    var overwriteWindows = this.prefBranch.getBoolPref("restore.overwritewindows") || Tabmix.singleWindowMode;
-    document.getElementById("tm-sm-OpenInCurrentWindow").setAttribute("default", overwriteWindows);
-    document.getElementById("tm-sm-OpenInNewWindow").setAttribute("default", !overwriteWindows);
-    document.getElementById("tm-sm-OpenInNewWindow").hidden = Tabmix.singleWindowMode;
-
-    var mValue = triggerNode.getAttribute("value");
-    if (mValue <= -1)
-      document.getElementById("tm-sm-Rename").setAttribute("disabled", true);
-    else
-      document.getElementById("tm-sm-Rename").removeAttribute("disabled");
-
-    var node = triggerNode.parentNode.parentNode;
-    var mItem = document.getElementById("tm-sm-SetAsStartup");
-    if (node.hasAttribute("sessionmanager-menu")) {
-      mItem.removeAttribute("disabled");
-      if (triggerNode.hasAttribute("default"))
-        mItem.setAttribute("checked", "true");
-      else
-        mItem.removeAttribute("checked");
-    } else {
-      mItem.removeAttribute("checked");
-      mItem.setAttribute("disabled", true);
-    }
-
-    var mShowext = document.getElementById("tm-sm-showext");
-    var showext = this.prefBranch.getBoolPref("menu.showext");
-    if (!showext && mShowext.hasAttribute("checked"))
-      mShowext.removeAttribute("checked");
-    else if (showext && !mShowext.hasAttribute("checked"))
-      mShowext.setAttribute("checked", "true");
-
-    var obsAll = document.getElementById("tmp_contextmenu_AllWindows");
-    var obsThis = document.getElementById("tmp_contextmenu_ThisWindow");
-    var mSave = document.getElementById("tm-sm-Save");
-    if (node.id.startsWith("tm-sm-closedwindows") || node.id == "btn_closedwindows" || mValue <= -1) {
-      if (obsAll.hidden !== true)
-        obsAll.hidden = true;
-      if (obsThis.hidden !== true)
-        obsThis.hidden = true;
-      if (mSave.hidden !== false)
-        mSave.hidden = false;
-      if (!this.isPrivateWindow) {
-        if (triggerNode.hasAttribute("disabled"))
-          mSave.setAttribute("disabled", true);
-        else
-          mSave.removeAttribute("disabled");
-      }
-    } else {
-      let isOneWindow = Tabmix.isSingleBrowserWindow;
-      if (obsAll.hidden != isOneWindow)
-        obsAll.hidden = isOneWindow;
-      if (obsThis.hidden !== false)
-        obsThis.hidden = false;
-      if (mSave.hidden !== true)
-        mSave.hidden = true;
-    }
-    return true;
-  },
-
-  restoreSession(node, overwriteWindows) {
-    if (!this.enableManager)
-      return;
-    // call restoreSession after delay to let the popup menu time to hide
-    window.setTimeout(() => {
-      this.delayRestoreSession(node, overwriteWindows);
-    }, 0);
-  },
-
-  delayRestoreSession(node, overwriteWindows) {
-    var path = node.session;
-    var command = node.command;
-    if (command == "loadSession")
-      this.loadSession(path, "sessionrestore", overwriteWindows);
-    else if (command == "openclosedwindow")
-      this.openclosedwindow(path, overwriteWindows);
-  },
-
-  setSessionAsStartup(popup) {
-    if (popup.getAttribute("checked")) {
-      let node = popup.parentNode.triggerNode;
-      var aValue = node.getAttribute("value"); // -1, -2 for for closed session, 1, 2.... for saved session
-      var loadsession = aValue && aValue <= -1 ? aValue : 0;
-      this.prefBranch.setIntPref("onStart.loadsession", loadsession);
-      if (loadsession > -1) {
-        this.prefBranch.setCharPref("onStart.sessionpath", node.session);
-      } else {
-        this.prefBranch.clearUserPref("onStart.sessionpath");
-      }
-      Services.prefs.savePrefFile(null); // store the pref immediately
-      this.updateMenuPopupContent(node.parentNode);
-    }
-  },
-
-  setShowNameExt(contextMenu) {
-    this.prefBranch.setBoolPref("menu.showext", !this.prefBranch.getBoolPref("menu.showext"));
-    Services.prefs.savePrefFile(null); // store the pref immediately
-    if (contextMenu) {
-      this.updateMenuPopupContent(contextMenu.triggerNode.parentNode);
-    }
-  },
-
-  renameSession: function SM_renameSession(thisSession) {
-    var node = this.RDFService.GetResource(thisSession);
-    var oldName = this.getDecodedLiteralValue(node, "name");
-    var result = this.getSessionName("rename", oldName);
-    if (result.button == Tabmix.BUTTON_OK) {
-      this.setLiteral(node, "name", result.name);
-      this.saveStateDelayed();
-    }
-  },
-
-  saveGuid(promise, oldGuid) {
-    promise.then(({guid}) => {
-      if (oldGuid != guid) {
-        this.setLiteral("rdf:backupSessionWithGroups", "guid", guid);
-        this.saveStateDelayed();
-      }
-    });
-  },
-
-  removeFromMenu(event, popup, root) {
-    if (!Tabmix.prefs.getBoolPref("middleclickDelete")) return;
-    if (event.button == 1 && "session" in event.target) {
-      this.removeSavedSession(event.target);
-      if (root == this.gSessionPath[0] && this.isClosedWindowsEmpty()) popup.hidePopup();
-      else this.createMenu(popup, root);
-    }
-  },
-
-  removeSavedSession(aMenuItem, aRemoveSession) {
-    var node = aMenuItem.parentNode.parentNode;
-    var path = aMenuItem.session;
-    if (aRemoveSession || node.hasAttribute("sessionmanager-menu")) {
-      // before we remove this session check if it is the startup session
-      // and let the user cancel the delete or choose different startup session
-      var result = this.promptReplaceStartup("removeSavedSession", path);
-      switch (result.button) {
-        case Tabmix.BUTTON_CANCEL:
-          return;
-        case Tabmix.BUTTON_OK:
-          this.replaceStartupPref(result, "");
-          /* falls through */
-        case Tabmix.NO_NEED_TO_REPLACE:
-          this.removeSession(path, this._rdfRoot + '/windows');
-      }
-    } else if (node.id.startsWith("tm-sm-closedwindows") || node.id == "btn_closedwindows") {
-      this.removeSession(path, this.gSessionPath[0]);
-      this.updateClosedWindowsMenu("check");
-    }
-    this.updateMenuPopupContent(aMenuItem.parentNode);
-  },
-
-  removeAllSavedSession: function SM_removeAllSavedSession(aMenuItem) {
-    var node = aMenuItem.parentNode.parentNode;
-    var result, title, msg;
-    var buttons = [TabmixSvc.setLabel("sm.removeStartup.button0"),
-      TabmixSvc.setLabel("sm.removeStartup.button1")].join("\n");
-    if (node.hasAttribute("sessionmanager-menu")) {
-      title = TabmixSvc.getSMString("sm.removeAll.title.session");
-      msg = TabmixSvc.getSMString("sm.removeAll.msg0") + "\n\n";
-      if (this.prefBranch.getIntPref("onStart.loadsession") > -1)
-        msg += TabmixSvc.getSMString("sm.removeAll.msg1");
-      result = Tabmix.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, Tabmix.HIDE_CHECKBOX],
-        [title, msg, "", "", buttons]);
-      if (result.button == Tabmix.BUTTON_OK) {
-        this.deleteSubtree(this.gSessionPath[1]);
-        this.deleteSubtree(this.gSessionPath[2]);
-        this.deleteSubtree(this.gSessionPath[3]);
-        this.deleteSubtree(this._rdfRoot + '/saved');
-        this.deleteSubtree(this._rdfRoot + '/windows');
-        this.saveStateDelayed();
-        this.prefBranch.setIntPref("onStart.loadsession", -1);
-        Services.prefs.savePrefFile(null); // store the pref immediately
-      }
-    } else if (node.id.startsWith("tm-sm-closedwindows") || node.id == "btn_closedwindows") {
-      title = TabmixSvc.getSMString("sm.removeAll.title.closedwindow");
-      msg = TabmixSvc.getSMString("sm.removeAll.msg2");
-      result = Tabmix.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, Tabmix.HIDE_CHECKBOX],
-        [title, msg, "", "", buttons]);
-      if (result.button == Tabmix.BUTTON_OK)
-        this.removeAllClosedWindows();
-    }
-  },
-
-  // xxx need to check if we need all this functions
-  removeSession: function SM_removeSession(value, container) {
-    if (!value)
-      return;
-    var node = this.RDFService.GetResource(value);
-    var rdfNodeWindows = this.RDFService.GetResource(container);
-    var windowsContainer = this.initContainer(rdfNodeWindows);
-    this.deleteSubtree(value);
-    windowsContainer.RemoveElement(node, true);
-    if (!windowsContainer.GetCount()) this.deleteNode(rdfNodeWindows);
-    this.saveStateDelayed();
-  },
-
-  removeAllClosedSession: function SM_removeAllClosedSession() {
-    for (var i = 0; i < this.gSessionPath.length; i++) {
-      var rdfNode = this.RDFService.GetResource(this.gSessionPath[i]);
-      var container = this.initContainer(rdfNode);
-      if (!this.containerEmpty(this.gSessionPath[i])) this.deleteWithProp(container);
-      if (!container.GetCount()) this.deleteNode(rdfNode);
-    }
-  },
-
-  removeAllClosedWindows() {
-    var currentSession = this.gSessionPath[0];
-    if (!this.containerEmpty(currentSession)) {
-      let sessionContainer = this.initContainer(currentSession);
-      this.deleteWithProp(sessionContainer, "status", "saved");
-      this.updateClosedWindowsMenu(true);
-      this.saveStateDelayed();
-    }
-  },
-
-  deleteSession: function SM_deleteSession(nodLabel, prop, value) {
-    // make sure that corrupted session.rdf don't stops the closing process
-    if (!nodLabel) {
-      return;
-    }
-    var rdfNode = this.RDFService.GetResource(nodLabel);
-    var container = this.initContainer(rdfNode);
-    if (!this.containerEmpty(nodLabel)) this.deleteWithProp(container, prop, value);
-    if (!container.GetCount()) this.deleteNode(rdfNode);
-  },
-
-  deleteWithProp(container, prop, value) {
-    var containerEnum = container.GetElements();
-    var nodeToDelete = [];
-    var noProp = typeof prop == "undefined";
-    var valueExist = typeof value == "string";
-    while (containerEnum.hasMoreElements()) {
-      var node = containerEnum.getNext();
-      var propExist = noProp ? true : this.nodeHasArc(node, prop);
-      if (valueExist && !noProp && propExist && this.getLiteralValue(node, prop) != value) propExist = false;
-      if (propExist) nodeToDelete.push(node);
-    }
-    this.deleteArrayNodes(container, nodeToDelete, true);
-  },
-
-  deleteArrayNodes(container, nodeToDelete, deleteSubTree) {
-    for (var i = 0; i < nodeToDelete.length; i++) {
-      var nodeValue = nodeToDelete[i].QueryInterface(Ci.nsIRDFResource).Value;
-      if (deleteSubTree) this.deleteSubtree(nodeValue);
-      container.RemoveElement(nodeToDelete[i], true);
-    }
-  },
-
-  destroyMenuItems(menu, aRemoveAllItems) {
-    // Destroy the items.
-    var destroy = aRemoveAllItems || false, endSeparator;
-    for (var i = 0; i < menu.childNodes.length; i++) {
-      var item = menu.childNodes[i];
-      if (item.id.includes("-endSeparator")) {
-        endSeparator = item;
-        if (!menu.parentNode.hasAttribute("sessionmanager-menu") &&
-            menu.parentNode.getAttribute("anonid") != "delete")
-          break;
-      } else if (destroy) {
-        i--;
-        item.remove();
-      } else if (item.id.includes("-startSeparator")) destroy = true;
-    }
-    return endSeparator;
-  },
-
-  clonePopupMenu: function SM_clonePopupMenu(menu) {
-    if (menu.initialized)
-      return;
-    menu.initialized = true;
-    var popup_menu = document.getElementById("tm-sessionmanager_menu").cloneNode(true);
-    popup_menu.id = menu.id + "_menu";
-    menu.appendChild(popup_menu);
-    popup_menu.childNodes[2].hidden = false;
-    this.createMenu(popup_menu, this._rdfRoot + '/windows');
-  },
-
-  createMenuForDialog(popup, contents) {
-    if (this.disableSessionManager) return;
-    if (contents == Tabmix.SHOW_CLOSED_WINDOW_LIST) {
-      // create closed window list popup menu
-      this.createMenu(popup, window.opener.this.gSessionPath[0], contents);
-    } else {
-      // create saved Session popup menu
-      this.createMenu(popup, this._rdfRoot + '/windows', contents);
-      // check if sessionpath and loadsessions valid for saved session
-      var loadsession = this.prefBranch.getIntPref("onStart.loadsession");
-      if (loadsession > -1 && contents != 1 && loadsession != popup.parentNode.sessionIndex) {
-        this.prefBranch.setIntPref("onStart.loadsession", popup.parentNode.sessionIndex);
-        var pref = "onStart.sessionpath";
-        if (popup.parentNode.sessionIndex < 0)
-          this.prefBranch.clearUserPref(pref);
-      }
-    }
-  },
-
-  updateMenuPopupContent(popupMenu) {
-    const update = popup => {
-      if (!popup.parentNode.open) {
-        return;
-      }
-      const [container, contents, aNoSeparators] = popup.tabmixArgs || [];
-      this.createMenu(popup, container, contents, aNoSeparators);
-    };
-    update(popupMenu);
-    const anonid = popupMenu.parentNode.getAttribute("anonid");
-    if (anonid == "delete" || anonid == "rename") {
-      update(popupMenu.parentNode.parentNode);
-    }
-  },
-
-  createMenu: function SM_createMenu(popup, container, contents, aNoSeparators) {
-    popup.tabmixArgs = [container, contents, aNoSeparators];
-    if (popup.id == "btn_closedwindows_menu") {
-      let contextmenu = !this.enableManager ? "tm_undocloseWindowContextMenu" : "tm_sessionmanagerContextMenu";
-      document.getElementById("btn_closedwindows_menu").setAttribute("context", contextmenu);
-      if (!this.enableManager) {
-        HistoryMenu.prototype.populateUndoWindowSubmenu('Tabmix', "btn_closedwindows");
-        return;
-      }
-    }
-
-    if (!this.DATASource) this.initService(); // initService if we call from pref dialog
-    if (typeof contents == "undefined") contents = 0;
-    var endSeparator = this.destroyMenuItems(popup, aNoSeparators); // Remove any existing menu items
-    var parentId = popup.parentNode.id;
-    if (parentId == "btn_sessionmanager" || parentId == "btn_closedwindows")
-      popup.parentNode.removeAttribute("tooltiptext");
-    var sessionmanagerMenu = popup.parentNode.hasAttribute("sessionmanager-menu");
-    var parentID, menuCommand, keepMenuOpen;
-    if (sessionmanagerMenu) {
-      parentID = "sessionmanagerMenu";
-      menuCommand = "loadSession";
-    } else if (popup.parentNode.getAttribute("anonid") == "delete") {
-      parentID = "tm_prompt";
-      keepMenuOpen = true;
-    } else if (contents != Tabmix.SHOW_CLOSED_WINDOW_LIST) {
-      parentID = popup.parentNode.id;
-    }
-    var onClosedWindowsList = parentId.startsWith("tm-sm-closedwindows") || parentId == "btn_closedwindows";
-    if (onClosedWindowsList)
-      menuCommand = "openclosedwindow";
-
-    var aContainer = this.initContainer(container);
-    var containerEnum = aContainer.GetElements();
-    var mi, node, name, nameExt, accessKey, index, nodes = [];
-    var showNameExt = this.prefBranch.getBoolPref("menu.showext");
-    var loadsession = this.prefBranch.getIntPref("onStart.loadsession");
-    var sessionpath = this.prefBranch.getCharPref("onStart.sessionpath");
-    var showTooltip = sessionmanagerMenu || onClosedWindowsList;
-    var closedWinList = parentId.includes("closedwindows");
-    while (containerEnum.hasMoreElements()) {
-      node = containerEnum.getNext();
-      let skipNode = this.nodeHasArc(node, "private") ||
-          this.nodeHasArc(node, "status") &&
-          this.getLiteralValue(node, "status") != "saved";
-      if (!skipNode) {
-        nodes.push(node);
-      }
-    }
-    var count = nodes.length;
-    let restoreSession = event => {
-      this.restoreSession(event.originalTarget);
-      event.stopPropagation();
-    };
-
-    let backups = [TabmixSvc.getSMString("sm.tabview.backup.session"),
-      TabmixSvc.getSMString("sm.tabview.backup.crashed")];
-    for (let i = 0; i < count; i++) {
-      node = nodes[i];
-      name = this.getDecodedLiteralValue(node, "name");
-      nameExt = this.getLiteralValue(node, "nameExt");
-      // Insert a menu item for session in the container
-      mi = document.createElement("menuitem");
-      mi.setAttribute("closemenu", keepMenuOpen ? "none" : "auto");
-      mi.session = node.QueryInterface(Ci.nsIRDFResource).Value;
-      mi.command = menuCommand;
-      mi.setAttribute("session", mi.session);
-      if (backups.indexOf(name) > -1) {
-        mi.style.setProperty("color", "blue", "important");
-        mi.history = true;
-      }
-      if (contents != 1 || loadsession < 0 || mi.session != sessionpath) {
-        mi.setAttribute("value", i);
-        // Ubuntu global menu prevents Session manager menu from working from Tools menu
-        // this hack is only for left click, middle click and right click still not working
-        if (TabmixSvc.isLinux && parentId == "tm-sessionmanager")
-          mi.addEventListener("command", restoreSession);
-        mi.value = i;
-        if (parentID != "onStart.loadsession") {
-          index = closedWinList ? count - 1 - i : i;
-          accessKey = index > 25 ? "" : String.fromCharCode(65 + index) + "  ";
-          mi.setAttribute("accesskey", accessKey);
-          mi.setAttribute("label", accessKey + name + (showNameExt ? nameExt : ""));
-          if (showTooltip) mi.setAttribute("tooltiptext", accessKey + name + nameExt);
-        } else {
-          mi.setAttribute("label", name);
-        }
-        popup.insertBefore(mi, closedWinList ? popup.childNodes[1] : endSeparator);
-      }
-    }
-    var allEmpty = true;
-    switch (parentID) {
-      case "sessionmanagerMenu":
-        var observer = document.getElementById("tmp_menu_AllWindows");
-        var isOneWindow = Tabmix.isSingleBrowserWindow;
-        if (observer.hidden != isOneWindow) observer.hidden = isOneWindow;
-        /* falls through */
-      case "tm_prompt":
-        endSeparator.hidden = endSeparator.previousSibling.localName == "menuseparator";
-        var sessionLabel;
-        var afterCrash = !this.containerEmpty(this.gSessionPath[3]);
-        // if Crashed is empty don't show 'Crashed Session' menu item
-        if (afterCrash && contents != 1)
-          sessionLabel = ["lastgood 1", "previous 2", "crashed 3"];
-        else
-          sessionLabel = ["last 1", "previous 2"];
-
-        var menu;
-        var empty = ", (" + TabmixSvc.getSMString("sm.session.empty") + ")";
-        for (let i = 0; i < sessionLabel.length; i++) {
-          menu = document.createElement("menuitem");
-          menu.setAttribute("closemenu", keepMenuOpen ? "none" : "auto");
-          var [sLabel, sessionIndex] = sessionLabel[i].split(" ");
-          menu.session = this.gSessionPath[sessionIndex];
-          menu.history = true;
-          menu.command = menuCommand;
-          if (this.containerEmpty(menu.session) && contents != 1)
-            menu.setAttribute("disabled", "true");
-          else
-            allEmpty = false;
-          nameExt = this.getLiteralValue(menu.session, "nameExt", empty);
-          sLabel = TabmixSvc.getSMString("sm.sessionMenu." + sLabel);
-          menu.setAttribute("label", sLabel + (showNameExt && contents != 1 ? nameExt : ""));
-          if (showTooltip) menu.setAttribute("tooltiptext", sLabel + nameExt);
-          menu.setAttribute("value", -1 - i);
-          if (TabmixSvc.isLinux && parentId == "tm-sessionmanager")
-            menu.addEventListener("command", restoreSession);
-          popup.appendChild(menu);
-        }
-        if (afterCrash && contents != 1) { // add separator before Crashed menu item
-          menu = document.createElement("menuseparator");
-          popup.insertBefore(menu, popup.lastChild);
-        }
-        if (contents == 1) loadsession = -1; // set "Last Session" as default in the list
-        this.setDefaultIndex(popup, loadsession, sessionpath);
-        break;
-      case "onStart.loadsession":
-        endSeparator.hidden = this.containerEmpty(container);
-        this.setDefaultIndex(popup, loadsession, sessionpath);
-        break;
-      default:
-        this.setDefaultIndex(popup, loadsession, sessionpath);
-        if (endSeparator)
-          endSeparator.hidden = true;
-        break;
-    }
-    var rename = popup.getElementsByAttribute("anonid", "rename")[0];
-    if (rename)
-      Tabmix.setItem(rename, "disabled", count === 0 ? true : null);
-    var deleteItem = popup.getElementsByAttribute("anonid", "delete")[0];
-    if (deleteItem)
-      Tabmix.setItem(deleteItem, "disabled", allEmpty && count === 0 ? true : null);
-  },
-
-  // set defaultIndex, sessionIndex and default Attribute
-  setDefaultIndex(popup, loadsession, sessionpath) {
-    popup.parentNode.defaultIndex = -1; // index with menuseparator
-    popup.parentNode.sessionIndex = -1; // index without menuseparator
-    var i, item, value, checked;
-    for (i = 0; i < popup.childNodes.length; i++) {
-      item = popup.childNodes[i];
-      if (item.localName != "menuseparator") {
-        value = item.getAttribute("value");
-        checked = loadsession > -1 && item.session && item.session == sessionpath ||
-                   loadsession <= -1 && value && value == loadsession;
-        if (checked) {
-          item.setAttribute("default", "true");
-          popup.parentNode.defaultIndex = i;
-          popup.parentNode.sessionIndex = value;
-        } else item.removeAttribute("default");
-      }
-    }
-  },
-
-  // update disable/enable to closed window list in tool menu and toolbar
-  updateClosedWindowsMenu(action) {
-    var disabled = action == "check" ? this.isClosedWindowsEmpty() : action;
-    var wnd, enumerator = Tabmix.windowEnumerator();
-    while (enumerator.hasMoreElements()) {
-      wnd = enumerator.getNext();
-      wnd.Tabmix.setItem("tmp_closedwindows", "disabled", disabled || null);
-    }
-  },
-
-  isClosedWindowsEmpty: function SM_isClosedWindowsEmpty() {
-    var node, disabled = true;
-    var aContainer = this.initContainer(this.gSessionPath[0]);
-    var containerEnum = aContainer.GetElements();
-    while (containerEnum.hasMoreElements()) {
-      node = containerEnum.getNext();
-      if (this.getLiteralValue(node, "status") == "saved") {
-        disabled = false;
-        break;
-      }
-    }
-    return disabled;
-  },
-
-  // call by init on first window load after crash
-  prepareAfterCrash: function SM_preparAfterCrash(status) {
-    var sessionContainer = this.initContainer(this.gSessionPath[0]);
-    if (this.enableBackup) {
-      var path = this._rdfRoot + "/closedSession/thisSession";
-      this.setLiteral(path, "status", "crash2");
-      if (status != "crash2") {
-        // restore to were we was before the crash
-        let crashedContainer = this.initContainer(this.gSessionPath[3]);
-        // delete old crash data
-        if (!this.containerEmpty(this.gSessionPath[3]))
-          this.deleteWithProp(crashedContainer);
-        var windowEnum = sessionContainer.GetElements();
-        var nodeToDelete = [];
-        while (windowEnum.hasMoreElements()) {
-          var rdfNodeWindow = windowEnum.getNext();
-          if (this.getLiteralValue(rdfNodeWindow, "status") == "backup") {
-            var tabs = this.getResource(rdfNodeWindow, "tabs");
-            var subTree = rdfNodeWindow.QueryInterface(Ci.nsIRDFResource).Value;
-            if (!this.containerEmpty(tabs)) { // copy "backup" subtree to crashed session if it not empty
-              var newSubTree = subTree.replace(this.gSessionPath[0], this.gSessionPath[3]);
-              this.copySubtree(subTree, newSubTree);
-              crashedContainer.AppendElement(this.RDFService.GetResource(newSubTree));
-            }
-            this.deleteSubtree(subTree); // delete the crashed subtree
-            nodeToDelete.push(rdfNodeWindow);// remove the window from the crash session
-          } else
-            // we can see this session in the close window list
-            this.setLiteral(rdfNodeWindow, "dontLoad", "true");
-        }
-        this.deleteArrayNodes(sessionContainer, nodeToDelete, false);
-        let count = this.countWinsAndTabs(crashedContainer);
-        this.setLiteral(this.gSessionPath[3], "nameExt", this.getNameData(count.win, count.tab));
-      } else if (!this.containerEmpty(this.gSessionPath[0])) {
-        // if firefox was crashed in middle of crash Recovery try again to
-        // restore the same data
-        this.deleteWithProp(sessionContainer);
-      }
-    } else if (!this.containerEmpty(this.gSessionPath[0])) {
-      // crash recovery is off, delete any remains from the crashed session
-      this.deleteWithProp(sessionContainer);
-    }
-  },
-
-  openAfterCrash: function SM_openAfterCrash(status) {
-    this.afterCrash = true;
-    var title = TabmixSvc.getSMString("sm.afterCrash.title");
-    var msg;
-    if (status != "crash2")
-      msg = TabmixSvc.getSMString("sm.afterCrash.msg0");
-    else
-      msg = TabmixSvc.getSMString("sm.afterCrash.msg0.again");
-    var chkBoxLabel = !this.enableManager ? TabmixSvc.getSMString("sm.afterCrash.chkbox.label") : "";
-    var buttons;
-    var chkBoxState = !this.enableManager ? Tabmix.CHECKBOX_UNCHECKED : Tabmix.HIDE_CHECKBOX;
-    var closedWinList = this.initContainer(this.gSessionPath[0]).GetCount();
-    var lastSession = this.containerEmpty(this.gSessionPath[1]); // last session
-    var prevtoLast = this.containerEmpty(this.gSessionPath[2]); // previous to last
-    var savedSession = this.containerEmpty(this._rdfRoot + '/windows'); // saved session
-    var isAllEmpty = lastSession && prevtoLast && savedSession;
-    var callBack = aResult => {
-      this.afterCrashPromptCallBack(aResult);
-    };
-    this.callBackData = {label: null, whatToLoad: "session"};
-    this.waitForCallBack = true;
-    if (!this.containerEmpty(this.gSessionPath[3])) { // if Crashed Session is not empty
-      if (!this.nodeHasArc(this.gSessionPath[3], "nameExt")) {
-        let crashedContainer = this.initContainer(this.gSessionPath[3]);
-        let count = this.countWinsAndTabs(crashedContainer);
-        this.setLiteral(this.gSessionPath[3], "nameExt", this.getNameData(count.win, count.tab));
-      }
-      if (this.enableManager && !isAllEmpty) {
-        msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg1");
-        buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
-          TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
-        this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, Tabmix.HIDE_CHECKBOX, Tabmix.SELECT_CRASH],
-          [title, msg, "", "", buttons], window, callBack);
-      } else {
-        msg += " " + TabmixSvc.getSMString("sm.afterCrash.msg2") + ".....";
-        if (!this.enableManager)
-          msg += "\n" + TabmixSvc.getSMString("sm.afterCrash.msg3");
-        else
-          msg += "\n" + TabmixSvc.getSMString("sm.afterCrash.msg4");
-        buttons = [TabmixSvc.setLabel("sm.afterCrash.button0.crashed"),
-          TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
-        this.promptService([Tabmix.BUTTON_OK, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
-          [title, msg, "", chkBoxLabel, buttons], window, callBack);
-        this.callBackData.label = this.gSessionPath[3];
-      }
-    } else if (this.enableManager && !isAllEmpty) {
-      msg += " " + TabmixSvc.getSMString("sm.afterCrash.msg5") + "\n\n" +
-        TabmixSvc.getSMString("sm.afterCrash.msg1");
-      buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
-        TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
-      this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, Tabmix.HIDE_CHECKBOX, Tabmix.SELECT_DEFAULT],
-        [title, msg, "", "", buttons], window, callBack);
-    } else if (closedWinList !== 0) {
-      msg += " " + TabmixSvc.getSMString("sm.afterCrash.msg6");
-      if (!this.enableManager)
-        msg += "\n" + TabmixSvc.getSMString("sm.afterCrash.msg3") + "\n\n" +
-          TabmixSvc.getSMString("sm.afterCrash.msg7") + ":";
-      else
-        msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg7") + " " +
-          TabmixSvc.getSMString("sm.afterCrash.msg8") + ":";
-      buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
-        TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
-      this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, chkBoxState, Tabmix.SHOW_CLOSED_WINDOW_LIST],
-        [title, msg, "", chkBoxLabel, buttons], window, callBack);
-      this.callBackData.whatToLoad = "closedwindow";
-    } else {// nothing to restore
-      msg = TabmixSvc.getSMString("sm.afterCrash.msg9") + "\n" + TabmixSvc.getSMString("sm.afterCrash.msg10");
-      if (!this.enableManager)
-        msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg3");
-      buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
-      this.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
-        [title, msg, "", chkBoxLabel, buttons], window, callBack);
-    }
-  },
-
-  afterCrashPromptCallBack: function SM_afterCrashPromptCallBack(aResult) {
-    this.waitForCallBack = false;
-    if (this.callBackData.label)
-      aResult.label = this.callBackData.label;
-    if (aResult.checked && !this.enableManager) {
-      this.prefBranch.setBoolPref("manager", true); // enable session manager
-      try {
-        Services.prefs.savePrefFile(null); // store the pref immediately
-      } catch {}
-    }
-    if (aResult.button == Tabmix.BUTTON_OK) {
-      switch (this.callBackData.whatToLoad) {
-        case "session": this.loadSession(aResult.label, "firstwindowopen");
-          break;
-        case "closedwindow": this.openclosedwindow(aResult.label, true);
-          break;
-        default:
-      }
-    } else
-      this.deferredRestore(true);
-    this.saveStateDelayed();
-    delete this.callBackData;
-
-    this.restoreWindowArguments();
-  },
-
-  prepareSavedSessions: function SM_prepareSavedSessions() {
-    // make sure we delete closed windows
-    this.deleteWithProp(this.initContainer(this.gSessionPath[0]), "dontLoad");
-
-    // don't remove oldest session if last session was empty
-    if (this.containerEmpty(this.gSessionPath[0])) {
-      this.lastSessionWasEmpty = true;
-      return;
-    }
-
-    var path = this._rdfRoot + "/closedSession/";
-    var sessionType = ["thisSession", "lastSession", "previoustolastSession", "crashedsession"];
-    // swap 0 --> 1 --> 2 --> 0
-    var i;
-    var sessions = [], subTree, aSession;
-    for (i = 0; i < sessionType.length - 1; i++) {
-      sessions.push(this.getResource(path + sessionType[i], "session"));
-    }
-    for (i = 0; i < sessionType.length - 1; i++) {
-      if (i === 0) { // delete oldest session subtree
-        aSession = sessions[sessionType.length - 2];
-        subTree = aSession.QueryInterface(Ci.nsIRDFResource).Value;
-        this.deleteSubtree(subTree);
-      } else aSession = sessions[i - 1];
-      this.setResource(path + sessionType[i], "session", aSession);
-    }
-    for (i = 0; i < sessionType.length; i++) {
-      this.gSessionPath[i] = this.getResourceValue(path + sessionType[i], "session");
-    }
-    this.gThisWin = this.gSessionPath[0] + "/" + gBrowser.windowID;
-    this.gThisWinTabs = this.gThisWin + "/tabs";
-    this.gThisWinClosedtabs = this.gThisWin + "/closedtabs";
-  },
-
-  openFirstWindow: function SM_openFirstWindow(afterCrash) {
-    // When Firefox Starts:
-    //       pref "onStart"
-    //       0 - Restore
-    //       1 - Ask me before Restore
-    //       2 (or else) - Don't Restore
-    //
-    //       pref "onStart.loadsession"
-    //       0 , 1 , 2 ..... index of saved sessions
-    //       -1, -2 ........ index of previous sessions
-    //
-    // if loadsession >= 0 the session path is saved in pref "onStart.sessionpath"
-    // else if loadsession < 0 the session path is saved in this.gSessionPath
-    var restoreFlag = this.prefBranch.getIntPref("onStart");
-    if (restoreFlag > 1) {
-      // merge pinned tabs from all windows into one, other cases
-      // handled by SessionStore
-      if (this.prefBranch.getBoolPref("restore.concatenate"))
-        this.deferredRestore();
-      else
-        this.setLastSession();
-      return; // Don't Restore
-    }
-    var loadSession = this.prefBranch.getIntPref("onStart.loadsession");
-    // after last session end with restart load the last session without any prompt
-    // unless we are after crash
-    var startupEmpty = false;
-    var result = {}, title, msg = "", buttons;
-    if (afterCrash)
-      title = TabmixSvc.getSMString("sm.afterCrash.title");
-    else
-      title = TabmixSvc.getSMString("sm.start.title");
-    var chkBoxLabel = afterCrash ? TabmixSvc.getSMString("sm.start.chkbox.label") : "";
-    var chkBoxState = afterCrash ? Tabmix.CHECKBOX_UNCHECKED : Tabmix.HIDE_CHECKBOX;
-    // get saved session list, we only need to get session path
-    var sessionList = this.getSessionList("onlyPath");
-    var askifempty = restoreFlag > 1 ? false : this.prefBranch.getBoolPref("onStart.askifempty");
-    if (sessionList === null) {
-      if ((askifempty && afterCrash || restoreFlag == 1) && !this.corruptedFile) {
-        msg = TabmixSvc.getSMString("sm.start.msg0") + "\n" +
-          TabmixSvc.getSMString("sm.afterCrash.msg10");
-        if (afterCrash)
-          msg += "\n\n" + TabmixSvc.getSMString("sm.start.msg1");
-        buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
-        let callBack = aResult => {
-          this.waitForCallBack = false;
-          this.enableCrashRecovery(aResult);
-          this.restoreWindowArguments();
-        };
-        this.waitForCallBack = true;
-        this.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
-          [title, msg, "", chkBoxLabel, buttons], window, callBack);
-      }
-      this.loadHomePage();
-      return;
-    }
-
-    var sessionPath = sessionList.path;
-    var loadSessionIsValid = true, sessionIndex, thisPath;
-    switch (loadSession > 0 ? 0 : loadSession) {
-      case 0:
-        sessionIndex = null;
-        if (this.prefBranch.prefHasUserValue("onStart.sessionpath")) {
-          thisPath = this.prefBranch.getCharPref("onStart.sessionpath");
-          // check if sessionpath is valid
-          for (let i = 0; i < sessionPath.length; i++) {
-            if (sessionPath[i] == thisPath) {
-              sessionIndex = i;
-              break;
-            }
-          }
-        }
-        if (thisPath && this.containerEmpty(thisPath) || sessionIndex === null) {
-          // error in pref.js or in session.rdf ask the user what to do
-          loadSessionIsValid = false;
-          thisPath = this.gSessionPath[1]; // load last session
-          this.prefBranch.setIntPref("onStart.loadsession", -1);
-        }
-        break;
-      default: // just in case that somehow onStart.loadsession is invalid
-        loadSession = -1;
-        this.prefBranch.setIntPref("onStart.loadsession", -1);
-        /* falls through */
-      case -2:
-      case -1: {
-        let index = -1 * loadSession;
-        thisPath = this.gSessionPath[index];
-        if (index == 1 && this.lastSessionWasEmpty ||
-            this.containerEmpty(this.gSessionPath[index])) {
-          startupEmpty = true;
-        }
-        sessionIndex = sessionPath.length + index - 3;
-        break;
-      }
-    }
-    if (restoreFlag > 0 || afterCrash || startupEmpty && askifempty || !loadSessionIsValid) {
-      try {
-        if (afterCrash)
-          msg += TabmixSvc.getSMString("sm.afterCrash.msg0") + " " +
-            TabmixSvc.getSMString("sm.start.msg1");
-        if (startupEmpty) msg += TabmixSvc.getSMString("sm.start.msg0");
-        if (!loadSessionIsValid) msg += TabmixSvc.getSMString("sm.start.msg2");
-        msg += "\n\n" + TabmixSvc.getSMString("sm.afterCrash.msg1");
-        buttons = [TabmixSvc.setLabel("sm.afterCrash.button0"),
-          TabmixSvc.setLabel("sm.afterCrash.button1")].join("\n");
-        let callBack = aResult => {
-          this.onFirstWindowPromptCallBack(aResult);
-        };
-        this.waitForCallBack = true;
-        this.promptService([Tabmix.BUTTON_OK, Tabmix.SHOW_MENULIST, chkBoxState, Tabmix.SELECT_DEFAULT],
-          [title, msg, "", chkBoxLabel, buttons], window, callBack);
-      } catch (ex) {
-        Tabmix.assert(ex);
-      }
-    } else {
-      result.button = startupEmpty ? Tabmix.BUTTON_CANCEL : Tabmix.BUTTON_OK;
-      result.label = thisPath;
-      this.onFirstWindowPromptCallBack(result);
-    }
-  },
-
-  enableCrashRecovery: function SM_enableCrashRecovery(aResult) {
-    if (aResult.checked && this.afterCrash) {
-      this.prefBranch.setBoolPref("crashRecovery", true); // enable Crash Recovery
-      Services.prefs.savePrefFile(null); // store the pref immediately
-    }
-  },
-
-  onFirstWindowPromptCallBack: function SM_onFirstWindowPromptCallBack(aResult) {
-    this.waitForCallBack = false;
-    this.enableCrashRecovery(aResult);
-    if (aResult.button == Tabmix.BUTTON_OK) {
-      this.loadSession(aResult.label, "firstwindowopen", !this.firstNonPrivateWindow);
-    } else if (this.waitForCallBack) {
-      this.deferredRestore();
-    } else {
-      // we are here not after a callback only when the startup file is empty
-      this.loadHomePage();
-    }
-
-    this.saveStateDelayed();
-
-    // now that we open our tabs init TabView again
-    if (this.tabViewInstalled)
-      TabView.init();
-
-    this.restoreWindowArguments();
-  },
-
-  // Add delay when calling prompt on startup
-  promptService(intParam, strParam, aWindow, aCallBack) {
-    setTimeout(() => {
-      Tabmix.promptService(intParam, strParam, aWindow, aCallBack);
-    }, 0);
-  },
-
-  /**
-   * user wants to restore only pinned tabs
-   * use SessionStore functions to prepare and restore
-   */
-  deferredRestore(afterCrash) {
-    if (!this.prefBranch.getBoolPref("onStart.restorePinned"))
-      return;
-
-    let state = this.setLastSession();
-    let iniState = TabmixSvc.SessionStore._prepDataForDeferredRestore(state)[0];
-    // prepDataForDeferredRestore set wrong selected index when the selected tab
-    // was pinned tab
-    for (let win of iniState.windows) {
-      if (win.tabs.length < win.selected) {
-        win.selected = 1;
-      }
-    }
-    let pinnedExist = Boolean(iniState.windows.length);
-    if (pinnedExist) {
-      // move all tabs and closed tabs into one window
-      if (!afterCrash && (Tabmix.prefs.getBoolPref("singleWindow") ||
-                          this.prefBranch.getBoolPref("restore.concatenate"))) {
-        this.mergeWindows(iniState);
-      }
-      let overwrite = TabmixSvc.SessionStore._isCmdLineEmpty(window, iniState);
-      // determine how many windows are meant to be restored
-      TabmixSvc.SessionStore._restoreCount = iniState.windows ? iniState.windows.length : 0;
-      let options = {firstWindow: true, overwriteTabs: overwrite};
-      TabmixSvc.SessionStore.restoreWindows(window, iniState, options);
-    }
-    this.loadHomePage(pinnedExist);
-  },
-
-  /**
-   * move all tabs & closed tabs into one window
-   * (original code by Session Manager extension)
-   */
-  mergeWindows(state) {
-    if (state.windows.length < 2)
-      return;
-    // take off first window
-    let win = state.windows.shift();
-    // make sure toolbars are not hidden on the window
-    delete win.hidden;
-    delete win.isPopup;
-    if (!win._closedTabs)
-      win._closedTabs = [];
-    // Move tabs to first window
-    state.windows.forEach(aWindow => {
-      win.tabs = win.tabs.concat(aWindow.tabs);
-      if (aWindow._closedTabs)
-        win._closedTabs = win._closedTabs.concat(aWindow._closedTabs);
-    });
-    win._closedTabs.splice(Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo"));
-    // Remove all but first window
-    state.windows = [win];
-  },
-
-  _sendRestoreCompletedNotifications() {
-    // notify observers things are complete in these cases:
-    // when all windows restored
-    // when we have nothing to restore
-    // when we are waiting for user responds to a prompt dialog
-
-    // observers were already notified
-    if (TabmixSvc.sm.observersWereNotified || !this.notifyObservers) {
-      TabmixSvc.sm.restoreCount = -1;
-      return;
-    }
-
-    // not all windows restored, yet
-    if (TabmixSvc.sm.restoreCount > 1) {
-      TabmixSvc.sm.restoreCount--;
-      return;
-    }
-
-    // This was the last window restored at startup, notify observers.
-    Services.obs.notifyObservers(null, "sessionstore-windows-restored");
-    TabmixSvc.SessionStore._deferredAllWindowsRestored.resolve();
-
-    TabmixSvc.sm.observersWereNotified = true;
-    TabmixSvc.sm.restoreCount = -1;
-  },
-
-  getSessionList: function SM_getSessionList(flag) {
-    var aList = [], sessionPath = [];
-    var aContainer = this.initContainer(this._rdfRoot + '/windows');
-    var containerEnum = aContainer.GetElements();
-    var node, aName;
-    while (containerEnum.hasMoreElements()) {
-      node = containerEnum.getNext();
-      if (flag != "onlyPath") {
-        aName = this.getDecodedLiteralValue(node, "name");
-        aList.push(aName);
-      }
-      sessionPath.push(node.QueryInterface(Ci.nsIRDFResource).Value);
-    }
-    if (flag == "saved") return {list: aList, path: sessionPath};
-    else if (flag == "replace") {
-      aList.push(TabmixSvc.getSMString("sm.sessionMenu.lastDefault"));
-      aList.push(TabmixSvc.getSMString("sm.sessionMenu.previous"));
-    } else {
-      let empty = ", (" + TabmixSvc.getSMString("sm.session.empty") + ")";
-      let empty1 = this.containerEmpty(this.gSessionPath[1]);
-      let empty2 = this.containerEmpty(this.gSessionPath[2]);
-      if (empty1 && empty2 && sessionPath.length === 0)
-        return null;
-      if (flag != "onlyPath") {
-        let msg = flag == "afterCrash" ? "sm.sessionMenu.lastgood" : "sm.sessionMenu.last";
-        aList.push(TabmixSvc.getSMString(msg) + (empty1 ? empty : ""));
-        aList.push(TabmixSvc.getSMString("sm.sessionMenu.previous") + (empty2 ? empty : ""));
-      }
-    }
-    sessionPath.push(this.gSessionPath[1]);
-    sessionPath.push(this.gSessionPath[2]);
-    return {list: aList, path: sessionPath};
-  },
-
-  saveAllWindows: function SM_saveAllWindows(path, caller, saveClosedTabs) {
-    var enumerator = Tabmix.windowEnumerator();
-    var wnd, savedTabs = 0, savedWin = 0, thisWin;
-    while (enumerator.hasMoreElements()) {
-      wnd = enumerator.getNext();
-      if (!this.isWindowPrivate(wnd)) {
-        thisWin = wnd.TabmixSessionManager.saveOneWindow(path, caller, false, saveClosedTabs);
-        savedTabs += thisWin;
-        if (thisWin > 0) savedWin += 1;
-      }
-    }
-    return {win: savedWin, tab: savedTabs};
-  },
-
-  /**
-   *  update closed window list flag 'dontLoad'
-   *  all window that where closed more then 10 sec ago will mark 'dontLoad'
-   *  return true if we left out with windows to load
-   */
-  updateClosedWindowList: function SM_updateClosedWindowList(aPopUp) {
-    var thisSession = this.RDFService.GetResource(this.gSessionPath[0]);
-    var container = this.initContainer(thisSession);
-    var curTime;
-    if (aPopUp || this.isPrivateWindow) {
-      curTime = this.getLiteralValue(thisSession, "timestamp", 0);
-    } else {
-      let pref = "warnAboutClosingTabs.timeout";
-      let delay = Tabmix.prefs.prefHasUserValue(pref) ? Tabmix.prefs.getCharPref(pref) : 0;
-      curTime = new Date().valueOf() - Number(delay);
-    }
-    var windowEnum = container.GetElements();
-    while (windowEnum.hasMoreElements()) {
-      var rdfNodeLastWindow = windowEnum.getNext();
-      var lastSaved = this.getLiteralValue(rdfNodeLastWindow, "timestamp", 0);
-      if (curTime - lastSaved > 10000) {
-        if (!this.nodeHasArc(rdfNodeLastWindow, "dontLoad"))
-          this.setLiteral(rdfNodeLastWindow, "dontLoad", "true");
-      }
-    }
-    var count = this.countWinsAndTabs(container, "dontLoad");
-    return count.win > 0 && count.tab > 0;
-  },
-
-  // Saves TabView data for the given window.
-  saveTabViewData: function SM_saveTabViewData(aWin, aBackup) {
-    if (aBackup && (!this.enableBackup || this.windowClosed))
-      return;
-    let tabview = this.tabViewInstalled && TabView._window;
-    if (tabview) {
-      if (aBackup) {
-        // update all tabs when we enter/exit panorama
-        for (let tab of gBrowser.tabs) {
-          this.saveTabviewTab(this.getNodeForTab(tab), tab);
-        }
-      } else {
-        // force Tabview to save when we save all window data
-        // we will collect the data from SessionStore
-        tabview.UI._save();
-        tabview.GroupItems.saveAll();
-        tabview.TabItems.saveAll();
-      }
-    }
-
-    let self = this;
-    function updateTabviewData(id) {
-      let data = TabmixSessionData.getWindowValue(window, id);
-      if (data !== "" && data != "{}")
-        self.setLiteral(aWin, id, data);
-      else
-        self.removeAttribute(aWin, id);
-    }
-    updateTabviewData("tabview-ui");
-    updateTabviewData("tabview-visibility");
-    updateTabviewData("tabview-groups");
-    updateTabviewData("tabview-group");
-    if (aBackup)
-      this.saveStateDelayed();
-  },
-
-  saveOneWindow: function SM_saveOneWindow(path, caller, overwriteWindow, saveClosedTabs) {
-    // don't save private window or window without any tab
-    if (this.isPrivateWindow || !this.isWindowValidtoSave())
-      return 0;
-    if (!path) path = this.gSessionPath[0];
-    if (!caller) caller = "";
-    if (!overwriteWindow) overwriteWindow = false;
-    if (typeof saveClosedTabs == "undefined") saveClosedTabs = this.saveClosedtabs;
-    // if we going to delete close window from the list we can't use GetCount as ID,
-    // we need to save unique ID
-    var winID;
-    if (caller == "windowclosed" || caller == "windowbackup") winID = gBrowser.windowID;
-    else winID = this.getAnonymousId();
-    var winPath = path + "/" + winID;
-    this.initSession(path, winPath);
-    var savedTabs = this.saveAllTab(winPath);
-    if (caller == "windowclosed" && this.enableBackup) {
-      this.setTabsScroll();
-    } else if ((this.gThisWin == winPath && !this.enableBackup ||
-                this.gThisWin != winPath) && saveClosedTabs) {
-      this.copyClosedTabsToRDF(winPath);
-    }
-
-    var rdfNodeThisWindow = this.RDFService.GetResource(winPath);
-    this.setLiteral(rdfNodeThisWindow, "SSi", window.__SSi);
-    if (this.prefBranch.getBoolPref("save.selectedtab")) // save selected tab index
-      this.setIntLiteral(rdfNodeThisWindow, "selectedIndex", this.getTabPosition());
-
-    // save TabView data
-    try {
-      this.saveTabViewData(rdfNodeThisWindow);
-    } catch (ex) {
-      Tabmix.assert(ex);
-    }
-
-    if (caller == "windowbackup") {
-      return savedTabs;
-    }
-
-    if (path == this.gSessionPath[0]) {
-      // save current tab title. we will use it later in closed windows list as menu entry label
-      // if current tab is blank get label from first saved tab that isn't blank
-      var _tab = gBrowser._selectedTab;
-      if (gBrowser.isBlankTab(_tab)) {
-        for (var i = 0; i < gBrowser.tabs.length; i++) {
-          var aTab = gBrowser.tabs[i];
-          if (!gBrowser.isBlankTab(aTab)) {
-            _tab = aTab;
-            break;
-          }
-        }
-      }
-      var label = _tab.label;
-      this.setLiteral(rdfNodeThisWindow, "name", encodeURI(label));
-      this.setLiteral(rdfNodeThisWindow, "nameExt", this.getNameData(-1, savedTabs));
-      let pref = "warnAboutClosingTabs.timeout";
-      let delay = Tabmix.prefs.prefHasUserValue(pref) ? Tabmix.prefs.getCharPref(pref) : 0;
-      let newTime = new Date().valueOf() - Number(delay);
-      this.setLiteral(rdfNodeThisWindow, "timestamp", newTime);
-      // if we overwrite window we don't load it again on restart
-      if (this.overwriteWindow || overwriteWindow)
-        this.setLiteral(rdfNodeThisWindow, "dontLoad", "true");
-      // when we save on close we set this in windowIsClosing
-      if (caller != "windowclosed") {
-        this.setLiteral(rdfNodeThisWindow, "status", "saved");
-        this.updateClosedWindowsMenu(false);
-      }
-    } else {
-      this.setLiteral(rdfNodeThisWindow, "status", "");
-    }
-    this.saveStateDelayed();
-    return savedTabs;
-  }, // end of "saveOneWindow : function ()"
-
-  // if this session is not in the container add it to the last place and init prop
-  // else move it to the last place
-  initSession: function SM_initSession(path, winPath) {
-    var container = this.initContainer(path);
-    var rdfNode = this.RDFService.GetResource(winPath);
-    var index = container.IndexOf(rdfNode);
-    if (index == -1) {
-      container.AppendElement(rdfNode);
-      if (this.isPrivateWindow)
-        return;
-      this.setLiteral(rdfNode, "status", "backup");
-      this.setResource(rdfNode, "tabs", winPath + "/tabs");
-      this.setResource(rdfNode, "closedtabs", winPath + "/closedtabs");
-    } else if (index != container.GetCount()) {
-      container.RemoveElementAt(index, true);
-      container.AppendElement(rdfNode);
-    }
-  },
-
-  // xxx need to fix this to save only history, image and history index
-  // and save the rest when tab added
-  tabLoaded: function SM_tabLoaded(aTab) {
-    if (!this._inited || !this.enableBackup || this.windowClosed ||
-        aTab.hasAttribute("inrestore") || this.isTabPrivate(aTab))
-      return;
-    if (gBrowser.isBlankTab(aTab)) return;
-    // if this window is not in the container add it to the last place
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-    var tabContainer = this.initContainer(this.gThisWinTabs);
-    var result = this.saveTab(aTab, this.gThisWinTabs, tabContainer, true);
-    if (result)
-      this.saveStateDelayed();
-  },
-
-  updateTabPos(aTab, label, add0_1) {
-    var tab, node;
-    if (!add0_1) add0_1 = 0;
-    for (var i = aTab._tPos + add0_1; i < gBrowser.tabs.length; i++) {
-      tab = gBrowser.tabs[i];
-      node = typeof label != "string" ? this.getNodeForTab(tab) : label + "/" + tab.linkedPanel;
-      this.setIntLiteral(node, "tabPos", tab._tPos);
-    }
-  },
-
-  tabClosed: function SM_tabClosed(aTab) { // delete tab from container and save to closed tab list backup
-    // we don't check aTab.hasAttribute("inrestore") , in case tab is closed before
-    // its finish to restore.
-    if (!this.enableBackup || this.windowClosed) return;
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-    var tabContainer = this.initContainer(this.gThisWinTabs);
-    var panelPath = this.getNodeForTab(aTab);
-    var nodeToClose = this.RDFService.GetResource(panelPath);
-    var privateTab = this.isTabPrivate(aTab);
-    // update _tPos for the tab right to the deleted tab
-    this.updateTabPos(aTab, null, privateTab ? 1 : 0);
-    if (!privateTab && this.saveClosedtabs) {
-      // move closedtabs to closedtabs container
-      var closedTabContainer = this.initContainer(this.gThisWinClosedtabs);
-      var tabExist = true;
-      if (tabContainer.IndexOf(nodeToClose) == -1) {
-        tabExist = this.saveTab(aTab, this.gThisWinTabs, closedTabContainer, false);
-      } else tabContainer.RemoveElement(nodeToClose, true);
-      if (tabExist) {
-        closedTabContainer.AppendElement(nodeToClose);
-        this.setLiteral(nodeToClose, "closedAt", Date.now());
-        if (closedTabContainer.GetCount() > Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo"))
-          this.deleteClosedtabAt(1, this.gThisWin);
-      }
-    } else if (tabContainer.IndexOf(nodeToClose) > -1) {
-      this.deleteSubtree(panelPath);
-      tabContainer.RemoveElement(nodeToClose, true);
-      if (!tabContainer.GetCount()) { // if no tab in the container remove it from the tree
-        var winContainer = this.initContainer(this.gSessionPath[0]);
-        var rdfNode = this.RDFService.GetResource(this.gThisWin);
-        winContainer.RemoveElement(rdfNode, true);
-        this.deleteSubtree(this.gThisWin);
-      }
-    }
-    this.saveStateDelayed();
-  },
-
-  updateTabProp: function SM_updateTabProp(aTab) {
-    // we dont need this function to run before sessionmanager init
-    if (!this._inited || !this.enableBackup || this.windowClosed ||
-        aTab.hasAttribute("inrestore") || this.isTabPrivate(aTab))
-      return;
-    // dont write private or blank tab to the file
-    if (this.isTabPrivate(aTab) || gBrowser.isBlankTab(aTab))
-      return;
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-    this.setLiteral(this.getNodeForTab(aTab), "properties", TabmixSessionData.getTabProperties(aTab, true));
-    this.saveStateDelayed();
-  },
-
-  tabMoved: function SM_tabMoved(aTab, oldPos, newPos) {
-    if (!this.enableBackup || this.windowClosed ||
-        aTab.hasAttribute("inrestore") || this.isTabPrivate(aTab))
-      return;
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-    // can't use aTab._tPos after group of tab delete
-    // we pass old position and new position from TabMove event
-    // we need to fix tabPos for all tab between old position and new position
-    var first = Math.min(oldPos, newPos);
-    var last = Math.max(oldPos, newPos);
-    for (var i = first; i < last + 1; i++) {
-      var tab = gBrowser.tabs[i];
-      if (!gBrowser.isBlankTab(tab))
-        this.setIntLiteral(this.getNodeForTab(tab), "tabPos", i);
-    }
-    this.saveStateDelayed();
-  },
-
-  setTabsScroll() {
-    if (this.prefBranch.getBoolPref("save.scrollposition"))
-      for (var i = 0; i < gBrowser.tabs.length; i++)
-        this.tabScrolled(gBrowser.tabs[i]);
-  },
-
-  // xxx need to find the right event to trigger this function..
-  tabScrolled: function SM_tabScrolled(aTab) {
-    if (!this.enableBackup || this.windowClosed ||
-        aTab.hasAttribute("inrestore") || this.isTabPrivate(aTab))
-      return;
-    var aBrowser = gBrowser.getBrowserForTab(aTab);
-    if (aTab.hasAttribute("pending") || gBrowser.isBlankBrowser(aBrowser)) {
-      return;
-    }
-
-    aBrowser.messageManager.sendAsyncMessage("Tabmix:collectScrollPosition");
-  },
-
-  updateScrollPosition(tab, scroll) {
-    if (scroll)
-      this.setLiteral(this.getNodeForTab(tab), "scroll", scroll.scrollX + "," + scroll.scrollY);
-  },
-
-  tabSelected(needFlush) {
-    if (!this.enableBackup || this.windowClosed)
-      return;
-    let tab = gBrowser._selectedTab;
-    if (tab.hasAttribute("inrestore") || this.isTabPrivate(tab))
-      return;
-    if (typeof needFlush == "undefined") needFlush = false;
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-    this.setTabsScroll(); // until i find proper event to update tab scroll do it from here
-    if (this.prefBranch.getBoolPref("save.selectedtab")) {
-      this.setIntLiteral(this.gThisWin, "selectedIndex", this.getTabPosition());
-    }
-    if (needFlush)
-      this.saveStateDelayed();
-  },
-
-  getTabPosition() { // calc selected tab position if blank tab not restore
-    if (gBrowser.isBlankTab(gBrowser._selectedTab)) return 0; // if the current tab is blank we don't restore the index
-    var blankTab = 0;
-    for (var i = 0; i < gBrowser._selectedTab._tPos; i++) {
-      if (gBrowser.isBlankTab(gBrowser.tabs[i])) blankTab++;
-    }
-    return gBrowser._selectedTab._tPos - blankTab;
-  },
-
-  getNodeForTab(aTab) {
-    return this.gThisWinTabs + "/" + aTab.linkedPanel;
-  },
-
-  isTabPrivate(aTab) {
-    return typeof privateTab == "object" && window.privateTab.isTabPrivate(aTab);
-  },
-
-  privateTabChanged(aEvent) {
-    if (!this.enableBackup || this.windowClosed || typeof privateTab != "object")
-      return;
-
-    // aEvent.detail: 1 == private, 0 == non-private
-    let tab = aEvent.target;
-    if (aEvent.detail)
-      this.tabClosed(tab);
-    else
-      this.tabLoaded(tab);
-  },
-
-  saveAllTab: function SM_saveAllTab(winPath) {
-    var savedTabs = 0;
-    var rdfNodeTabs = this.getResource(winPath, "tabs");
-    var rdfLabelTabs = rdfNodeTabs.QueryInterface(Ci.nsIRDFResource).Value;
-    var tabContainer = this.initContainer(rdfNodeTabs);
-    for (var i = 0; i < gBrowser.tabs.length; i++) {
-      var aTab = gBrowser.tabs[i];
-      if (this.saveTab(aTab, rdfLabelTabs, tabContainer, true))
-        savedTabs++;
-    }
-    return savedTabs;
-  },
-
-  // call from tabLoaded, tabClosed, saveAllTab
-  saveTab: function SM_saveTab(aTab, rdfLabelTabs, tabContainer, needToAppend) {
-    if (this.isTabPrivate(aTab))
-      return false;
-    var browser = gBrowser.getBrowserForTab(aTab);
-    if (gBrowser.isBlankBrowser(browser))
-      return false;
-
-    // clear sanitized flag
-    if (this.prefBranch.prefHasUserValue("sanitized")) {
-      this.prefBranch.clearUserPref("sanitized");
-      TabmixSvc.sm.sanitized = false;
-      this.setLiteral(this._rdfRoot + "/closedSession/thisSession", "status", "crash");
-    }
-
-    var tabState;
-    try {
-      tabState = JSON.parse(SessionStore.getTabState(aTab));
-    } catch {}
-    var data = this.serializeHistory(tabState);
-    if (!data)
-      return false;
-    data.pos = aTab._tPos;
-    data.image = tabState.image;
-    data.userContextId = tabState.userContextId || null;
-    data.properties = TabmixSessionData.getTabProperties(aTab, true);
-    var rdfLabelTab = rdfLabelTabs + "/" + aTab.linkedPanel;
-    var rdfNodeTab = this.RDFService.GetResource(rdfLabelTab);
-    this.saveTabData(rdfNodeTab, data);
-    this.saveTabviewTab(rdfNodeTab, aTab);
-
-    // dont append if we call from tabClosed function
-    if (tabContainer.IndexOf(rdfNodeTab) == -1 && needToAppend) {
-      tabContainer.AppendElement(rdfNodeTab);
-      this.updateTabPos(aTab, rdfLabelTabs, 1); // update _tPos for the tab right to the new tab
-    }
-    return true;
-  },
-
-  saveTabviewTab: function SM_saveTabviewTab(aNode, aTab) {
-    if (!this.enableBackup || this.windowClosed ||
-        aTab.hasAttribute("inrestore") || this.isTabPrivate(aTab))
-      return;
-    let data = TabmixSessionData.getTabValue(aTab, "tabview-tab");
-    if (data !== "" && data != "{}")
-      this.setLiteral(aNode, "tabview-tab", data);
-    else
-      this.removeAttribute(aNode, "tabview-tab");
-  },
-
-  saveTabData: function SM_saveTabData(aNode, aData) {
-    this.setIntLiteral(aNode, "index", aData.index);
-    this.setIntLiteral(aNode, "tabPos", aData.pos);
-    if (aData.userContextId) {
-      this.setIntLiteral(aNode, "userContextId", aData.userContextId);
-    }
-    this.setLiteral(aNode, "image", aData.image || "");
-    this.setLiteral(aNode, "properties", aData.properties);
-    this.setLiteral(aNode, "historyData", aData.history);
-    this.setLiteral(aNode, "scroll", aData.scroll);
-    if (aData.closedAt)
-      this.setLiteral(aNode, "closedAt", aData.closedAt);
-  },
-
-  /**
-   * Convert SessionStore tab history state object
-   *
-   * @param state
-   *        SessionStore tab state object
-   * @return object containing history entries, current history index and
-   *                current history scroll position
-   */
-  serializeHistory(state) {
-    if (!state)
-      return null;
-    // Ensure sure that all entries have url
-    var entries = state.entries.filter(e => e.url);
-    if (!entries.length)
-      return null;
-    // Ensure the index is in bounds.
-    var index = (state.index || entries.length) - 1;
-    index = Math.min(index, entries.length - 1);
-    index = Math.max(index, 0);
-    var historyStart = this.enableSaveHistory ? 0 : index;
-    var historyEnd = this.enableSaveHistory ? entries.length : index + 1;
-    var history = [];
-
-    var saveScroll = this.prefBranch.getBoolPref("save.scrollposition");
-    var currentScroll = saveScroll && state.scroll ? JSON.stringify(state.scroll) : "0,0";
-    if (currentScroll != "0,0")
-      entries[index].scroll = currentScroll;
-
-    for (let j = historyStart; j < historyEnd; j++) {
-      try {
-        let historyEntry = entries[j];
-        let entry = {
-          url: historyEntry.url,
-          title: historyEntry.title || "",
-          scroll: saveScroll && historyEntry.scroll || "0,0",
-        };
-        if (historyEntry.triggeringPrincipal_base64) {
-          entry.triggeringPrincipal_base64 = historyEntry.triggeringPrincipal_base64;
-        }
-        history.push(entry);
-      } catch (ex) {
-        Tabmix.assert(ex, "serializeHistory error at index " + j);
-      }
-    }
-    return {
-      history: encodeURI(JSON.stringify(history)),
-      index,
-      scroll: currentScroll
-    };
-  },
-
-  get canRestoreLastSession() {
-    return this.enableManager ? TabmixSvc.sm.lastSessionPath && !this.containerEmpty(TabmixSvc.sm.lastSessionPath) :
-      SessionStore.canRestoreLastSession;
-  },
-
-  restoreLastSession: function SM_restoreLastSession() {
-    if (!this.canRestoreLastSession)
-      return;
-
-    if (this.enableManager)
-      this.loadSession(TabmixSvc.sm.lastSessionPath, "sessionrestore", false);
-    else
-      SessionStore.restoreLastSession();
-  },
-
-  setLastSession(restoring) {
-    let state = TabmixConvertSession.getSessionState(this.gSessionPath[1]);
-    TabmixSvc.sm.lastSessionPath = this.gSessionPath[1];
-
-    // add __SS_lastSessionWindowID to force SessionStore.restoreLastSession
-    // to open new window
-    if (restoring)
-      window.__SS_lastSessionWindowID = String(Date.now()) + Math.random();
-
-    TabmixSvc.SessionStoreGlobal.LastSession.setState(state);
-    return state;
-  },
-
-  loadSession: function SM_loadSession(path, caller, overwriteWindows) {
-    let lastSession = this.gSessionPath[1];
-    if (caller == "firstwindowopen" && path != lastSession)
-      this.setLastSession(true);
-    if (path == lastSession) {
-      TabmixSvc.sm.lastSessionPath = null;
-      // Since Firefox 27 SessionStore LastSession.clear send
-      // NOTIFY_LAST_SESSION_CLEARED
-      SessionStore.canRestoreLastSession = false;
-      Tabmix.setItem("Browser:RestoreLastSession", "disabled", true);
-    }
-
-    var sessionCount = 0, concatenate;
-    if (typeof overwriteWindows == "undefined")
-      overwriteWindows = this.prefBranch.getBoolPref("restore.overwritewindows");
-    // don't concatenate window after crash
-    if (caller == "firstwindowopen" && this.getLiteralValue(this.gSessionPath[0], "status") == "crash2")
-      concatenate = false;
-    else
-      concatenate = this.prefBranch.getBoolPref("restore.concatenate");
-    var saveBeforeOverwrite = this.prefBranch.getBoolPref("restore.saveoverwrite");
-    var overwriteTabs = this.prefBranch.getBoolPref("restore.overwritetabs");
-
-    // in single window mode we restore ALL window into this window
-    if (Tabmix.singleWindowMode)
-      concatenate = true;
-
-    let state = TabmixConvertSession.getSessionState(path, true);
-    if (concatenate) {
-      // move all tabs & closed tabs into one window
-      this.mergeWindows(state);
-    }
-
-    // we restore multi-windows session to the same privacy state of the current window
-    var windowEnum = Tabmix.windowEnumerator();
-    var windowsList = [];
-    while (windowEnum.hasMoreElements()) {
-      let win = windowEnum.getNext();
-      let closed = win.TabmixSessionManager.windowClosed;
-      if (this.isWindowPrivate(win) != this.isPrivateWindow) {
-        if (overwriteWindows && !closed)
-          win.close();
-      } else if (!closed) {
-        windowsList.push(win);
-      }
-    }
-
-    if (!state.selectedWindow || state.selectedWindow > state.windows.length) {
-      state.selectedWindow = 0;
-    }
-    TabmixSvc.sm.restoreCount = state.windows ? state.windows.length : 0;
-    state.windows.forEach((winData, index) => {
-      sessionCount++;
-      let win = windowsList.pop();
-      let canOverwriteWindow = win && (overwriteWindows ||
-                                       caller == "firstwindowopen" && sessionCount == 1 ||
-                                       win.gBrowser.isBlankWindow());
-      if (canOverwriteWindow) {
-        // if we save overwrite windows in the closed windows list don't forget to set dontLoad==true
-        if (caller != "firstwindowopen" && saveBeforeOverwrite && overwriteTabs)
-          win.TabmixSessionManager.saveOneWindow(this.gSessionPath[0], "", true);
-        win.TabmixSessionManager.loadOneWindow(winData, caller);
-      } else {
-        win = this.openNewWindow(winData, this.isPrivateWindow);
-      }
-      if (index == state.selectedWindow - 1) {
-        win.focus();
-        TabmixSvc.sm.windowToFocus = win;
-      }
-    });
-    // close extra windows if we overwrite open windows and set dontLoad==true
-    if (Tabmix.numberOfWindows() > 1 && overwriteWindows) {
-      while (windowsList.length) {
-        let win = windowsList.pop();
-        if (saveBeforeOverwrite) win.TabmixSessionManager.overwriteWindow = true;
-        else win.TabmixSessionManager.saveThisWindow = false;
-        win.close();
-      }
-    }
-  },
-
-  openclosedwindow: function SM_openclosedwindow(path, overwriteWindows) {
-    var rdfNodeClosedWindow = this.RDFService.GetResource(path);
-    let winData = TabmixConvertSession.getWindowState(rdfNodeClosedWindow, true);
-    // remove the window from closed windows list and update UI
-    this.removeSession(path, this.gSessionPath[0]);
-    this.updateClosedWindowsMenu("check");
-    this.saveStateDelayed();
-
-    if (typeof overwriteWindows == "undefined")
-      overwriteWindows = this.prefBranch.getBoolPref("restore.overwritewindows");
-    if (overwriteWindows || gBrowser.isBlankWindow() || Tabmix.singleWindowMode) {
-      let saveBeforeOverwrite = this.prefBranch.getBoolPref("restore.saveoverwrite");
-      let overwriteTabs = this.prefBranch.getBoolPref("restore.overwritetabs");
-      if (saveBeforeOverwrite && overwriteTabs)
-        this.saveOneWindow(this.gSessionPath[0], "", true);
-      // SessionStore does not _sendRestoreCompletedNotifications after opening closed window
-      // TabmixSvc.sm.restoreCount = 1;
-      this.loadOneWindow(winData, "openclosedwindow");
-    } else {
-      TabmixSvc.sm.windowToFocus = this.openNewWindow(winData, this.isPrivateWindow);
-    }
-  },
-
-  openNewWindow: function SM_openNewWindow(aState, aPrivate) {
-    var argString = Cc["@mozilla.org/supports-string;1"]
-        .createInstance(Ci.nsISupportsString);
-    argString.data = "";
-
-    let features = "chrome,dialog=no,macsuppressanimation,all";
-    if (aPrivate) {
-      features += ",private";
-    }
-    var newWindow =
-        Services.ww.openWindow(null, AppConstants.BROWSER_CHROME_URL,
-          "_blank", features, argString);
-
-    let ID;
-    do {
-      ID = "window" + Math.random();
-    } while (ID in this._statesToRestore);
-    this._statesToRestore[ID] = aState;
-    newWindow.tabmixdata = {restoreID: ID};
-    return newWindow;
-  },
-
-  loadOneWindow: function SM_loadOneWindow(winData, caller) {
-    var overwrite = true, restoreSelect = this.prefBranch.getBoolPref("save.selectedtab");
-    switch (caller) {
-      case "firstwindowopen": {
-        overwrite = false;
-        let hasFirstArgument = window.arguments && window.arguments[0];
-        if (hasFirstArgument && this.overrideHomepage === null)
-          restoreSelect = false;
-        break;
-      }
-      case "windowopenedbytabmix":
-        overwrite = true;
-        break;
-      case "openclosedwindow":
-      case "sessionrestore":
-        overwrite = this.prefBranch.getBoolPref("restore.overwritetabs");
-        break;
-      default:
-        Tabmix.log("SessionManager \n error unidentified caller " + caller);
-    }
-    /*
-      1. when open first windows overwrite tab only if they are home page, if firefox open from link or with
-         pages that are not the home page append the new tab to the end.
-         simple solution is to set browser.startup.page = 0 , when we activate session manager, in this case if we
-         have any tabs in the first window we don't overwrite.
-      2. when open window by session manager other than the first window
-         (caller = "windowopenedbytabmix" and tabmix in the name) overwrite=true
-      3. when loadOneWindow call by openclosedwindow or loadSession we reuse window check user pref for overwrite.
-      4. if we open all closed windows to one window append tab to the end and select the selected tab from first window
-         in the session.
-    */
-    var cTab = gBrowser._selectedTab;
-    if (!winData.tabs || winData.tabs.length === 0) {
-      let msg = TabmixSvc.getSMString("sm.restoreError.msg0") + "\n" +
-          TabmixSvc.getSMString("sm.restoreError.msg1");
-      let title = TabmixSvc.getSMString("sm.title");
-      Services.prompt.alert(window, title, msg);
-      return;
-    }
-
-    // restore TabView data before we actually load the tabs
-    this._setWindowStateBusy(winData);
-
-    var newtabsCount = winData.tabs.length;
-    var lastSelectedIndex = restoreSelect ? winData.selected - 1 : 0;
-    if (lastSelectedIndex < 0 || lastSelectedIndex >= newtabsCount) lastSelectedIndex = 0;
-
-    let pending = Services.prefs.getBoolPref("browser.sessionstore.restore_on_demand");
-    function TMP_addTab() {
-      let newTab = gBrowser.addTrustedTab("about:blank", {
-        skipAnimation: true,
-        noInitialLabel: true,
-        skipBackgroundNotify: true,
-        index: gBrowser.tabs.length,
-        isPending: pending
-      });
-      // flag. dont save tab that are in restore phase
-      newTab.setAttribute("inrestore", "true");
-
-      return newTab;
-    }
-
-    // init the new container before we start to load new data
-    this.initSession(this.gSessionPath[0], this.gThisWin);
-
-    // disable smooth scrolling while adding, moving, removing and selecting tabs
-    var tabstrip = gBrowser.tabContainer.arrowScrollbox;
-    var smoothScroll = tabstrip.smoothScroll;
-    tabstrip.smoothScroll = false;
-
-    var newIndex, aTab, loadOnStartup = [];
-    if (newtabsCount > 0 && overwrite) {
-      // reset treeStyleTab data
-      if (Tabmix.extensions.treeStyleTab) {
-        gBrowser.treeStyleTab.resetAllTabs(true);
-      }
-      // unpinned tabs reorder tabs, so we loop backward
-      for (let i = gBrowser.tabs.length - 1; i >= 0; i--) {
-        this.resetTab(gBrowser.tabs[i]);
-      }
-      while (newtabsCount > gBrowser.tabs.length) {
-        TMP_addTab();
-      }
-      cTab.setAttribute("inrestore", "true");
-      // move selected tab to place
-      gBrowser.moveTabTo(cTab, lastSelectedIndex);
-      // remove extra tabs
-      while (newtabsCount < gBrowser.tabs.length) {
-        let tab = gBrowser.tabContainer.allTabs[gBrowser.tabContainer.allTabs.length - 1];
-        gBrowser.removeTab(tab);
-      }
-      this.copyClosedTabsToSessionStore(winData, true);
-      newIndex = 0;
-    } else if (newtabsCount > 0 && !overwrite) { // we use this in TGM and panorama (TabView)
-      // catch blank tab for reuse
-      var blankTabs = [], blankTabsCount = 0, currentTabIsBlank = false;
-      // unpinned tabs reorder tabs loop backward
-      for (let i = gBrowser.tabs.length - 1; i >= 0; i--) {
-        aTab = gBrowser.tabs[i];
-        // make sure we not overwrite tab that loads from apps
-        if (aTab.loadOnStartup) {
-          loadOnStartup.push(aTab);
-          delete aTab.loadOnStartup;
-        } else if (caller == "firstwindowopen" || gBrowser.isBlankTab(aTab) &&
-                  (!aTab.hasAttribute("inrestore") && !aTab.hasAttribute("busy"))) {
-          // overwrite all tabs that are not from apps on first window
-          this.resetTab(aTab);
-          blankTabs.push(aTab);
-        }
-      }
-
-      // make sure not to remove the current tab
-      let index = blankTabs.indexOf(cTab);
-      if (index > -1) {
-        currentTabIsBlank = true;
-        blankTabs.unshift(blankTabs.splice(index, 1)[0]);
-      }
-      // remove extra tabs
-      var blankTab;
-      while (blankTabs.length > newtabsCount) {
-        blankTab = blankTabs.pop();
-        if (blankTab)
-          gBrowser.removeTab(blankTab);
-      }
-
-      this.copyClosedTabsToSessionStore(winData, false);
-
-      // reuse blank tabs and move tabs to the right place
-      var openTabNext = Tabmix.getOpenTabNextPref();
-      if (this.tabViewInstalled) {
-        // fix and merge session Tabview data with current window Tabview data
-        this._prepareTabviewData(loadOnStartup, blankTabs);
-        if (this.groupUpdates.hideSessionActiveGroup) {
-          restoreSelect = false;
-          lastSelectedIndex = 0;
-          openTabNext = false;
-        }
-      }
-
-      blankTabsCount = blankTabs.length;
-      let tabsCount = gBrowser.tabs.length;
-      let lastIndex = tabsCount - 1;
-      let newTotalTabsCount = tabsCount - blankTabsCount + newtabsCount;
-
-      // we don't need to move tab after itself
-      if (currentTabIsBlank)
-        blankTabs.shift();
-
-      let multipleTabsOnStartUp = caller == "firstwindowopen" && gBrowser.tabs.length > 1;
-      let needToMove = openTabNext && !multipleTabsOnStartUp;
-      let newPos = needToMove ? cTab._tPos + 1 : lastIndex + 1;
-      // move blank tabs to new position
-      for (let t = 0; t < blankTabs.length; t++) {
-        blankTab = blankTabs[t];
-        let tabPos = blankTab._tPos < newPos ? newPos - 1 : newPos;
-        gBrowser.moveTabTo(blankTab, tabPos);
-      }
-
-      if (cTab._tPos == lastIndex || blankTabs.indexOf(gBrowser.tabs[lastIndex]) > -1)
-        needToMove = false;
-      while (newTotalTabsCount > gBrowser.tabs.length) {
-        let newTab = TMP_addTab();
-        if (needToMove)
-          gBrowser.moveTabTo(newTab, cTab._tPos + 1);
-        // just in case the tab is not in its place, move it to the end
-        else if (newTab._tPos < gBrowser.tabs.length - 1)
-          gBrowser.moveTabTo(newTab, gBrowser.tabs.length - 1);
-      }
-
-      if (tabsCount == blankTabsCount) {
-        newPos = 0;
-      } else {
-        newPos = openTabNext && cTab._tPos < gBrowser.tabs.length - 1 && !multipleTabsOnStartUp ?
-          cTab._tPos + 1 : tabsCount - blankTabsCount;
-      }
-      if (restoreSelect && !multipleTabsOnStartUp) {
-        if (currentTabIsBlank) { // if the current tab is not blank select new tab
-          if (openTabNext && newPos > 0)
-            newPos--;
-          // move selected tab to place
-          gBrowser.moveTabTo(cTab, newPos + lastSelectedIndex);
-        } else {
-          this.updateSelected(newPos + lastSelectedIndex, caller == "firstwindowopen" ||
-                              caller == "windowopenedbytabmix");
-        }
-      }
-      newIndex = newPos;
-    }
-
-    gBrowser._lastRelatedTabMap = new WeakMap();
-
-    // call arrowScrollbox.ensureElementIsVisible before we restore the tab
-    // we call from TMP_eventListener.onSSTabRestoring again
-    gBrowser.ensureTabIsVisible(gBrowser.selectedTab);
-
-    this.tabsToLoad = newtabsCount;
-    this.setStripVisibility(newtabsCount);
-
-    let tabsData = winData.tabs || [];
-    let activeGroupId = null, groups = this._tabviewData["tabview-groups"];
-    if (groups && typeof groups.activeGroupId != "undefined")
-      activeGroupId = groups.activeGroupId;
-    let tabs = [], numVisibleTabs = 0, firstVisibleTab = -1;
-    for (let t = 0; t < tabsData.length; t++) {
-      let data = tabsData[t];
-      let tab = gBrowser.tabs[newIndex + t];
-
-      let userContextId = data.userContextId;
-      let reuseExisting = tab.getAttribute("usercontextid") == (userContextId || "");
-      if (!reuseExisting) {
-        let tabToRemove = tab;
-        let forceNotRemote = !data.pinned;
-        tab = gBrowser.addTrustedTab("about:blank", {
-          skipAnimation: true,
-          noInitialLabel: true,
-          forceNotRemote,
-          userContextId,
-          skipBackgroundNotify: true,
-        });
-        gBrowser.removeTab(tabToRemove);
-        gBrowser.moveTabTo(tab, newIndex + t);
-      }
-
-      tabs.push(tab);
-      // flag. dont save tab that are in restore phase
-      if (!tab.hasAttribute("inrestore"))
-        tab.setAttribute("inrestore", "true");
-      if (data.pinned) {
-        gBrowser._insertBrowser(tab);
-        gBrowser.pinTab(tab);
-      }
-
-      this._setTabviewTab(tab, data, activeGroupId);
-
-      if (data.hidden) {
-        gBrowser.hideTab(tab);
-      } else {
-        gBrowser.showTab(tab);
-        numVisibleTabs++;
-        if (!restoreSelect && firstVisibleTab < 0)
-          firstVisibleTab = newIndex + t;
-      }
-    }
-
-    // when we don't restore the selected tab and don't have any tabs opened
-    // by other application, we need to select first tab in the current group
-    // if we append the session to hidden groups firstVisibleTab is -1
-    if (!loadOnStartup.length && !restoreSelect && firstVisibleTab > 0)
-      gBrowser.selectedTab = gBrowser.tabs[newIndex + firstVisibleTab];
-
-    // if all tabs to be restored are hidden, make the first one visible
-    if (!this.groupUpdates.hideSessionActiveGroup &&
-        !numVisibleTabs && tabsData.length) {
-      tabsData[0].hidden = false;
-      gBrowser.showTab(tabs[0]);
-    }
-
-    this._saveTabviewData();
-
-    // call internal SessionStore functions to restore tabs
-    if (overwrite) {
-      for (let i = 0; i < gBrowser.tabs.length; i++) {
-        let tab = gBrowser.tabs[i];
-        if (tab._restoreState) {
-          TabmixSvc.SessionStore._resetTabRestoringState(tab);
-        }
-      }
-    }
-    TabmixSvc.SessionStore.restoreTabs(window, tabs, tabsData, 0);
-
-    // show notification and clean up our data
-    var showNotification = caller != "firstwindowopen" || this.prefBranch.getIntPref("onStart") == 1;
-    this._setWindowStateReady(overwrite, showNotification);
-
-    // when resuming at startup: add additionally requested pages to the end
-    if (caller == "firstwindowopen" && loadOnStartup.length) {
-      let lastPlace = gBrowser.tabs.length - 1;
-      for (let tab of loadOnStartup) {
-        gBrowser.moveTabTo(tab, lastPlace);
-      }
-    }
-
-    if ("tabmixdata" in window) {
-      let {restoreID} = window.tabmixdata;
-      delete this._statesToRestore[restoreID];
-      delete window.tabmixdata;
-    }
-
-    // set smoothScroll back to the original value
-    tabstrip.smoothScroll = smoothScroll;
-
-    this._sendRestoreCompletedNotifications();
-  },
-
-  // The restoreHistory code has run. SSTabRestoring fired.
-  restoreHistoryComplete: function SM_restoreHistoryComplete(aTab) {
-    if (!aTab.hasAttribute("inrestore"))
-      return;
-
-    aTab.removeAttribute("inrestore");
-
-    // check if we restore all tabs
-    if (typeof this.tabsToLoad == "number" && --this.tabsToLoad === 0) {
-      delete this.tabsToLoad;
-      if (this.enableBackup) {
-        var result = this.saveOneWindow(this.gSessionPath[0], "windowbackup");
-        if (result > 0)
-          this.saveStateDelayed(-1);
-      }
-      this.setLiteral(this._rdfRoot + "/closedSession/thisSession", "status", "crash");
-    }
-  },
-
-  // reset tab's attributes and history
-  resetTab: function TMP_resetAttributes(aTab) {
-    let browser = gBrowser.getBrowserForTab(aTab);
-    if (!aTab.hasAttribute("pending")) {
-      browser.stop();
-    }
-    // reset old history
-    if (browser.getAttribute("remote") != "true") {
-      let history = browser.webNavigation.sessionHistory;
-      if (history) {
-        if (history.count > 0)
-          history.PurgeHistory(history.count);
-        history.QueryInterface(Ci.nsISHistoryInternal);
-      }
-    }
-
-    if (TabmixTabbar.hideMode != 2 && TabmixTabbar.widthFitTitle && !aTab.hasAttribute("width"))
-      aTab.setAttribute("width", Tabmix.getBoundsWithoutFlushing(aTab).width);
-
-    // if we need to remove extra tabs make sure they are not protected
-    let attributes = ["protected", "fixed-label", "label-uri",
-      "pending", "hidden", "image"];
-    // remove visited and tabmix_selectedID from all tabs but the current
-    if (aTab != gBrowser._selectedTab)
-      attributes = attributes.concat(["visited", "tabmix_selectedID"]);
-
-    attributes.forEach(attrib => {
-      if (aTab.hasAttribute(attrib))
-        aTab.removeAttribute(attrib);
-    });
-    if (Services.prefs.getBoolPref("browser.sessionstore.restore_on_demand"))
-      aTab.setAttribute("tabmix_pending", "true");
-    Tabmix.setTabStyle(aTab);
-
-    if (aTab.pinned)
-      gBrowser.unpinTab(aTab);
-
-    // Make sure that set/getTabValue will set/read the correct data by
-    // wiping out any current value in tab.__SS_extdata.
-    delete aTab.__SS_extdata;
-
-    // TODO: need to call TAB_LAZY_STATES.delete(tab)
-    if (aTab.__SS_lazyData) {
-      delete aTab.__SS_lazyData;
-    }
-
-    // clear TabStateCache
-    let data = this.TabStateCache.get(browser) || {};
-    for (let key of Object.keys(data)) {
-      data[key] = null;
-    }
-    this.TabStateCache.update(browser, data);
-  },
-
-  updateSelected(newIndex, removeAttribute) {
-    let oldIndex = gBrowser.tabContainer.selectedIndex;
-    if (newIndex != oldIndex) {
-      let tabs = gBrowser.tabs;
-      gBrowser.selectedTab = tabs[newIndex];
-      if (removeAttribute) {
-        tabs[oldIndex].removeAttribute("visited");
-        tabs[oldIndex].removeAttribute("tabmix_selectedID");
-      }
-    }
-  },
-
-  setStripVisibility() {
-    // un-hide the tab bar
-    // TODO: check if we need it when TabBarVisibility.update exist
-  },
-
-  copyClosedTabsToSessionStore(winData, aOverwrite) {
-    if (!this.saveClosedtabs)
-      return;
-    this.copyClosedTabsToRDF(this.gThisWin);
-    let closedTabsData = winData._closedTabs || [];
-    if (!aOverwrite)
-      closedTabsData = closedTabsData.concat(TMP_ClosedTabs.getClosedTabData);
-    closedTabsData.splice(Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo"));
-    TabmixSvc.SessionStore._windows[window.__SSi]._closedTabs = closedTabsData;
-  },
-
-  copyClosedTabsToRDF: function SM_copyClosedTabsToRDF(winPath) {
-    if (this.isPrivateWindow || !this.saveClosedtabs) {
-      return;
-    }
-    var rdfNodeTo = this.getResource(winPath, "closedtabs");
-    var toContainer = this.initContainer(rdfNodeTo);
-    var rdfNodeTabs = this.getResource(winPath, "tabs");
-    var rdfLabelTabs = rdfNodeTabs.QueryInterface(Ci.nsIRDFResource).Value;
-    var ctabs = TMP_ClosedTabs.getClosedTabData;
-    var maxTabsUndo = Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo");
-    ctabs = ctabs.map(data => this.getSessionStoreDataForRDF(data))
-        .filter(data => data);
-    ctabs.reverse().forEach(data => {
-      let uniqueId, rdfLabelSession, newNode;
-      uniqueId = "panel" + Date.now() + Math.random();
-      rdfLabelSession = rdfLabelTabs + "/" + uniqueId;
-      newNode = this.RDFService.GetResource(rdfLabelSession);
-      toContainer.AppendElement(newNode);
-      this.saveTabData(newNode, data);
-
-      // delete old entry if closedTabs container wasn't empty
-      if (toContainer.GetCount() > maxTabsUndo)
-        this.deleteClosedtabAt(1, winPath);
-    });
-    this.saveStateDelayed();
-  },
-
-  getSessionStoreDataForRDF: function SM_getSessionStoreDataForRDF(aTabData) {
-    var tabState = aTabData.state;
-    var data = this.serializeHistory(tabState);
-    if (!data)
-      return false;
-    data.pos = aTabData.pos;
-    data.closedAt = aTabData.closedAt || Date.now();
-    data.image = aTabData.image;
-    data.userContextId = aTabData.userContextId || null;
-    // closed tab can not be protected - set protected to 0
-    var _locked = TMP_SessionStore._getAttribute(tabState, "_locked") != "false" ? "1" : "0";
-    data.properties = "0" + _locked;
-    if ("disallow" in tabState && tabState.disallow) {
-      for (let j = 0; j < TabmixSessionData.docShellItems.length; j++)
-        data.properties += !tabState.disallow.includes(TabmixSessionData.docShellItems[j]) ? "1" : "0";
-    } else {
-      data.properties += "11111";
-    }
-    if ("attributes" in tabState && tabState.attributes) {
-      delete tabState.attributes._locked;
-      for (let name of Object.keys(tabState.attributes)) {
-        data.properties += " " + name + "=" + encodeURI(tabState.attributes[name]);
-      }
-    }
-    if ("xultab" in tabState && tabState.xultab) {
-      tabState.xultab = tabState.xultab.replace(" _locked=true", "").replace(" _locked=false", "");
-      if (tabState.xultab)
-        data.properties += " " + tabState.xultab;
-    }
-    return data;
-  },
-
-  deleteAllClosedtabs(sessionContainer) { // delete all closed tabs in this session
-    var windowEnum = sessionContainer.GetElements();
-    while (windowEnum.hasMoreElements()) {
-      var rdfNodeWindow = windowEnum.getNext();
-      this.deleteWinClosedtabs(rdfNodeWindow.QueryInterface(Ci.nsIRDFResource).Value);
-    }
-  },
-
-  deleteWinClosedtabs: function SM_deleteWinClosedtabs(winPath) {
-    var rdfNodeTabs = this.getResource(winPath, "closedtabs");
-    // After sanitize there are no closedtabs.
-    if (rdfNodeTabs) {
-      let container = this.initContainer(rdfNodeTabs);
-      this.deleteWithProp(container);
-      this.saveStateDelayed();
-    }
-  },
-
-  deleteClosedtabAt: function SM_deleteClosedtabAt(index, winPath) {
-    if (!this.prefBranch.getBoolPref("save.closedtabs"))
-      return;
-    if (typeof winPath == 'undefined')
-      winPath = this.gThisWin;
-    var rdfNodeTabs = this.getResource(winPath, "closedtabs");
-    var container = this.initContainer(rdfNodeTabs);
-    if (index == "last")
-      index = container.GetCount();
-    if (index < 1 || index > container.GetCount())
-      return;
-    var nodeToDelete = container.RemoveElementAt(index, true);
-    var nodeValue = nodeToDelete.QueryInterface(Ci.nsIRDFResource).Value;
-    this.deleteSubtree(nodeValue);
-    if (!container.GetCount()) this.deleteNode(rdfNodeTabs);
-    this.saveStateDelayed();
-  },
-
-  removeTab(aTab) {
-    // add blank tab before removing last tab to prevent browser closing with last tab
-    // and the default replacing last tab option
-    if (gBrowser.tabs.length == 1)
-      gBrowser.selectedTab = gBrowser.addTrustedTab("about:blank");
-    gBrowser.removeTab(aTab);
-  },
-
-  /* ............... Back up and archive sessions ............... */
-
-  archiveSessions: function SM_archiveSessions() {
-    var lastBackup = this.getMostRecentBackup();
-    // Backup Sessions if there aren't any backups or
-    // they haven't been backed up in the last 24 hrs.
-    const SESSIONS_ARCHIVE_INTERVAL = 86400 * 1000;
-    if (!lastBackup ||
-        Date.now() - lastBackup.lastModifiedTime > SESSIONS_ARCHIVE_INTERVAL) {
-      // The maximum number of daily sessions backups to
-      // keep in <profile>/sessionbackups. Special values:
-      // -1: unlimited
-      //  0: no backups created (and deletes all existing backups)
-      // "extensions.tabmix.sessions.max_backups";
-      var maxBackups = this.prefBranch.getIntPref("max_backups");
-      this.archiveSessionsFile(maxBackups, false /* don't force */);
-    }
-  },
-
-  getSessionsBackupDir: function SM_getSessionsBackupDir(aCreate) {
-    var sessionsBackupDir = this.profileDir;
-    sessionsBackupDir.append("sessionbackups");
-    if (aCreate && !sessionsBackupDir.exists())
-      sessionsBackupDir.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("0700", 8));
-    return sessionsBackupDir;
-  },
-
-  /**
-   * Get the most recent backup file.
-   * @returns nsIFile backup file
-   */
-  getMostRecentBackup: function SM_getMostRecentBackup() {
-    var sessionsBackupDir = this.getSessionsBackupDir(false);
-    if (!sessionsBackupDir.exists())
-      return null;
-
-    var backups = [];
-    var entries = sessionsBackupDir.directoryEntries;
-    while (entries.hasMoreElements()) {
-      var entry = entries.getNext().QueryInterface(Ci.nsIFile);
-      if (!entry.isHidden() && entry.leafName.match(/^tabmix_sessions-.+(rdf)?$/))
-        backups.push(entry.leafName);
-    }
-
-    if (backups.length === 0)
-      return null;
-
-    backups.sort();
-    var filename = backups.pop();
-
-    var backupFile = sessionsBackupDir.clone();
-    backupFile.append(filename);
-    return backupFile;
-  },
-
-  /**
-   * ArchiveSessionsFile()
-   *
-   * Creates a dated backup once a day in <profile>/sessionbackups.
-   *
-   * @param int aNumberOfBackups - the maximum number of backups to keep
-   *
-   * @param bool aForceArchive - forces creating an archive even if one was
-   *                             already created that day (overwrites)
-   */
-  archiveSessionsFile:
-  function SM_archiveSessionsFile(aNumberOfBackups, aForceArchive) {
-    var sessionsBackupDir = this.getSessionsBackupDir(true);
-    if (!sessionsBackupDir.exists())
-      return; // unable to create directory!
-
-    // construct the new leaf name
-    // Use YYYY-MM-DD (ISO 8601) as it doesn't contain illegal characters
-    // and makes the alphabetical order of multiple backup files more useful.
-    var d = new Date();
-    var date = [d.getFullYear(), '-', d.getMonth() < 9 ? "0" : "", d.getMonth() + 1, '-',
-      d.getDate() < 10 ? "0" : "", d.getDate()].join('');
-    var backupFilename = "tabmix_sessions-" + date + ".rdf";
-    var backupFile = null;
-    if (!aForceArchive) {
-      var backupFileNames = [];
-      var backupFilenamePrefix = backupFilename.substr(0, backupFilename.indexOf("-"));
-      var entries = sessionsBackupDir.directoryEntries;
-      while (entries.hasMoreElements()) {
-        var entry = entries.getNext().QueryInterface(Ci.nsIFile);
-        var backupName = entry.leafName;
-        if (backupName.substr(0, backupFilenamePrefix.length) == backupFilenamePrefix) {
-          if (backupName == backupFilename)
-            backupFile = entry;
-          backupFileNames.push(backupName);
-        }
-      }
-
-      var numberOfBackupsToDelete = 0;
-      if (aNumberOfBackups > -1)
-        numberOfBackupsToDelete = backupFileNames.length - aNumberOfBackups;
-      if (numberOfBackupsToDelete > 0) {
-        // If we don't have today's backup, remove one more so that
-        // the total backups after this operation does not exceed the
-        // number specified in the pref.
-        if (!backupFile)
-          numberOfBackupsToDelete++;
-
-        backupFileNames.sort();
-        while (numberOfBackupsToDelete--) {
-          backupFile = sessionsBackupDir.clone();
-          backupFile.append(backupFileNames[0]);
-          backupFile.remove(false);
-          backupFileNames.shift();
-        }
-      }
-
-      // do nothing if we either have today's backup already
-      // or the user has set the pref to zero.
-      if (backupFile || aNumberOfBackups === 0)
-        return;
-    }
-
-    backupFile = sessionsBackupDir.clone();
-    backupFile.append(backupFilename);
-
-    if (aForceArchive && backupFile.exists())
-      backupFile.remove(false);
-
-    if (!backupFile.exists()) {
-      var sessionsFile = this.profileDir;
-      sessionsFile.append("session.rdf");
-      if (sessionsFile.exists())
-        sessionsFile.copyTo(sessionsBackupDir, backupFilename);
-    }
-  },
-
-  /* ............... TabView Data ............... */
-
-  get tabViewInstalled() {
-    return TMP_TabView.installed;
-  },
-
-  _beforeRestore(winData) {
-    TabmixSvc.SessionStore._setWindowStateBusy(window);
-    if (this.tabViewInstalled) {
-      // save group count before we start the restore
-      let extData = winData.extData || {};
-      let data = extData["tabview-groups"] || "{}";
-      let parsedData = JSON.parse(data);
-      this._groupCount = parsedData.totalNumber || 1;
-    }
-  },
-
-  // we override these functions when TabView exist
-  _setWindowStateBusy(winData) {
-    this._beforeRestore(winData);
-  },
-
-  _setWindowStateReady() {
-    TabmixSvc.SessionStore._setWindowStateReady(window);
-  },
-
-  _saveTabviewData() { },
-  _setTabviewTab() { },
-  groupUpdates: {},
-  _tabviewData: {},
-
-  /* ............... DEPRECATED ............... */
-
-  // treeStyleTab extension look for it
-  loadOneTab() { }
-};
-
-/**
- * add backward compatibility getters to some of the main object/function/variable
- * that we changed from version 0.3.8.5pre.110123a
- * we only add this getters to objects the aren't in the name space
- */
-Tabmix.backwardCompatibilityGetter(window, "SessionData", "TabmixSessionData");
-Tabmix.backwardCompatibilityGetter(window, "SessionManager", "TabmixSessionManager");
-Tabmix.backwardCompatibilityGetter(window, "TabDNDObserver", "TMP_tabDNDObserver");
-Tabmix.backwardCompatibilityGetter(window, "gSingleWindowMode", "Tabmix.singleWindowMode");
-Tabmix.backwardCompatibilityGetter(window, "TM_init", "Tabmix.startup");
-Tabmix.backwardCompatibilityGetter(window, "tabscroll", "TabmixTabbar.scrollButtonsMode");
diff --git a/addon/chrome/content/session/sessionStore.js b/addon/chrome/content/session/sessionStore.js
index db35a8336..9e85d2dbe 100644
--- a/addon/chrome/content/session/sessionStore.js
+++ b/addon/chrome/content/session/sessionStore.js
@@ -86,122 +86,6 @@ var TMP_SessionStore = {
       [TabmixSvc.aboutBlank, TabmixSvc.aboutNewtab, "about:home"].includes(entries[0].url);
   },
 
-  /**
-   * @brief         make sure that we don't enable both sessionStore and session manager
-   *
-   * @param msgNo   a Integer value - msg no. to show.
-   *                -1 when session manager extension enabled (see AddonManager.sys.mjs)
-   *
-   * @param start   a Boolean value - true if we call this function before startup.
-   *
-   * @returns       Nothing.
-   */
-  setService: function TMP_ss_setSessionService(msgNo, start) {
-    // ##### disable Session Manager #####
-    Services.prefs.lockPref("extensions.tabmix.sessions.manager");
-    Services.prefs.lockPref("extensions.tabmix.sessions.crashRecovery");
-    if (TabmixSessionManager.disableSessionManager) {
-      document.getElementById("tmp_disableSave").setAttribute("disabled", true);
-      return;
-    }
-    TabmixSvc.sm.settingPreference = true;
-
-    if (TabmixSvc.sm.settingPreference || Tabmix.prefs.prefHasUserValue("setDefault"))
-      return;
-    /*
-     * From 2008-03-10 we don't set browser.sessionstore.enabled to false anymore
-     * we use nsISessionStore service in TMP.
-     * if we use TMP session manager we set all other sessionstore pref to false to disable SessionRestore
-     *
-     * Bug 449596 - remove the browser.sessionstore.enabled pref
-     * so here we don't set it to true, we just clear user pref to the default
-     * if the pref exist in firefox this set the pref to true
-     * if the pref don't exist this will remove the pref
-     */
-    const TMP_SS_MANAGER = "extensions.tabmix.sessions.manager";
-    const TMP_SS_CRASHRECOVERY = "extensions.tabmix.sessions.crashRecovery";
-    var TMP_manager_enabled = Services.prefs.getBoolPref(TMP_SS_MANAGER);
-    var TMP_crashRecovery_enabled = Services.prefs.getBoolPref(TMP_SS_CRASHRECOVERY);
-    if (!TMP_manager_enabled && !TMP_crashRecovery_enabled) {
-      return;
-    }
-
-    TabmixSvc.sm.settingPreference = true;
-    // if session manager extension is install disable TMP session manager
-    if (msgNo == -1 || Tabmix.extensions.sessionManager) {
-      // update session manager settings according to current tabmix settings
-      if (TMP_manager_enabled) {
-        Services.prefs.setBoolPref(TMP_SS_MANAGER, false);
-        switch (Tabmix.prefs.getIntPref("sessions.onStart")) {
-          case 0:
-            Services.prefs.setIntPref("extensions.sessionmanager.startup", 0);
-            Services.prefs.setIntPref("browser.startup.page", 3);
-            break;
-          case 1:
-            Services.prefs.setIntPref("extensions.sessionmanager.startup", 1);
-            break;
-            // default: nothing to do
-        }
-        switch (Tabmix.prefs.getIntPref("sessions.onClose")) {
-          case 0:
-            Services.prefs.setIntPref("extensions.sessionmanager.backup_session", 1);
-            break;
-          case 1:
-            Services.prefs.setIntPref("extensions.sessionmanager.backup_session", 2);
-            break;
-          default:
-            Services.prefs.setIntPref("extensions.sessionmanager.backup_session", 0);
-        }
-      }
-      if (TMP_crashRecovery_enabled) {
-        Services.prefs.setBoolPref(TMP_SS_CRASHRECOVERY, false);
-        Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", true);
-      }
-      TabmixSvc.sm.settingPreference = false;
-    } else if (this.isSessionStoreEnabled()) {
-      // ask the user to choose between TMP session manager and sessionstore
-      // we use non modal promptService on start up, so we disabled Tabmix session manager to let the startup
-      // process continue and set the appropriate preference after the dialog prompt dismissed.
-      if (start) {
-        Services.prefs.setBoolPref(TMP_SS_MANAGER, false);
-        Services.prefs.setBoolPref(TMP_SS_CRASHRECOVERY, false);
-      }
-      let title = "TabMix " + TabmixSvc.getSMString("sm.title");
-      let msg = start ? TabmixSvc.getSMString("sm.disable.msg") + "\n\n" : "";
-      msg += TabmixSvc.getSMString("sm.disable.msg" + msgNo);
-      let buttons = TabmixSvc.getDialogStrings("Yes", "No").join("\n");
-      let self = this;
-      /** @param {TabmixNS.promptServiceReturnType} aResult */
-      let callBack = function(aResult) {
-        if (msgNo == 1 && aResult.button == 1 || msgNo == 2 && aResult.button === 0) {
-          self.setSessionRestore(false);
-          Services.prefs.setBoolPref(TMP_SS_MANAGER, TMP_manager_enabled);
-          Services.prefs.setBoolPref(TMP_SS_CRASHRECOVERY, TMP_crashRecovery_enabled);
-        } else {
-          // we don't change any of sessionstore default setting
-          // the user will be ask on exit what to do.
-          // browser.warnOnQuit default value is true
-          Services.prefs.setBoolPref(TMP_SS_MANAGER, false);
-          Services.prefs.setBoolPref(TMP_SS_CRASHRECOVERY, false);
-        }
-        TabmixSvc.sm.settingPreference = false;
-      };
-      let result = Tabmix.promptService([Tabmix.BUTTON_OK, Tabmix.HIDE_MENUANDTEXT, Tabmix.HIDE_CHECKBOX],
-        [title, msg, "", "", buttons], window, start ? callBack : undefined);
-      if (!start)
-        callBack(result);
-    } else if (!Services.prefs.prefHasUserValue("browser.warnOnQuit ")) {
-      // browser.warnOnQuit default value is true
-      Services.prefs.setBoolPref("browser.warnOnQuit", false);
-      TabmixSvc.sm.settingPreference = false;
-    }
-  },
-
-  isSessionStoreEnabled() {
-    return Services.prefs.getIntPref("browser.startup.page") == 3 ||
-      Services.prefs.getBoolPref("browser.sessionstore.resume_from_crash");
-  },
-
   afterSwitchThemes: false,
   // we call this only one time on window load
   // and store the value in Tabmix.isWindowAfterSessionRestore
@@ -213,11 +97,6 @@ var TMP_SessionStore = {
     // When we close all browser windows without exit (non browser windows are opened)
     // Firefox reopen last closed window when a browser window opens
     } else if (Tabmix.numberOfWindows(false, null) > 1) {
-      if ((Tabmix.prefs.getBoolPref("sessions.manager") ||
-           Tabmix.prefs.getBoolPref("sessions.crashRecovery")) &&
-          SessionStore.getClosedWindowCount() > 0) {
-        Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true);
-      }
       afterSessionRestore = true;
     } else if (this.afterSwitchThemes) {
       afterSessionRestore = true;
@@ -952,6 +831,14 @@ var TMP_ClosedTabs = {
   removeAllClosedTabs() {
     if (Tabmix.isVersion(1350)) {
       const closedGroups = SessionStore.getClosedTabGroups({closedTabsFromClosedWindows: false});
+      if (Tabmix.isVersion(1360) && SessionStore.getClosedTabCountFromClosedWindows()) {
+        const uniqueGroups = new Map();
+        const closedTabsData = SessionStore.getClosedTabDataFromClosedWindows();
+        for (const {sourceClosedId, closedInTabGroupId: id} of closedTabsData) {
+          uniqueGroups.set(`${sourceClosedId},${id}`, {tabs: [{sourceClosedId}], id});
+        }
+        closedGroups.push(...uniqueGroups.values());
+      }
       for (const group of closedGroups) {
         const tabData = group.tabs[0];
         if (tabData) {
@@ -1061,10 +948,6 @@ var TMP_ClosedTabs = {
       aBlankTabToReuse = cTab;
     }
 
-    if (TMP_TabView.exist("prepareUndoCloseTab")) {
-      TabView.prepareUndoCloseTab(tabToRemove);
-    }
-
     if (tabToRemove) {
       tabToRemove.collapsed = true;
     }
@@ -1131,10 +1014,6 @@ var TMP_ClosedTabs = {
     // restore tab content
     SessionStore.setTabState(newTab, state);
 
-    if (TMP_TabView.exist("afterUndoCloseTab")) {
-      TabView.afterUndoCloseTab();
-    }
-
     const fromSameWindow = aSource === window || aSource.sourceWindowId === window.__SSi;
     // don't restore position for tabs from other windows
     const restorePosition = fromSameWindow && Tabmix.prefs.getBoolPref("undoClosePosition");
diff --git a/addon/chrome/content/tab/tab.js b/addon/chrome/content/tab/tab.js
index b16bc19b6..97faefb3f 100644
--- a/addon/chrome/content/tab/tab.js
+++ b/addon/chrome/content/tab/tab.js
@@ -168,11 +168,6 @@ var TabmixTabbar = {
     // for light weight themes
     Tabmix.setItem("main-window", "tabmix_lwt", isMultiRow || this.position == 1 || null);
 
-    for (const tab of tabBar.allTabs) {
-      // treeStyleTab code come after SessionManager... look in extensions.js
-      TabmixSessionManager.updateTabProp(tab);
-    }
-
     if (tabBar.mCloseButtons == 5)
       tabBar._updateCloseButtons(true);
 
@@ -1512,46 +1507,9 @@ window.gTMPprefObserver = {
           Tabmix.prefs.setBoolPref("undoClose", value > 0);
         break;
       }
-      /*
-      // ##### disable Session Manager #####
-      case "browser.warnOnQuit":
-      case "browser.sessionstore.resume_from_crash":
-        if (!Services.prefs.getBoolPref(prefName))
-          return;
-
-        var TMP_sessionManager_enabled = Tabmix.prefs.getBoolPref("sessions.manager") ||
-                         Tabmix.prefs.getBoolPref("sessions.crashRecovery");
-        if (TMP_sessionManager_enabled)
-          Services.prefs.setBoolPref(prefName, false);
-        break;
-      case "browser.startup.page":
-        if (Services.prefs.getIntPref(prefName) != 3)
-          return;
-        TMP_sessionManager_enabled = Tabmix.prefs.getBoolPref("sessions.manager") ||
-                         Tabmix.prefs.getBoolPref("sessions.crashRecovery");
-
-        if (TMP_sessionManager_enabled)
-          Services.prefs.setIntPref(prefName, 1);
-        break;
-      case "extensions.tabmix.sessions.manager":
-      case "extensions.tabmix.sessions.crashRecovery":
-        TMP_SessionStore.setService(2, false);
-        /* falls through * /
-      case "extensions.tabmix.sessions.save.closedtabs":
-      case "extensions.tabmix.sessions.save.history":
-      case "extensions.tabmix.sessionToolsMenu":
-      case "extensions.tabmix.closedWinToolsMenu":
-        TabmixSessionManager.updateSettings();
-        break;
-      */
       case "extensions.tabmix.closedWinToolsMenu":
         document.getElementById("tabmix-historyUndoWindowMenu").hidden = !Services.prefs.getBoolPref(prefName);
         break;
-      case "extensions.tabmix.sessions.save.permissions":
-        for (const tab of gBrowser.tabs) {
-          TabmixSessionManager.updateTabProp(tab);
-        }
-        break;
       case "extensions.tabmix.optionsToolMenu":
         document.getElementById("tabmix-menu").hidden = !Services.prefs.getBoolPref(prefName);
         break;
@@ -2028,17 +1986,6 @@ window.gTMPprefObserver = {
           --tabmix-multirow-margin: ${blockMargin.margin};
         }`
     );
-
-    /* TODO: - need to test
-
-    this was disable to fix issue 100
-    // maybe i can set padding-block to top row and padding bottom on bottom rows
-    Unable to click a tab top of the screen when there's more than one row of tabs #10
-    */
-    // #tabbrowser-tabs[tabmix-multibar] #tabbrowser-arrowscrollbox {
-    //   padding-block: 3px;
-    // }
-
     const customtitlebar = Tabmix.isVersion(1350) ? "customtitlebar" : "tabsintitlebar";
     this.insertRule(
       `#main-window[${customtitlebar}][tabmix-tabbaronbottom] .tabbrowser-tabbox,
@@ -2581,9 +2528,6 @@ window.gTMPprefObserver = {
       Tabmix.prefs.setBoolPref("tabbar.dblclick_changesize", val);
       Tabmix.prefs.clearUserPref("dblClickTabbar_changesize");
     }
-    // 2014-12-25
-    // don't sync sessions.onStart.sessionpath
-    Services.prefs.clearUserPref("services.sync.prefs.sync.extensions.tabmix.sessions.onStart.sessionpath");
     // 2015-07-15
     if (Tabmix.prefs.prefHasUserValue("loadFolderAndReplace")) {
       Tabmix.prefs.setBoolPref("loadBookmarksAndReplace", Tabmix.prefs.getBoolPref("loadFolderAndReplace"));
@@ -2828,7 +2772,6 @@ TabmixProgressListener = {
           tab.removeAttribute("dontremovevisited");
 
         if (!tab.hasAttribute("busy")) {
-          TabmixSessionManager.tabLoaded(tab);
           // we need to remove width from tabs with url label from here
           if (tab.hasAttribute("width")) {
             Tabmix.tablib.onTabTitleChanged(tab, aBrowser);
diff --git a/addon/chrome/content/tabmix.js b/addon/chrome/content/tabmix.js
index 5a6878adc..89dbfa806 100644
--- a/addon/chrome/content/tabmix.js
+++ b/addon/chrome/content/tabmix.js
@@ -39,7 +39,6 @@ Tabmix.startup = function TMP_startup() {
 Tabmix.beforeDelayedStartup = function() {
   if (this.isFirstWindow) {
     ChromeUtils.importESModule("chrome://tabmix-resource/content/extensions/AddonManager.sys.mjs");
-    TMP_SessionStore.setService(1, true);
   }
 };
 
@@ -126,8 +125,6 @@ Tabmix.afterDelayedStartup = function() {
     }
   }, 250);
 
-  TMP_TabView.init();
-
   TMP_Places.onDelayedStartup();
 
   this.navToolbox.init();
@@ -226,10 +223,6 @@ var TMP_eventListener = {
       case "TabAttrModified":
         this.onTabAttrModified(aEvent);
         break;
-      case "SSWindowClosing":
-        window.removeEventListener("SSWindowClosing", this);
-        TabmixSessionManager.onWindowClose(!Tabmix.numberOfWindows());
-        break;
       case "SSWindowRestored":
         TMP_ClosedTabs.setButtonDisableState();
         this.onSSWindowRestored();
@@ -267,9 +260,6 @@ var TMP_eventListener = {
         this.onFullScreen(enterFS);
         break;
       }
-      case "PrivateTab:PrivateChanged":
-        TabmixSessionManager.privateTabChanged(aEvent);
-        break;
     }
   },
 
@@ -309,7 +299,6 @@ var TMP_eventListener = {
       Tabmix.lazy_import(Tabmix, "MergeWindows", "MergeWindows", "MergeWindows");
       Tabmix.lazy_import(Tabmix, "autoReload", "AutoReload", "AutoReload");
       Tabmix.lazy_import(Tabmix, "renameTab", "RenameTab", "RenameTab");
-      Tabmix.lazy_import(TabmixSessionManager, "_decode", "Decode", "Decode");
       Tabmix.lazy_import(Tabmix, "docShellCapabilities",
         "DocShellCapabilities", "DocShellCapabilities");
       Tabmix.lazy_import(Tabmix, "Utils", "Utils", "TabmixUtils");
@@ -317,7 +306,7 @@ var TMP_eventListener = {
       Tabmix.assert(ex);
     }
 
-    this._tabEvents = ["SSTabRestoring", "SSTabRestored", "PrivateTab:PrivateChanged",
+    this._tabEvents = ["SSTabRestoring", "SSTabRestored",
       "TabOpen", "TabClose", "TabSelect", "TabMove", "TabUnpinned",
       "TabAttrModified", "TabBrowserInserted"];
 
@@ -358,7 +347,6 @@ var TMP_eventListener = {
 
   onWindowOpen: function TMP_EL_onWindowOpen() {
     window.addEventListener("unload", this);
-    window.addEventListener("SSWindowClosing", this);
     window.addEventListener("fullscreen", this, true);
 
     Tabmix.Utils.initMessageManager(window);
@@ -523,22 +511,6 @@ var TMP_eventListener = {
     document.getElementById("tabmix-menu").hidden = !Tabmix.prefs.getBoolPref("optionsToolMenu");
     document.getElementById("tabmix-historyUndoWindowMenu").hidden = !Tabmix.prefs.getBoolPref("closedWinToolsMenu");
 
-    // ##### disable Session Manager #####
-    // TabmixSessionManager.updateSettings();
-
-    Tabmix.changeCode(tabBar, "gBrowser.tabContainer._updateCloseButtons")._replace(
-      TabmixSvc.isZen ?
-        'this.visibleTabs[gBrowser._numVisiblePinTabs];' :
-        Tabmix.isVersion(1300) ?
-          'this.visibleTabs[gBrowser.pinnedTabCount];' :
-          'this._getVisibleTabs()[gBrowser._numPinnedTabs];',
-      'TMP_TabView.checkTabs(Tabmix.visibleTabs.tabs);'
-    ).toCode(false, tabBar, "tabmix_updateCloseButtons");
-
-    Tabmix.setNewFunction(tabBar, "_updateCloseButtons", Tabmix._updateCloseButtons);
-    // @ts-expect-error - it is ok to delete this function
-    delete Tabmix._updateCloseButtons;
-
     if (Tabmix.isVersion(1300) && window.SidebarController.sidebarVerticalTabsEnabled) {
       tabBar._updateCloseButtons();
     }
@@ -792,7 +764,6 @@ var TMP_eventListener = {
   onTabClose: function TMP_EL_onTabClose(aEvent) {
     // aTab is the tab we are closing now
     var tab = aEvent.target;
-    tab._tPosInGroup = TMP_TabView.getTabPosInCurrentGroup(tab);
     TMP_LastTab.tabs = null;
     TMP_LastTab.detachTab(tab);
     TMP_Places.updateRestoringTabsList(tab);
@@ -843,10 +814,6 @@ var TMP_eventListener = {
 
   // TGM extension use it
   onTabClose_updateTabBar: function TMP_EL_onTabClose_updateTabBar(aTab) {
-    // if the tab is not in the current group we don't have to do anything here.
-    if (typeof aTab._tPosInGroup == "number" && aTab._tPosInGroup == -1)
-      return;
-
     var tabBar = gBrowser.tabContainer;
     function _updateTabstrip() {
       // underflow not always fires when Classic theme restorer installed
@@ -906,7 +873,6 @@ var TMP_eventListener = {
     }
 
     TMP_LastTab.OnSelect();
-    TabmixSessionManager.tabSelected(true);
   },
 
   updateDisplay(tab) {
@@ -928,7 +894,6 @@ var TMP_eventListener = {
     // moveTabTo call _positionPinnedTabs when pinned tab moves
     if (!tab.pinned)
       TabmixTabbar.setFirstTabInRow();
-    TabmixSessionManager.tabMoved(tab, aEvent.detail, tab._tPos);
   },
 
   onTabUnpinned: function TMP_EL_onTabUnpinned(aEvent) {
@@ -1037,13 +1002,8 @@ var TMP_eventListener = {
 
   onWindowClose: function TMP_EL_onWindowClose() {
     window.removeEventListener("unload", this);
-    window.removeEventListener("SSWindowClosing", this);
     window.removeEventListener("SSWindowRestored", this);
 
-    // notice that windows enumerator don't count this window
-    var isLastWindow = Tabmix.numberOfWindows() === 0;
-
-    TabmixSessionManager.shutDown(true, isLastWindow, true);
     Tabmix.closedObjectsUtils.removeObservers();
     TabmixTabClickOptions.toggleEventListener(false);
     TabmixContext.toggleEventListener(false);
@@ -1064,8 +1024,6 @@ var TMP_eventListener = {
     gBrowser.tabContainer.removeEventListener("wheel", this, true);
     gBrowser.tabContainer.arrowScrollbox.disconnectTabmix();
 
-    if (TMP_TabView.installed)
-      TMP_TabView._resetTabviewFrame();
     gBrowser.tabpanels.removeEventListener("click", Tabmix.contentAreaClick._contentLinkClick, true);
 
     gTMPprefObserver.removeObservers();
@@ -1184,3 +1142,13 @@ Tabmix._deferredInitialized = (function() {
 
   return deferred;
 }());
+
+/**
+ * add backward compatibility getters to some of the main object/function/variable
+ * that we changed from version 0.3.8.5pre.110123a
+ * we only add this getters to objects the aren't in the name space
+ */
+Tabmix.backwardCompatibilityGetter(window, "TabDNDObserver", "TMP_tabDNDObserver");
+Tabmix.backwardCompatibilityGetter(window, "gSingleWindowMode", "Tabmix.singleWindowMode");
+Tabmix.backwardCompatibilityGetter(window, "TM_init", "Tabmix.startup");
+Tabmix.backwardCompatibilityGetter(window, "tabscroll", "TabmixTabbar.scrollButtonsMode");
diff --git a/addon/chrome/content/tabmix.xhtml b/addon/chrome/content/tabmix.xhtml
index ae64c6c93..5902654a0 100644
--- a/addon/chrome/content/tabmix.xhtml
+++ b/addon/chrome/content/tabmix.xhtml
@@ -21,11 +21,6 @@
     Tabmix.initialization.run("onContentLoaded", gBrowser.tabContainer);
   </script>
 
-  <commandset id="mainCommandSet">
-    <command id="TabmixSessionUtils:SaveThisWindow" observes="tmp_disableSave"/>
-    <command id="TabmixSessionUtils:SaveAllWindow" observes="tmp_disableSave"/>
-  </commandset>
-
    <!-- Menu in Tools Menu -->
    <menupopup id="menu_ToolsPopup">
       <menuitem id="tabmix-menu" label="&page.header.title;…" insertbefore="prefSep" tmp_iconic="menuitem-iconic tabmix-menu-icon"/>
@@ -35,7 +30,6 @@
             observes="tmp_closedwindows"
             tmp_iconic="menu-iconic closedwindows-icon">
          <menupopup id="tabmix-historyUndoWindowPopup"
-            context="tm_sessionmanagerContextMenu"
             placespopup="true"/>
       </menu>
    </menupopup>
@@ -180,12 +174,8 @@
 
   <!-- Tabmix Plus broadcasterset -->
   <broadcasterset id="mainBroadcasterSet" insertafter="mainKeyset">
-    <broadcaster id="tmp_menu_AllWindows" hidden="true"/>
-    <broadcaster id="tmp_contextmenu_ThisWindow" hidden="true"/>
-    <broadcaster id="tmp_contextmenu_AllWindows" hidden="true"/>
     <broadcaster id="tmp_closedwindows"/>
     <broadcaster id="tmp_undocloseButton"/>
-    <broadcaster id="tmp_sessionmanagerButton"/>
     <broadcaster id="tmp_disableSave"/>
     <broadcaster id="tabmix_flowing"/>
   </broadcasterset>
diff --git a/addon/chrome/content/utils.js b/addon/chrome/content/utils.js
index 6ef7553d1..512be2d97 100644
--- a/addon/chrome/content/utils.js
+++ b/addon/chrome/content/utils.js
@@ -176,52 +176,6 @@ var Tabmix = {
     }
   },
 
-  promptService(intParam, strParam, aWindow, aCallBack) {
-    var dpb = Cc["@mozilla.org/embedcomp/dialogparam;1"]
-        .createInstance(Ci.nsIDialogParamBlock);
-    // intParam[0] - default button accept=0, cancel=1, extra1=2
-    // intParam[1] - show menuList= 1 , show textBox= 0, hide_both= 2
-    // intParam[2] - set checkbox checked  true=1 , false=0, hide=2
-    // intParam[3] - flag  - for menuList contents: flag to set menu selected item
-    //                     - for textBox rename: 1 , save: 0
-    ///XXX temp fix
-    // intParam[4] - flag  - 1 - use Tabmix.Sessions.createMenuForDialog
-
-    // we use non modal dialog when we call for prompt on startup
-    // when we don't have a callBack function use modal dialog
-    const modal = typeof aCallBack != "function";
-    var i;
-    for (i = 0; i < intParam.length; i++)
-      dpb.SetInt(i, intParam[i] ?? 0);
-    // strParam labels for: title, msg, testbox.value, checkbox.label, buttons[]
-    // buttons[]: labels array for each button
-    for (i = 0; i < strParam.length; i++)
-      dpb.SetString(i, strParam[i] ?? "");
-
-    if (typeof aWindow == "undefined") {
-      try {
-        aWindow = window;
-      } catch {
-        // @ts-expect-error - Services.ww.openWindow can be called with parent = null
-        aWindow = null;
-      }
-    }
-
-    // we add dependent to features to make this dialog float over the window on start
-    var dialog = Services.ww.openWindow(aWindow,
-      "chrome://tabmixplus/content/dialogs/promptservice.xhtml", "", "centerscreen" +
-           (modal ? ",modal" : ",dependent"), dpb);
-    if (!modal)
-      dialog._callBackFunction = aCallBack;
-
-    return {
-      button: dpb.GetInt(4),
-      checked: dpb.GetInt(5) == this.CHECKBOX_CHECKED,
-      label: dpb.GetString(5),
-      value: dpb.GetInt(6)
-    };
-  },
-
   windowEnumerator: function Tabmix_windowEnumerator(aWindowtype) {
     if (typeof aWindowtype == "undefined")
       aWindowtype = "navigator:browser";
@@ -233,9 +187,7 @@ var Tabmix = {
     var count = 0;
     while (enumerator.hasMoreElements()) {
       let win = enumerator.getNext();
-      let isClosed = "TabmixSessionManager" in win &&
-          win.TabmixSessionManager.windowClosed;
-      if (!isClosed) {
+      if (!win.closed) {
         count++;
         if (!all && count == 2)
           break;
diff --git a/addon/chrome/locale/bg-BG/misc.dtd b/addon/chrome/locale/bg-BG/misc.dtd
index 1f718f016..447348236 100644
--- a/addon/chrome/locale/bg-BG/misc.dtd
+++ b/addon/chrome/locale/bg-BG/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Избиране на време от списъка или въвеждане на собствено време">
 <!ENTITY specifyreload.label "Определяне на времето за презареждане">
-<!ENTITY sanitizer.entry "Записани сесии">
-<!ENTITY sanitizer.entry.accesskey "З">
-<!ENTITY sanitizer.entry.confirm "Сигурни ли сте, че искате да изтриете ВСИЧКИ запазени сесии, включително и архивираните?">
diff --git a/addon/chrome/locale/bg-BG/pref-tabmix.dtd b/addon/chrome/locale/bg-BG/pref-tabmix.dtd
index dd5ce7c9f..a7c461f25 100644
--- a/addon/chrome/locale/bg-BG/pref-tabmix.dtd
+++ b/addon/chrome/locale/bg-BG/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Показване на началната страница">
 <!ENTITY startupBlankPage.label "Показване на празна страница">
 <!ENTITY startupLastSession1.label "Показване на прозорците и подпрозорците от последния път">
-<!ENTITY ss.enable.label "Използване на вградената функция на Firefox за възстановяване на сесии">
-<!ENTITY ss.enable.tooltip "Премахнете тази отметка, за да позволите използването на Мениджъра на сесии Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Допълнителни настройки">
 <!ENTITY ss.advanced_setting.warning "Не променяйте тези параметри, ако не знаете какво точно правите">
 <!ENTITY ss.interval "Минимален интервал между запазване на сесии">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "За всички сайтове">
 <!ENTITY ss.privacy_level.unencrypted "Само за нешифровани сайтове">
 <!ENTITY ss.privacy_level.nosites "Без записване">
-<!ENTITY sessionManger.enable "Включване на Мениджъра на сесии">
 <!ENTITY crashRecovery.enable "Възстановяване на сесия след крах на Firefox">
-<!ENTITY sm.StartExit "Пускане/Изход">
-<!ENTITY sm.restore "Възстановяване">
-<!ENTITY sm.preserve "Запазване">
 <!ENTITY sm.start "При пускането на браузъра:">
-<!ENTITY sm.start.restore "Възстановяване на сесията">
-<!ENTITY sm.start.ask "Потвърждение преди възстановяването">
-<!ENTITY sm.start.nothing "Без възстановяване на сесията">
-<!ENTITY sm.exit "При изход от браузъра:">
-<!ENTITY sm.exit.save "Запис на сесията">
-<!ENTITY sm.exit.ask "Потвърждение преди записа">
-<!ENTITY sm.exit.nothing "Без запис">
-<!ENTITY sm.startup "Избор на начална сесия:">
-<!ENTITY sm.lastsession "Последната сесия">
-<!ENTITY sm.previouslast "Сесията преди последната">
-<!ENTITY sm.chooseifempty "Избор на друга, ако избраната сесия е празна">
-<!ENTITY sm.restore.options "При възстановяването на сесии:">
-<!ENTITY sm.restore.overwrite "Замяна на съществуващите прозорци">
-<!ENTITY sm.restore.overwriteTabs "и подпрозорци">
-<!ENTITY sm.restore.closedWinList "Запис на прозорците в списъка на затворени прозорци">
-<!ENTITY sm.restore.merge "Обединяване на няколко прозорци в един">
-<!ENTITY sm.restore.bypassCache "Игнориране на кеша при възстановяване">
-<!ENTITY sm.notrestore.label "Когато не се възстановява при стартирането">
-<!ENTITY sm.restorePinned1.label "Възстановяване на забодените от последния път подпрозорци">
 <!ENTITY sm.preserve.options "Запазване на следните параметри на подпрозорците:">
 <!ENTITY sm.preserve.history "Историята">
 <!ENTITY sm.preserve.protect "Статуса на защита">
 <!ENTITY sm.preserve.locked "Статуса на заключване">
 <!ENTITY sm.preserve.permission "Разрешенията">
 <!ENTITY sm.preserve.scroll1 "Позицията при прелистването">
-<!ENTITY sm.restore.winOptions "Запазване на следните параметри на прозорците:">
-<!ENTITY sm.restore.selectedTab "Активен подпрозорец">
-<!ENTITY sm.restore.closedTabs "Списък на затворени подпрозорци">
 <!ENTITY incompatible.extensions "Някои от добавките Ви са несъвместими с Таб Mix Plus. Препоръчително е да изключите или деинсталирате тези добавки.">
 <!ENTITY incompatible.button.label "Показване на списъка">
diff --git a/addon/chrome/locale/bg-BG/session-manager.properties b/addon/chrome/locale/bg-BG/session-manager.properties
deleted file mode 100644
index e11d57d84..000000000
--- a/addon/chrome/locale/bg-BG/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Запазване на списъка със затворените в тази сесия подпрозорци
-sm.button.continue.label=Продължаване
-sm.button.continue.accesskey=П
-sm.askBeforeSave.title=Мениджър на сесиите - Запис
-sm.askBeforeSave.msg0=Искате ли да запишете текущата сесия?
-sm.askBeforeSave.msg2=Само неповерителните прозорци ще се запишат на диска
-sm.askBeforeSave.msg1=Ако не я запишете, то при следващото пускане на браузъра \"Последна сесия\" ще бъде празна.
-sm.askBeforeSave.button0.label=Запис на сесията
-sm.askBeforeSave.button0.accesskey=З
-sm.askBeforeSave.button1.label=Отказ
-sm.askBeforeSave.button1.accesskey=Б
-sm.corrupted.title=Мениджър на сесиите - базата от данни е повредена
-sm.corrupted.msg0=Повреден файл session.rdf - Мениджърът на сесиите не може да зареди базата от данни.
-sm.corrupted.msg1=Файлът session.rdf ще бъде изтрит, а копие с името session.old се намира в папката на профила Ви.
-sm.areYouSure.msg=Наистина ли искате да продължите?
-sm.canChooseStartup.msg=Може да изберете нова начална сесия от списъка:
-sm.addtoStartup.title=Мениджър на сесиите - добавяне към началната сесия
-sm.addtoStartup.msg.windows=Ще добавите прозорец(и) към началната сесия:
-sm.addtoStartup.msg.tabs=Ще добавите подпрозорец(и) към началната сесия:
-sm.addtoStartup.button0.label=Добавяне към сесията
-sm.addtoStartup.button0.accesskey=Д
-sm.addtoStartup.button1.label=Отказ
-sm.addtoStartup.button1.accesskey=Б
-sm.replaceStartup.title=Мениджър на сесиите - презаписване на началната сесия
-sm.replaceStartup.msg=Ще замените началната сесия:
-sm.replaceStartup.button0.label=Замяна на сесията
-sm.replaceStartup.button0.accesskey=З
-sm.replaceStartup.button1.label=Отказ
-sm.replaceStartup.button1.accesskey=Б
-sm.removeStartup.title=Мениджър на сесиите - изтриване на началната сесия
-sm.removeStartup.msg0=Ще изтриете началната сесия:
-sm.removeStartup.msg1=От списъка изберете нова сесия, която да стане начална:
-sm.removeStartup.button0.label=Изтриване
-sm.removeStartup.button0.accesskey=И
-sm.removeStartup.button1.label=Отказ
-sm.removeStartup.button1.accesskey=Б
-sm.title=Мениджър на сесиите
-sm.dontSaveBlank.msg=Мениджърът на сесиите не записва празни прозорци
-sm.sessionSave.error=Грешка в Мениджъра на сесиите - текущата сесия не е записана
-sm.sessionName.title.rename=Мениджър на сесиите - преименуване на сесията
-sm.sessionName.title.saveprevious=Мениджър на сесиите - запис на сесията
-sm.sessionName.title.savethiswindow=Мениджър на сесиите - запис на текущия прозорец
-sm.sessionName.title.saveallwindows=Мениджър на сесиите - запис на всички прозорци
-sm.sessionName.msg0=Въвеждане на име на сесията:
-sm.sessionName.msg1=Името трябва да се състои от поне една буква или цифра.
-sm.sessionName.msg2=Това име вече се използва!
-sm.sessionName.msg3=Наистина ли искате да замените сесията?
-sm.sessionName.button0.label=Преименуване на сесията
-sm.sessionName.button0.accesskey=П
-sm.sessionName.button1.label=Отказ
-sm.sessionName.button1.accesskey=Б
-sm.session.empty=празно
-sm.session.tabs=подпр.
-sm.session.windows=пр.
-sm.removeAll.title.session=Мениджър на сесиите - изтриване на всички записани сесии
-sm.removeAll.title.closedwindow=Мениджър на сесиите - изтриване на всички затворени прозорци
-sm.removeAll.msg0=Сигурни ли сте, че искате да изтриете всички записани сесии?
-sm.removeAll.msg1=Ако изберете \"Изтриване\", то за начална сесия ще бъде избрана \"Последна сесия\".
-sm.removeAll.msg2=Сигурни ли сте, че искате да изтриете всички затворени прозорци?
-sm.sessionMenu.last=Последна сесия
-sm.sessionMenu.lastDefault=Последна сесия - по подразбиране
-sm.sessionMenu.lastgood=Последна работеща сесия
-sm.sessionMenu.previous=Сесията преди последната
-sm.sessionMenu.crashed=Повредена сесия
-sm.afterCrash.title=Мениджър на сесиите - възстановяване след крах
-sm.afterCrash.chkbox.label=Включване на Мениджъра на сесии
-sm.afterCrash.msg0=Последната сесия претърпя крах!
-sm.afterCrash.msg0.again=При работа с последната повредена сесия отново се появи проблем!
-sm.afterCrash.msg1=Изберете сесия за възстановяване от списъка:
-sm.afterCrash.msg2=Изберете как да продължите
-sm.afterCrash.msg3=В момента Мениджърът на сесиите е изключен. Включвайки го, ще можете да възстановявате повредените, затворените и запазените сесии, а също и затворените прозорци.
-sm.afterCrash.msg4=Повредената сесия може да я възстановите също така през меното на Мениджъра на сесии.
-sm.afterCrash.msg5=но нищо не бе запазено.
-sm.afterCrash.msg6=но няма никакви отворени прозорци в повредената сесия
-sm.afterCrash.msg7=От списъка на затворени прозорци изберете прозорец за възстановяване
-sm.afterCrash.msg8=(затворените прозорци могат да бъдат възстановени и по-късно - от менюто \"Затворени прозорци\")
-sm.afterCrash.msg9=Повредената сесия е празна!
-sm.afterCrash.msg10=Мениджърът на сесиите не намери сесии за възстановяване.
-sm.afterCrash.button0.label=Възстановяване на сесия
-sm.afterCrash.button0.accesskey=я
-sm.afterCrash.button0.crashed.label=Възстановяване на повредена сесия
-sm.afterCrash.button0.crashed.accesskey=п
-sm.afterCrash.button1.label=Отказ
-sm.afterCrash.button1.accesskey=Б
-sm.start.title=Мениджър на сесиите - възстановяване на сесия
-sm.start.chkbox.label=Възстановяване на сесия след крах на Firefox
-sm.start.msg0=Началната сесия е празна!
-sm.start.msg1=Възстановяването на сесия след крах на Firefox e изключено. Включвайки го, ще може да възстановявате повредени сесии.
-sm.start.msg2=Грешка при търсенето на зададената от Вас начална сесия - няма запазена такава.
-sm.restoreError.msg0=Грешка във файла на Мениджъра на сесиите!
-sm.restoreError.msg1=Изтриване на сесията, която се опитвахте да възстановите
-sm.disable.msg=Firefox има вградена функция за възстановяване на сесии.
-sm.disable.msg1=Искате ли да включите вградената функция за възстановяване на сесии и да изключите Мениджъра на сесии Tab Mix Plus?
-sm.disable.msg2=Искате ли да включите Мениджъра на сесии Tab Mix Plus и да изключите вградената функция за възстановяване на сесии?
-sm.tabview.hiddengroups=В скритите групи са възстановени още подпрозорци.
-sm.tabview.hiddengroups.removed=Премахнати са групите със скрити подпрозорци.
-sm.tabview.removed=Групирането на подпрозорци (Панорама) е премахнато от Firefox.
-sm.tabview.removed.learnMore.label=Помощ
-sm.tabview.removed.learnMore.accesskey=П
-sm.tabview.install.label=Инсталиране на разширението Tab Groups
-sm.tabview.install.accesskey=И
-sm.tabview.backup.session=Записана сесия, запазване с данните за групите
-sm.tabview.backup.crashed=Повредена сесия, запазване с данните за групите
-sm.tabview.backup.msg=Мениджърът на сесии е запазил архивно копие на сесията Ви.
-sm.bookmarks.historySession=Сесия на историята
-sm.bookmarks.closedWindow=Затворен прозорец
-sm.bookmarks.sessionFolder=Сесии на Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Прозорец %S
diff --git a/addon/chrome/locale/bg-BG/tabmix.dtd b/addon/chrome/locale/bg-BG/tabmix.dtd
index d3f76959e..941cef616 100644
--- a/addon/chrome/locale/bg-BG/tabmix.dtd
+++ b/addon/chrome/locale/bg-BG/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Изтриване от списъка">
 <!ENTITY deletelist.accesskey "И">
 <!ENTITY settings.label "Настройки">
-<!ENTITY saveWindow.label "Запазване на този прозорец">
-<!ENTITY saveAllWindows.label "Запазване на всички прозорци">
 <!ENTITY sm.context.overwrite "Възстановяване чрез замяна на съществуващия(те) прозорец(и)">
 <!ENTITY sm.context.overwrite.key "ъ">
 <!ENTITY sm.context.restore.new "Възстановяване в нов(и) прозорец(и)">
diff --git a/addon/chrome/locale/ca/misc.dtd b/addon/chrome/locale/ca/misc.dtd
index a32d18b14..7531c29ec 100644
--- a/addon/chrome/locale/ca/misc.dtd
+++ b/addon/chrome/locale/ca/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Seleccioneu una freqüència de la llista o escriviu-ne una de pròpia">
 <!ENTITY specifyreload.label "Especifiqueu la freqüència per tornar a carregar">
-<!ENTITY sanitizer.entry "Sessions desades del Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Esteu segur que voleu suprimir TOTES les sessions desades, incloses les còpies de seguretat?">
diff --git a/addon/chrome/locale/ca/pref-tabmix.dtd b/addon/chrome/locale/ca/pref-tabmix.dtd
index 9bf387be7..06fe0a90f 100644
--- a/addon/chrome/locale/ca/pref-tabmix.dtd
+++ b/addon/chrome/locale/ca/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Mostra una pàgina en blanc">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Utilitza la funció de restauració de sessió integrada al Firefox">
-<!ENTITY ss.enable.tooltip "Desmarqueu aquesta opció per permetre l&apos;ús del Gestor de sessions del Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Paràmetres avançats">
 <!ENTITY ss.advanced_setting.warning "No canvieu aquests paràmetres si no sabeu què esteu fent">
 <!ENTITY ss.interval "Interval de temps mínim entre dos desaments d&apos;estat">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Tots els llocs">
 <!ENTITY ss.privacy_level.unencrypted "Només els llocs no xifrats">
 <!ENTITY ss.privacy_level.nosites "Cap lloc">
-<!ENTITY sessionManger.enable "Habilita el gestor de sessions">
 <!ENTITY crashRecovery.enable "Habilita la recuperació després de fallada">
-<!ENTITY sm.StartExit "Inici/Sortida">
-<!ENTITY sm.restore "Restauració">
-<!ENTITY sm.preserve "Conservació">
 <!ENTITY sm.start "En iniciar el navegador:">
-<!ENTITY sm.start.restore "Restaura">
-<!ENTITY sm.start.ask "Pregunta abans de restaurar">
-<!ENTITY sm.start.nothing "No la restauris">
-<!ENTITY sm.exit "En sortir del navegador:">
-<!ENTITY sm.exit.save "Desa la sessió">
-<!ENTITY sm.exit.ask "Pregunta abans de desar">
-<!ENTITY sm.exit.nothing "No la desis">
-<!ENTITY sm.startup "Sessió d&apos;inici:">
-<!ENTITY sm.lastsession "Última sessió">
-<!ENTITY sm.previouslast "Penúltima sessió">
-<!ENTITY sm.chooseifempty "Selecciona&apos;n una altra si és buida">
-<!ENTITY sm.restore.options "En restaurar les sessions:">
-<!ENTITY sm.restore.overwrite "Substitueix les finestres existents">
-<!ENTITY sm.restore.overwriteTabs "I les pestanyes">
-<!ENTITY sm.restore.closedWinList "Desa les finestres a la llista de finestres tancades">
-<!ENTITY sm.restore.merge "Uneix diverses finestres en una">
-<!ENTITY sm.restore.bypassCache "Omet la memòria cau en restaurar">
-<!ENTITY sm.notrestore.label "Quan no es restaura a l&apos;inici">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Conserva les pestanyes:">
 <!ENTITY sm.preserve.history "Historial">
 <!ENTITY sm.preserve.protect "Protegides">
 <!ENTITY sm.preserve.locked "Blocades">
 <!ENTITY sm.preserve.permission "Permisos">
 <!ENTITY sm.preserve.scroll1 "Posició de desplaçament">
-<!ENTITY sm.restore.winOptions "Conserva les finestres:">
-<!ENTITY sm.restore.selectedTab "Pestanya seleccionada">
-<!ENTITY sm.restore.closedTabs "Llista de pestanyes tancades">
 <!ENTITY incompatible.extensions "Alguns dels complements instal·lats són incompatibles amb el Tab Mix Plus, és recomanable que els inhabiliteu o els desinstal·leu.">
 <!ENTITY incompatible.button.label "Mostra la llista">
diff --git a/addon/chrome/locale/ca/session-manager.properties b/addon/chrome/locale/ca/session-manager.properties
deleted file mode 100644
index a02f10138..000000000
--- a/addon/chrome/locale/ca/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Desa la llista de pestanyes tancades amb aquesta sessió
-sm.button.continue.label=Continua
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Gestor de sessions: Desa la sessió
-sm.askBeforeSave.msg0=Voleu desar la sessió?
-sm.askBeforeSave.msg2=Només es desaran al disc les finestres que no siguin privades
-sm.askBeforeSave.msg1=Si no la deseu, la propera vegada que inicieu el navegador l\'«Última sessió» serà buida.
-sm.askBeforeSave.button0.label=Desa la sessió
-sm.askBeforeSave.button0.accesskey=D
-sm.askBeforeSave.button1.label=No la desis
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Gestor de sessions: La base de dades s\'ha malmès
-sm.corrupted.msg0=El gestor de sessions no pot carregar la base de dades des del fitxer session.rdf malmès.
-sm.corrupted.msg1=El fitxer session.rdf se suprimirà; en trobareu una còpia al fitxer session.old del vostre perfil. Les còpies de seguretat de les sessions es desen a <perfil>/sessionbackups.
-sm.areYouSure.msg=Esteu segur que voleu continuar?
-sm.canChooseStartup.msg=Podeu seleccionar una sessió de la llista per definir-la com a la nova sessió d\'inici:
-sm.addtoStartup.title=Gestor de sessions: Afegeix a la sessió d\'inici
-sm.addtoStartup.msg.windows=Ara afegireu una finestra o més a la vostra sessió d\'inici:
-sm.addtoStartup.msg.tabs=Ara afegireu una pestanya o més a la vostra sessió d\'inici:
-sm.addtoStartup.button0.label=Afegeix-ho a la sessió
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=No ho afegeixis
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Gestor de sessions: Substitueix la sessió d\'inici
-sm.replaceStartup.msg=Ara substituireu la vostra sessió d\'inici:
-sm.replaceStartup.button0.label=Substitueix la sessió
-sm.replaceStartup.button0.accesskey=S
-sm.replaceStartup.button1.label=No la substitueixis
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Gestor de sessions: Suprimeix la sessió d\'inici
-sm.removeStartup.msg0=Ara suprimireu la vostra sessió d\'inici:
-sm.removeStartup.msg1=Seleccioneu una sessió de la llista per definir-la com a la nova sessió d\'inici:
-sm.removeStartup.button0.label=Suprimeix
-sm.removeStartup.button0.accesskey=S
-sm.removeStartup.button1.label=No la suprimeixis
-sm.removeStartup.button1.accesskey=N
-sm.title=Gestor de sessions
-sm.dontSaveBlank.msg=El gestor de sessions no desa pàgines en blanc
-sm.sessionSave.error=Error del gestor de sessions: No s\'ha desat la sessió
-sm.sessionName.title.rename=Gestor de sessions: Reanomena la sessió
-sm.sessionName.title.saveprevious=Gestor de sessions: Desa la sessió
-sm.sessionName.title.savethiswindow=Gestor de sessions: Desa aquesta finestra
-sm.sessionName.title.saveallwindows=Gestor de sessions: Desa totes les finestres
-sm.sessionName.msg0=Escriviu el nom de la sessió:
-sm.sessionName.msg1=El nom ha de tenir com a mínim una lletra o un número.
-sm.sessionName.msg2=Aquest nom ja existeix.
-sm.sessionName.msg3=Esteu segur que voleu substituir la sessió?
-sm.sessionName.button0.label=Reanomena la sessió
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=No la reanomenis
-sm.sessionName.button1.accesskey=N
-sm.session.empty=buida
-sm.session.tabs=P
-sm.session.windows=F
-sm.removeAll.title.session=Gestor de sessions: Suprimeix totes les sessions desades
-sm.removeAll.title.closedwindow=Gestor de sessions: Suprimeix totes les finestres tancades
-sm.removeAll.msg0=Esteu segur que voleu suprimir totes les sessions desades?
-sm.removeAll.msg1=Si seleccioneu «Suprimeix», la sessió d\'inici serà l\'«Última sessió».
-sm.removeAll.msg2=Esteu segur que voleu suprimir totes les finestres tancades?
-sm.sessionMenu.last=Última sessió
-sm.sessionMenu.lastDefault=Última sessió - Per defecte
-sm.sessionMenu.lastgood=Última sessió correcta
-sm.sessionMenu.previous=Penúltima sessió
-sm.sessionMenu.crashed=Sessió després de fallada
-sm.afterCrash.title=Gestor de sessions: Restaura després de fallada
-sm.afterCrash.chkbox.label=Habilita el gestor de sessions
-sm.afterCrash.msg0=La vostra darrera sessió ha fallat!
-sm.afterCrash.msg0.again=La vostra darrera sessió després de fallada ha tornat a fallar!
-sm.afterCrash.msg1=Trieu la sessió que voleu restaurar de la llista:
-sm.afterCrash.msg2=Trieu com voleu continuar
-sm.afterCrash.msg3=Actualment el gestor de sessions està inhabilitat. Si l\'habiliteu, podreu restaurar les sessions després d\'una fallada, les sessions tancades, les sessions desades i les finestres tancades des del menú Gestor de sessions.
-sm.afterCrash.msg4=També podeu restaurar la sessió després de fallada més tard des del menú Gestor de sessions.
-sm.afterCrash.msg5=però no s\'ha desat res.
-sm.afterCrash.msg6=però no hi ha cap finestra oberta a la sessió després de fallada
-sm.afterCrash.msg7=Trieu la finestra que voleu restaurar de la llista de Finestres tancades
-sm.afterCrash.msg8=(també podeu restaurar finestres tancades des del menú de Finestres tancades)
-sm.afterCrash.msg9=La sessió després de fallada és buida!
-sm.afterCrash.msg10=El gestor de sessions no ha trobat cap sessió que pugui restaurar.
-sm.afterCrash.button0.label=Restaura la sessió
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaura la sessió després de fallada
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=No la restauris
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Gestor de sessions: Restaura la sessió
-sm.start.chkbox.label=Habilita la recuperació després de fallada
-sm.start.msg0=La sessió d\'inici és buida!
-sm.start.msg1=Actualment la recuperació després de fallada està inhabilitada. Si l\'habiliteu, podreu restaurar les sessions després d\'una fallada.
-sm.start.msg2=Error en buscar la sessió d\'inici. La vostra sessió d\'inici desada no existeix.
-sm.restoreError.msg0=Error al fitxer del gestor de sessions!
-sm.restoreError.msg1=Suprimiu la sessió que heu intentat restaurar
-sm.disable.msg=El Firefox té una funció integrada de restauració de sessió.
-sm.disable.msg1=Voleu habilitar la restauració de sessió integrada i inhabilitar el gestor de sessions del Tab Mix Plus?
-sm.disable.msg2=Voleu habilitar el gestor de sessions del Tab Mix Plus i inhabilitar la restauració de sessió integrada?
-sm.tabview.hiddengroups=S'han restaurat més finestres en grups ocults.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/ca/tabmix.dtd b/addon/chrome/locale/ca/tabmix.dtd
index c037410f4..2875956bd 100644
--- a/addon/chrome/locale/ca/tabmix.dtd
+++ b/addon/chrome/locale/ca/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Suprimeix de la llista">
 <!ENTITY deletelist.accesskey "S">
 <!ENTITY settings.label "Paràmetres">
-<!ENTITY saveWindow.label "Desa aquesta finestra">
-<!ENTITY saveAllWindows.label "Desa totes les finestres">
 <!ENTITY sm.context.overwrite "Restaura substituint les finestres existents">
 <!ENTITY sm.context.overwrite.key "S">
 <!ENTITY sm.context.restore.new "Restaura en noves finestres">
diff --git a/addon/chrome/locale/cs-CZ/misc.dtd b/addon/chrome/locale/cs-CZ/misc.dtd
index c62fa5e48..6329012e2 100644
--- a/addon/chrome/locale/cs-CZ/misc.dtd
+++ b/addon/chrome/locale/cs-CZ/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Vyberte čas ze seznamu nebo zadejte vlastní">
 <!ENTITY specifyreload.label "Určit frekvenci opětovného načtení">
-<!ENTITY sanitizer.entry "Uložené relace rozšíření Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "H">
-<!ENTITY sanitizer.entry.confirm "Opravdu chcete vymazat všechny uložené relace včetně zálohovaných dat?">
diff --git a/addon/chrome/locale/cs-CZ/pref-tabmix.dtd b/addon/chrome/locale/cs-CZ/pref-tabmix.dtd
index aacab8811..f1aff05db 100644
--- a/addon/chrome/locale/cs-CZ/pref-tabmix.dtd
+++ b/addon/chrome/locale/cs-CZ/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Zobrazit prázdnou stránku">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Použít vestavěnou funkci obnovy relací prohlížeče Firefox">
-<!ENTITY ss.enable.tooltip "Pokud zrušíte zaškrtnutí tohoto pole, povolíte správce relací rozšíření Tab Mix Plus.">
 <!ENTITY ss.advanced_setting "Rozšířené nastavení">
 <!ENTITY ss.advanced_setting.warning "Neměňte, pokud si nejste jisti, co děláte.">
 <!ENTITY ss.interval "Minimální časový interval mezi dvěma stavy uložení">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Všechny stránky">
 <!ENTITY ss.privacy_level.unencrypted "Pouze nezabezpečené stránky">
 <!ENTITY ss.privacy_level.nosites "Žádné stránky">
-<!ENTITY sessionManger.enable "Povolit Správce relací">
 <!ENTITY crashRecovery.enable "Povolit obnovu po pádu">
-<!ENTITY sm.StartExit "Spouštění/Zavírání">
-<!ENTITY sm.restore "Obnovit">
-<!ENTITY sm.preserve "Zachovat">
 <!ENTITY sm.start "Při spouštění prohlížeče:">
-<!ENTITY sm.start.restore "Obnovit">
-<!ENTITY sm.start.ask "Před obnovením se zeptat">
-<!ENTITY sm.start.nothing "Neobnovovat">
-<!ENTITY sm.exit "Při zavírání prohlížeče:">
-<!ENTITY sm.exit.save "Uložit relaci">
-<!ENTITY sm.exit.ask "Před uložením se zeptat">
-<!ENTITY sm.exit.nothing "Neukládat">
-<!ENTITY sm.startup "Relace po spuštění:">
-<!ENTITY sm.lastsession "Poslední relace">
-<!ENTITY sm.previouslast "Předposlední relace">
-<!ENTITY sm.chooseifempty "Vybrat jinou, není-li k dispozici žádná relace">
-<!ENTITY sm.restore.options "Při obnovování relací:">
-<!ENTITY sm.restore.overwrite "Přepsat stávající okna">
-<!ENTITY sm.restore.overwriteTabs "A panely">
-<!ENTITY sm.restore.closedWinList "Uložit okna do seznamu zavřených oken">
-<!ENTITY sm.restore.merge "Sloučit více oken do jednoho">
-<!ENTITY sm.restore.bypassCache "Při obnově relace obejít vyrovnávací paměť">
-<!ENTITY sm.notrestore.label "Pokud nedojde k obnově po spuštění">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Zachovat panely:">
 <!ENTITY sm.preserve.history "Historie">
 <!ENTITY sm.preserve.protect "Stav Chránit">
 <!ENTITY sm.preserve.locked "Stav Zamknout">
 <!ENTITY sm.preserve.permission "Oprávnění">
 <!ENTITY sm.preserve.scroll1 "Pozice posuvníku">
-<!ENTITY sm.restore.winOptions "Zachovat okna:">
-<!ENTITY sm.restore.selectedTab "Vybraný panel">
-<!ENTITY sm.restore.closedTabs "Seznam zavřených panelů">
 <!ENTITY incompatible.extensions "Některá z rozšíření nejsou kompatibilní s rozšířením Tab Mix Plus, tato rozšíření doporučujeme zakázat nebo odinstalovat.">
 <!ENTITY incompatible.button.label "Zobrazit seznam">
diff --git a/addon/chrome/locale/cs-CZ/session-manager.properties b/addon/chrome/locale/cs-CZ/session-manager.properties
deleted file mode 100644
index 634efc237..000000000
--- a/addon/chrome/locale/cs-CZ/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Uložit seznam zavřených panelů s touto relací
-sm.button.continue.label=Pokračovat
-sm.button.continue.accesskey=P
-sm.askBeforeSave.title=Správce relací - Uložení relace
-sm.askBeforeSave.msg0=Chcete uložit tuto relaci?
-sm.askBeforeSave.msg2=Na disk budou uložena pouze nesoukromá okna
-sm.askBeforeSave.msg1=Pokud relaci neuložíte, při dalším spuštění prohlížeče bude \'Poslední relace\' prázdná.
-sm.askBeforeSave.button0.label=Uložit relaci
-sm.askBeforeSave.button0.accesskey=U
-sm.askBeforeSave.button1.label=Neukládat
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Správce relací - Chyba v databázi
-sm.corrupted.msg0=Správce relací nemohl načíst databázi z poškozeného souboru session.rdf.
-sm.corrupted.msg1=Soubor session.rdf bude smazán, ve vašem profilu bude uložena jeho kopie s názvem session.old. Zálohy relací naleznete v části <profile>/sessionbackups
-sm.areYouSure.msg=Opravdu chcete pokračovat?
-sm.canChooseStartup.msg=Novou relaci po spuštění vyberte ze seznamu:
-sm.addtoStartup.title=Správce relací – Přidání do relace po spuštění
-sm.addtoStartup.msg.windows=Chystáte se do relace po spuštění přidat okna:
-sm.addtoStartup.msg.tabs=Chystáte se do relace po spuštění přidat panely:
-sm.addtoStartup.button0.label=Přidat do relace
-sm.addtoStartup.button0.accesskey=R
-sm.addtoStartup.button1.label=Nepřidávat
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Správce relací – Přepsání relace po spuštění
-sm.replaceStartup.msg=Chystáte se nahradit relaci po spuštění:
-sm.replaceStartup.button0.label=Nahradit relaci
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=Nenahrazovat
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Správce relací – Smazání relace po spuštění
-sm.removeStartup.msg0=Chystáte se smazat relaci po spuštění:
-sm.removeStartup.msg1=Novou relaci po spuštění vyberte ze seznamu:
-sm.removeStartup.button0.label=Smazat
-sm.removeStartup.button0.accesskey=S
-sm.removeStartup.button1.label=Nemazat
-sm.removeStartup.button1.accesskey=N
-sm.title=Správce relací
-sm.dontSaveBlank.msg=Správce relací neukládá prázdná okna
-sm.sessionSave.error=Ve správci relací se vyskytla chyba, relace nebyla uložena.
-sm.sessionName.title.rename=Správce relací – Přejmenování relace
-sm.sessionName.title.saveprevious=Správce relací – Uložení relace
-sm.sessionName.title.savethiswindow=Správce relací – Uložení tohoto okna
-sm.sessionName.title.saveallwindows=Správce relací – Uložení všech oken
-sm.sessionName.msg0=Vložte název relace:
-sm.sessionName.msg1=Název musí být alespoň jedno písmeno nebo číslice.
-sm.sessionName.msg2=Tento název je již používán!
-sm.sessionName.msg3=Opravdu chcete nahradit tuto relaci?
-sm.sessionName.button0.label=Přejmenovat relaci
-sm.sessionName.button0.accesskey=J
-sm.sessionName.button1.label=Nepřejmenovat
-sm.sessionName.button1.accesskey=N
-sm.session.empty=prázdná
-sm.session.tabs=P
-sm.session.windows=O
-sm.removeAll.title.session=Správce relací – Smazání všech uložených relací
-sm.removeAll.title.closedwindow=Správce relací – Smazání všech zavřených oken
-sm.removeAll.msg0=Opravdu chcete smazat všechny uložené relace?
-sm.removeAll.msg1=Pokud se rozhodnete relace smazat, vaší relací po spuštění bude \'Poslední relace\'.
-sm.removeAll.msg2=Opravdu chcete smazat všechna zavřená okna?
-sm.sessionMenu.last=Poslední relace
-sm.sessionMenu.lastDefault=Poslední relace – Výchozí
-sm.sessionMenu.lastgood=Poslední funkční relace
-sm.sessionMenu.previous=Předposlední
-sm.sessionMenu.crashed=Chybná relace
-sm.afterCrash.title=Správce relací – Obnova po pádu
-sm.afterCrash.chkbox.label=Povolit správce relací
-sm.afterCrash.msg0=Vaše poslední relace selhala!
-sm.afterCrash.msg0.again=Vaše poslední relace po pádu selhala znovu!
-sm.afterCrash.msg1=Vyberte ze seznamu relaci, kterou chcete obnovit:
-sm.afterCrash.msg2=Jak chcete pokračovat
-sm.afterCrash.msg3=Správce relací je momentálně vypnutý. Pokud jej zapnete, v nabídce správce budete moci obnovovat relace po pádu, zavřené či uložené relace nebo zavřená okna.
-sm.afterCrash.msg4=Relaci po pádu můžete obnovit i později z nabídky správce relací.
-sm.afterCrash.msg5=ale nic se neuložilo.
-sm.afterCrash.msg6=ale v relaci po pádu není žádné otevřené okno.
-sm.afterCrash.msg7=Ze seznamu zavřených oken vyberte okno, které chcete obnovit
-sm.afterCrash.msg8=(zavřená okna můžete obnovit i později z nabídky zavřených oken)
-sm.afterCrash.msg9=Relace po pádu je prázdná.
-sm.afterCrash.msg10=Správce relací nenalezl žádné relace, které by bylo možné obnovit.
-sm.afterCrash.button0.label=Obnovit relaci
-sm.afterCrash.button0.accesskey=O
-sm.afterCrash.button0.crashed.label=Obnovit relaci po pádu
-sm.afterCrash.button0.crashed.accesskey=O
-sm.afterCrash.button1.label=Neobnovovat
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Správce relací – Obnovení relace
-sm.start.chkbox.label=Povolit správce relací
-sm.start.msg0=Relace po spuštění je prázdná.
-sm.start.msg1=Obnova po pádu je momentálně zakázana. Pokud ji povolíte, budete moci obnovovat relace po pádu.
-sm.start.msg2=Při hledání relace po spuštění došlo k chybě, uložená relace po spuštění neexistuje.
-sm.restoreError.msg0=Chyba v souboru správce relací!
-sm.restoreError.msg1=Smazat relaci, kterou jste se pokusili obnovit
-sm.disable.msg=Prohlížeč Firefox má vestavěnu funkci obnovy relací.
-sm.disable.msg1=Chcete povolit vestavěnou obnovu relací a zakázat správce relací?
-sm.disable.msg2=Chcete povolit správce relací a zakázat vestavěnou obnovu relací?
-sm.tabview.hiddengroups=Ve skrytých skupinách bylo obnoveno více panelů.
-sm.tabview.hiddengroups.removed=Skupiny skrytých karet byly odebrány.
-sm.tabview.removed=Funkce Tab Groups (Panorama) byla z Firefoxu odebrána.
-sm.tabview.removed.learnMore.label=Další informace
-sm.tabview.removed.learnMore.accesskey=D
-sm.tabview.install.label=Instalovat rozšíření Tab Groups
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Relace historie: záloha s daty skupiny
-sm.tabview.backup.crashed=Relace, která selhala: záloha s daty skupiny
-sm.tabview.backup.msg=Správce relací rozšíření Tab Mix Plus uložil zálohu vaší relace.
-sm.bookmarks.historySession=Relace historie
-sm.bookmarks.closedWindow=Zavřené okno
-sm.bookmarks.sessionFolder=Relace rozšíření Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Okno %S
diff --git a/addon/chrome/locale/cs-CZ/tabmix.dtd b/addon/chrome/locale/cs-CZ/tabmix.dtd
index 45cea7067..71ed361be 100644
--- a/addon/chrome/locale/cs-CZ/tabmix.dtd
+++ b/addon/chrome/locale/cs-CZ/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Smazat ze seznamu">
 <!ENTITY deletelist.accesskey "S">
 <!ENTITY settings.label "Nastavení">
-<!ENTITY saveWindow.label "Uložit toto okno">
-<!ENTITY saveAllWindows.label "Uložit všechna okna">
 <!ENTITY sm.context.overwrite "Obnovit, přepsat současná okna">
 <!ENTITY sm.context.overwrite.key "P">
 <!ENTITY sm.context.restore.new "Obnovit do nových oken">
diff --git a/addon/chrome/locale/da/misc.dtd b/addon/chrome/locale/da/misc.dtd
index 4fef57cf4..ccaf621dd 100644
--- a/addon/chrome/locale/da/misc.dtd
+++ b/addon/chrome/locale/da/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix">
 <!ENTITY reloadtime.label1 "Vælg tid fra listen eller indtast din egen tid">
 <!ENTITY specifyreload.label "Angiv genindlæsningstid">
-<!ENTITY sanitizer.entry "Tab Mix Plus historik">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Er du sikker på at du vil slette ALLE dine gemte sessionsdata inklusive backups ?">
diff --git a/addon/chrome/locale/da/pref-tabmix.dtd b/addon/chrome/locale/da/pref-tabmix.dtd
index a5340212a..19ae3c35e 100644
--- a/addon/chrome/locale/da/pref-tabmix.dtd
+++ b/addon/chrome/locale/da/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Vis en blank side">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Brug indbygget sessions-genetablering">
-<!ENTITY ss.enable.tooltip "Fjern markering for at tillade brug af TabMix Sessionsadministration">
 <!ENTITY ss.advanced_setting "Avancerede indstillinger">
 <!ENTITY ss.advanced_setting.warning "Undlad at ændre disse med mindre du ved præcis hvad du laver">
 <!ENTITY ss.interval "Minimum tidsinterval mellem to tilstands-gem">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Alle sider">
 <!ENTITY ss.privacy_level.unencrypted "Kun ikke-krypterede sider">
 <!ENTITY ss.privacy_level.nosites "Slet ingen sider">
-<!ENTITY sessionManger.enable "Slå Sessionsadministration til">
 <!ENTITY crashRecovery.enable "Slå Genetablering af afbrudte til">
-<!ENTITY sm.StartExit "Start/afslut">
-<!ENTITY sm.restore "Genetabler">
-<!ENTITY sm.preserve "Bevar">
 <!ENTITY sm.start "Når browser starter:">
-<!ENTITY sm.start.restore "Genetabler">
-<!ENTITY sm.start.ask "Spørg før genetablering">
-<!ENTITY sm.start.nothing "Genetabler ikke">
-<!ENTITY sm.exit "Når browser afsluttes:">
-<!ENTITY sm.exit.save "Gem session">
-<!ENTITY sm.exit.ask "Spørg før der gemmes">
-<!ENTITY sm.exit.nothing "Gem ikke">
-<!ENTITY sm.startup "Opstartssession:">
-<!ENTITY sm.lastsession "Sidste session">
-<!ENTITY sm.previouslast "Foregående ift. sidste">
-<!ENTITY sm.chooseifempty "Vælg en anden hvis tom">
-<!ENTITY sm.restore.options "Ved genetablering af sessioner:">
-<!ENTITY sm.restore.overwrite "Overskriv eksisterende vinduer">
-<!ENTITY sm.restore.overwriteTabs "Og faneblade">
-<!ENTITY sm.restore.closedWinList "Gem vinduer i lukkede vinduer-listen">
-<!ENTITY sm.restore.merge "Foren flere vinduer til et">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "Når der ikke genetableres ved start">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Bevar faneblade:">
 <!ENTITY sm.preserve.history "Historik">
 <!ENTITY sm.preserve.protect "Beskyt status">
 <!ENTITY sm.preserve.locked "Lås status">
 <!ENTITY sm.preserve.permission "Tilladelser">
 <!ENTITY sm.preserve.scroll1 "Rulle-position på siden">
-<!ENTITY sm.restore.winOptions "Bevar vinduer:">
-<!ENTITY sm.restore.selectedTab "Valgte faneblad">
-<!ENTITY sm.restore.closedTabs "Lukkede faneblade-liste">
 <!ENTITY incompatible.extensions "Nogle af dine udvidelser er inkompatible med Tab Mix Plus, det anbefales at du deaktiverer eller afinstallerer de pågældende udvidelser.">
 <!ENTITY incompatible.button.label "Vis liste">
diff --git a/addon/chrome/locale/da/session-manager.properties b/addon/chrome/locale/da/session-manager.properties
deleted file mode 100644
index c6a46cf98..000000000
--- a/addon/chrome/locale/da/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Gem lukkede faneblade-lister med denne session
-sm.button.continue.label=Fortsæt
-sm.button.continue.accesskey=F
-sm.askBeforeSave.title=Sessionsadministration - Gem session
-sm.askBeforeSave.msg0=Ønsker du at gemme din session?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=Hvis du ikke gemmer, vil \'Sidste session\' være tom næste gang du starter browseren.
-sm.askBeforeSave.button0.label=Gem session
-sm.askBeforeSave.button0.accesskey=s
-sm.askBeforeSave.button1.label=Undlad at gemme
-sm.askBeforeSave.button1.accesskey=U
-sm.corrupted.title=Sessionsadministration - Korrupt database
-sm.corrupted.msg0=Sessionsadministration kan ikke indlæse dens database fra den ødelagte session.rdf.
-sm.corrupted.msg1=Filen session.rdf vil blive slettet, en kopi kan findes i session.old i din profil.
-sm.areYouSure.msg=Er du sikker på at du vil fortsætte?
-sm.canChooseStartup.msg=Du kan vælge en session der skal være din nye opstartssession fra listen:
-sm.addtoStartup.title=Sessionsadministration - Tilføj til opstartssession
-sm.addtoStartup.msg.windows=Du er ved at tilføje vindue(r) til din opstartssession:
-sm.addtoStartup.msg.tabs=Du er ved at tilføje faneblad(e) til din opstartssession:
-sm.addtoStartup.button0.label=Tilføj til session
-sm.addtoStartup.button0.accesskey=t
-sm.addtoStartup.button1.label=Tilføj ikke
-sm.addtoStartup.button1.accesskey=i
-sm.replaceStartup.title=Sessionsadministration - Tilsidesæt opstartssession
-sm.replaceStartup.msg=Du er ved at erstatte din opstartssession:
-sm.replaceStartup.button0.label=Erstat session
-sm.replaceStartup.button0.accesskey=e
-sm.replaceStartup.button1.label=Erstat ikke
-sm.replaceStartup.button1.accesskey=i
-sm.removeStartup.title=Sessionsadministration - Slet opstartssession
-sm.removeStartup.msg0=Du er ved at slette din opstartssession:
-sm.removeStartup.msg1=Vælg en ny session der skal være din opstartssession fra listen:
-sm.removeStartup.button0.label=Slet
-sm.removeStartup.button0.accesskey=l
-sm.removeStartup.button1.label=Slet ikke
-sm.removeStartup.button1.accesskey=i
-sm.title=Sessionsadministration
-sm.dontSaveBlank.msg=Sessionsadministration gemmer ikke blanke vinduer
-sm.sessionSave.error=Fejl i Sessionsadministration, session blev ikke gemt
-sm.sessionName.title.rename=Sessionsadministration - Omdøb session
-sm.sessionName.title.saveprevious=Sessionsadministration - Gem session
-sm.sessionName.title.savethiswindow=Sessionsadministration - Gem dette vindue
-sm.sessionName.title.saveallwindows=Sessionsadministration - Gem alle vinduer
-sm.sessionName.msg0=Indtast sessionsnavn:
-sm.sessionName.msg1=Navn skal være mindst et bogstav eller tal.
-sm.sessionName.msg2=Dette navn er allerede i brug!
-sm.sessionName.msg3=Er du sikker på at du vil erstatte sessionen?
-sm.sessionName.button0.label=Omdøb session
-sm.sessionName.button0.accesskey=d
-sm.sessionName.button1.label=Omdøb ikke
-sm.sessionName.button1.accesskey=i
-sm.session.empty=tom
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Sessionsadministration - Slet alle gemte sessioner
-sm.removeAll.title.closedwindow=Sessionsadministration - Slet alle lukkede vinduer
-sm.removeAll.msg0=Er du sikker på at du vil slette alle dine gemte sessioner?
-sm.removeAll.msg1=Hvis du vælger \'Slet\' vil din opstartssession være \'Sidste session\'.
-sm.removeAll.msg2=Er du sikker på at du vil slette alle dine lukkede vinduer?
-sm.sessionMenu.last=Sidste session
-sm.sessionMenu.lastDefault=Sidste session - Standard
-sm.sessionMenu.lastgood=Sidste gode session
-sm.sessionMenu.previous=Næstsidste session
-sm.sessionMenu.crashed=Afbrudt session
-sm.afterCrash.title=Sessionsadminstration - Genetabler efter afbrudt
-sm.afterCrash.chkbox.label=Slå Sessionsadminstration til
-sm.afterCrash.msg0=Din sidste session blev afbrudt!
-sm.afterCrash.msg0.again=Din sidste afbrudte session blev afbrudt igen!
-sm.afterCrash.msg1=Vælg session at genetablere fra listen:
-sm.afterCrash.msg2=Vælg hvordan der skal fortsættes
-sm.afterCrash.msg3=Sessionsadministration er slået fra i øjeblikket. Hvis du slår Sessionsadministration til kan du genetablere afbrudte sessioner, lukkede sessioner, gemte sessioner og lukkede vinduer fra Sessionsadministrationsmenuen.
-sm.afterCrash.msg4=Du kan også genetablere afbrudte sessioner senere fra Sessionsadministrationsmenuen.
-sm.afterCrash.msg5=men intet blev gemt.
-sm.afterCrash.msg6=men der er ingen åbne vinduer i din afbrudte session
-sm.afterCrash.msg7=Vælg vindue at genetablere fra Lukkede vinduer-liste
-sm.afterCrash.msg8=(du kan også genetablere lukkede vinduer senere fra Lukkede vinduer-menuen)
-sm.afterCrash.msg9=Din afbrudte session er tom!
-sm.afterCrash.msg10=Sessionsadministration fandt ingen sessioner at genetablere fra.
-sm.afterCrash.button0.label=Genetabler session
-sm.afterCrash.button0.accesskey=G
-sm.afterCrash.button0.crashed.label=Genetabler afbrudt session
-sm.afterCrash.button0.crashed.accesskey=a
-sm.afterCrash.button1.label=Genetabler ikke
-sm.afterCrash.button1.accesskey=i
-sm.start.title=Sessionsadministration - Genetabler session
-sm.start.chkbox.label=Slå Sessionsadministration til
-sm.start.msg0=Din opstartssession er tom!
-sm.start.msg1=Crash Recovery (genetablering af afbrudte sessioner) er slået fra i øjeblikket. Hvis du slår det til, kan du genetablere afbrudte sessioner.
-sm.start.msg2=Fejl under opslag af din opstartssession, din gemte opstartssession findes ikke.
-sm.restoreError.msg0=Fejl i sessionsadministrationsfil!
-sm.restoreError.msg1=Slet den session du forsøgte at genetablere
-sm.disable.msg=Firefox har en indbygget genetablér session-funktion.
-sm.disable.msg1=Ønsker du at aktivere den indbyggede sessions-genetablering og deaktivere TabMix Sessionsadministration?
-sm.disable.msg2=Ønsker du at aktivere TabMix Sessionsadministration og deaktivere den indbyggede sessions-genetablering?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/da/tabmix.dtd b/addon/chrome/locale/da/tabmix.dtd
index 561790a58..3f8cba4ac 100644
--- a/addon/chrome/locale/da/tabmix.dtd
+++ b/addon/chrome/locale/da/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Slet fra listen">
 <!ENTITY deletelist.accesskey "e">
 <!ENTITY settings.label "Indstillinger">
-<!ENTITY saveWindow.label "Gem dette vindue">
-<!ENTITY saveAllWindows.label "Gem alle vinduer">
 <!ENTITY sm.context.overwrite "Genetabler, overskriv eksisterende vindue(r)">
 <!ENTITY sm.context.overwrite.key "o">
 <!ENTITY sm.context.restore.new "Genetabler til ny(e) vindue(r)">
diff --git a/addon/chrome/locale/de/misc.dtd b/addon/chrome/locale/de/misc.dtd
index 0c3fc1845..43e08818b 100644
--- a/addon/chrome/locale/de/misc.dtd
+++ b/addon/chrome/locale/de/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Aktualisierungsintervall aus der Liste auswählen oder eigenes angeben">
 <!ENTITY specifyreload.label "Aktualisierungsintervall">
-<!ENTITY sanitizer.entry "Chronik von Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Sind Sie sicher, dass Sie ALLE Ihre gesicherten Sitzungs-Daten einschließlich Backups löschen möchten?">
diff --git a/addon/chrome/locale/de/pref-tabmix.dtd b/addon/chrome/locale/de/pref-tabmix.dtd
index 459aae3c5..6560808ea 100644
--- a/addon/chrome/locale/de/pref-tabmix.dtd
+++ b/addon/chrome/locale/de/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Startseite anzeigen">
 <!ENTITY startupBlankPage.label "Leere Seite anzeigen">
 <!ENTITY startupLastSession1.label "Fenster und Tabs der letzten Sitzung anzeigen">
-<!ENTITY ss.enable.label "Integrierte Sitzungswiederherstellung von Firefox verwenden">
-<!ENTITY ss.enable.tooltip "Deaktivieren, um den TMP-Sitzungs-Manager zu verwenden">
 <!ENTITY ss.advanced_setting "Erweiterte Einstellungen">
 <!ENTITY ss.advanced_setting.warning "Für erfahrene Benutzer! Ändern Sie diese nur, wenn Sie wissen, was sie bewirken.">
 <!ENTITY ss.interval "Minimales Zeitintervall zwischen zwei Sicherungsvorgängen">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "für alle Websites">
 <!ENTITY ss.privacy_level.unencrypted "nur für unverschlüsselte Websites">
 <!ENTITY ss.privacy_level.nosites "nie">
-<!ENTITY sessionManger.enable "TMP-Sitzungs-Manager aktivieren">
 <!ENTITY crashRecovery.enable "Wiederherstellung nach Absturz aktivieren">
-<!ENTITY sm.StartExit "Start/Beenden">
-<!ENTITY sm.restore "Wiederherstellen">
-<!ENTITY sm.preserve "Erhalten">
 <!ENTITY sm.start "Beim Start des Browsers:">
-<!ENTITY sm.start.restore "Browser-Sitzung wiederherstellen">
-<!ENTITY sm.start.ask "Vor der Wiederherstellung bestätigen">
-<!ENTITY sm.start.nothing "Browser-Sitzung nicht wiederherstellen">
-<!ENTITY sm.exit "Beim Beenden des Browsers:">
-<!ENTITY sm.exit.save "Browser-Sitzung sichern">
-<!ENTITY sm.exit.ask "Vor dem Sichern bestätigen">
-<!ENTITY sm.exit.nothing "Browser-Sitzung nicht sichern">
-<!ENTITY sm.startup "Startsitzung auswählen:">
-<!ENTITY sm.lastsession "letzte Sitzung">
-<!ENTITY sm.previouslast "vorletzte Sitzung">
-<!ENTITY sm.chooseifempty "Andere Sitzung wählen, falls diese leer sein sollte">
-<!ENTITY sm.restore.options "Bei der Wiederherstellung einer Sitzung:">
-<!ENTITY sm.restore.overwrite "Bestehende Fenster überschreiben">
-<!ENTITY sm.restore.overwriteTabs "Tabs ebenfalls überschreiben">
-<!ENTITY sm.restore.closedWinList "Überschriebene Fenster in der Liste geschlossener Fenster speichern">
-<!ENTITY sm.restore.merge "Mehrere Fenster bei der Wiederherstellung zu einem zusammenführen">
-<!ENTITY sm.restore.bypassCache "Beim Wiederherstellen Cache ignorieren">
-<!ENTITY sm.notrestore.label "Falls beim Start nichts wiederhergestellt wird">
-<!ENTITY sm.restorePinned1.label "Angeheftete Tabs wieder herstellen">
 <!ENTITY sm.preserve.options "Für Tabs erhalten:">
 <!ENTITY sm.preserve.history "die Chronik">
 <!ENTITY sm.preserve.protect "den Geschützt-Status">
 <!ENTITY sm.preserve.locked "den Gesperrt-Status">
 <!ENTITY sm.preserve.permission "die Berechtigungen">
 <!ENTITY sm.preserve.scroll1 "die Position der Seite">
-<!ENTITY sm.restore.winOptions "Für Fenster erhalten:">
-<!ENTITY sm.restore.selectedTab "den aktiven Tab">
-<!ENTITY sm.restore.closedTabs "die Liste kürzlich geschlossener Tabs">
 <!ENTITY incompatible.extensions "Einige Ihrer Erweiterungen sind nicht mit Tab Mix Plus kompatibel. Es wird empfohlen, diese Erweiterungen zu deaktivieren oder zu deinstallieren.">
 <!ENTITY incompatible.button.label "Liste anzeigen">
diff --git a/addon/chrome/locale/de/session-manager.properties b/addon/chrome/locale/de/session-manager.properties
deleted file mode 100644
index cb734a7bf..000000000
--- a/addon/chrome/locale/de/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Kürzlich geschlossene Tabs zusammen mit dieser Sitzung sichern
-sm.button.continue.label=Weiter
-sm.button.continue.accesskey=W
-sm.askBeforeSave.title=Sitzungs-Manager - Sitzung sichern
-sm.askBeforeSave.msg0=Möchten Sie Ihre Browser-Sitzung sichern?
-sm.askBeforeSave.msg2=Nur nicht Private Fenster werden auf der Festplatte gespeichert
-sm.askBeforeSave.msg1=Wenn Sie nicht sichern, wird die \"Letzte Sitzung\" beim nächsten Start des Browsers leer sein.
-sm.askBeforeSave.button0.label=Sitzung sichern
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Nicht sichern
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Sitzungs-Manager - Beschädigte Datenbank
-sm.corrupted.msg0=Der Sitzungs-Manager kann seine Datenbank aus der Datei \"session.rdf\" nicht laden, da diese beschädigt ist.
-sm.corrupted.msg1=Die Datei \"session.rdf\" wird gelöscht, eine Sicherungskopie können Sie in Ihrem Profil unter \"session.old\" finden.
-sm.areYouSure.msg=Möchten Sie wirklich fortfahren?
-sm.canChooseStartup.msg=Sie können eine neue Startsitzung aus der Liste auswählen:
-sm.addtoStartup.title=Sitzungs-Manager - Zur Startsitzung hinzufügen
-sm.addtoStartup.msg.windows=Sie sind im Begriff, ein oder mehrere Fenster zu Ihrer Startsitzung hinzuzufügen. nName der Sitzung:
-sm.addtoStartup.msg.tabs=Sie sind im Begriff, einen oder mehrere Tabs zu Ihrer Startsitzung hinzuzufügen. nName der Sitzung:
-sm.addtoStartup.button0.label=Zur Sitzung hinzufügen
-sm.addtoStartup.button0.accesskey=h
-sm.addtoStartup.button1.label=Nicht hinzufügen
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Sitzungs-Manager - Startsitzung überschreiben
-sm.replaceStartup.msg=Sie sind im Begriff, Ihre Startsitzung zu überschreiben. nName der Sitzung:
-sm.replaceStartup.button0.label=Sitzung überschreiben
-sm.replaceStartup.button0.accesskey=ü
-sm.replaceStartup.button1.label=Nicht überschreiben
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Sitzungs-Manager - Startsitzung löschen
-sm.removeStartup.msg0=Sie sind im Begriff, Ihre Startsitzung zu löschen. nName der Sitzung:
-sm.removeStartup.msg1=Bitte wählen Sie eine neue Startsitzung aus der Liste aus:
-sm.removeStartup.button0.label=Sitzung löschen
-sm.removeStartup.button0.accesskey=l
-sm.removeStartup.button1.label=Nicht löschen
-sm.removeStartup.button1.accesskey=N
-sm.title=Sitzungs-Manager
-sm.dontSaveBlank.msg=Der Sitzungs-Manager sichert keine leeren Fenster.
-sm.sessionSave.error=Fehler im Sitzungs-Manager, die Sitzung wurde nicht gesichert.
-sm.sessionName.title.rename=Sitzungs-Manager - Sitzung umbenennen
-sm.sessionName.title.saveprevious=Sitzungs-Manager - Sitzung sichern
-sm.sessionName.title.savethiswindow=Sitzungs-Manager - Aktuelles Fenster sichern
-sm.sessionName.title.saveallwindows=Sitzungs-Manager - Alle Fenster sichern
-sm.sessionName.msg0=Bitte geben Sie einen Namen für die Sitzung ein.
-sm.sessionName.msg1=Der Name muss aus mindestens einem Buchstaben oder einer Zahl bestehen.
-sm.sessionName.msg2=Es existiert bereits eine Sitzung gleichen Namens!
-sm.sessionName.msg3=Sind Sie sicher, dass Sie diese Sitzung überschreiben möchten?
-sm.sessionName.button0.label=Sitzung umbenennen
-sm.sessionName.button0.accesskey=u
-sm.sessionName.button1.label=Nicht umbenennen
-sm.sessionName.button1.accesskey=N
-sm.session.empty=leer
-sm.session.tabs=T
-sm.session.windows=F
-sm.removeAll.title.session=Sitzungs-Manager - Alle gesicherten Sitzungen löschen
-sm.removeAll.title.closedwindow=Sitzungs-Manager - Alle geschlossenen Fenster löschen
-sm.removeAll.msg0=Sind Sie sicher, dass Sie alle Ihre gesicherten Sitzungen löschen möchten?
-sm.removeAll.msg1=Wenn Sie \"Löschen\" auswählen, wird die \"Letzte Sitzung\" zu Ihrer Startsitzung.
-sm.removeAll.msg2=Sind Sie sicher, dass Sie alle Ihre geschlossenen Fenster löschen möchten?
-sm.sessionMenu.last=Letzte Sitzung
-sm.sessionMenu.lastDefault=Letzte Sitzung - Standard
-sm.sessionMenu.lastgood=Letzte intakte Sitzung
-sm.sessionMenu.previous=Vorletzte Sitzung
-sm.sessionMenu.crashed=Abgestürzte Sitzung
-sm.afterCrash.title=Sitzungs-Manager - Wiederherstellung nach Absturz
-sm.afterCrash.chkbox.label=Sitzungs-Manager aktivieren
-sm.afterCrash.msg0=Ihre letzte Sitzung ist abgestürzt!
-sm.afterCrash.msg0.again=Ihre letzte abgestürzte Sitzung ist erneut abgestürzt!
-sm.afterCrash.msg1=Bitte wählen Sie eine Sitzung für die Wiederherstellung aus der Liste aus:
-sm.afterCrash.msg2=Bitte wählen Sie, wie Sie fortfahren möchten
-sm.afterCrash.msg3=Der Sitzungs-Manager ist momentan deaktiviert. Wenn Sie ihn aktivieren, werden Sie zukünftig abgestürzte, beendete oder gesicherte Sitzungen sowie geschlossene Fenster über das Menü des Sitzungs-Managers wiederherstellen können.
-sm.afterCrash.msg4=Sie können die abgestürzte Sitzung auch später über das Menü des Sitzungs-Managers wiederherstellen.
-sm.afterCrash.msg5=aber es wurde nichts gesichert.
-sm.afterCrash.msg6=aber es existiert kein offenes Fenster in Ihrer abgestürzten Sitzung
-sm.afterCrash.msg7=Bitte wählen Sie ein Fenster für die Wiederherstellung aus der Liste geschlossener Fenster aus
-sm.afterCrash.msg8=(Sie können geschlossene Fenster auch später über das Menü für kürzlich geschlossene Fenster wiederherstellen)
-sm.afterCrash.msg9=Ihre abgestürzte Sitzung ist leer!
-sm.afterCrash.msg10=Der Sitzungs-Manager konnte keine Sitzung für die Wiederherstellung finden.
-sm.afterCrash.button0.label=Sitzung wiederherstellen
-sm.afterCrash.button0.accesskey=w
-sm.afterCrash.button0.crashed.label=Abgestürzte Sitzung wiederherstellen
-sm.afterCrash.button0.crashed.accesskey=w
-sm.afterCrash.button1.label=Nicht wiederherstellen
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Sitzungs-Manager - Sitzung wiederherstellen
-sm.start.chkbox.label=Sitzungs-Manager aktivieren
-sm.start.msg0=Ihre Startsitzung ist leer!
-sm.start.msg1=Die Wiederherstellung nach Absturz ist momentan deaktiviert. Wenn Sie diese aktivieren, werden Sie zukünftig abgestürzte Sitzungen wiederherstellen können.
-sm.start.msg2=Bei der Suche nach Ihrer Startsitzung ist ein Fehler aufgetreten. Es existiert keine gesicherte Startsitzung.
-sm.restoreError.msg0=Fehler in der Sitzungs-Manager-Datei!
-sm.restoreError.msg1=Bitte löschen Sie die Sitzung, die Sie versucht haben wiederherzustellen.
-sm.disable.msg=Firefox verfügt über eine eigene Funktion zur Sitzungswiederherstellung.
-sm.disable.msg1=Möchten Sie die Sitzungswiederherstellung von Firefox aktivieren und den Sitzungs-Manager von Tab Mix Plus deaktivieren?
-sm.disable.msg2=Möchten Sie den Sitzungs-Manager von Tab Mix Plus aktivieren und die Sitzungswiederherstellung von Firefox deaktivieren?
-sm.tabview.hiddengroups=Mehrere Tabs in ausgeblendeten Gruppierungen wieder hergestellt.
-sm.tabview.hiddengroups.removed=Ausgeblendete Tabgruppe wurde entfernt.
-sm.tabview.removed=Tabgruppenfunktion (Panorama) wurde aus Firefox entfernt.
-sm.tabview.removed.learnMore.label=Weitere Informationen
-sm.tabview.removed.learnMore.accesskey=W
-sm.tabview.install.label=Tabgruppen-Erweiterung installieren
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Sitzungschronik, Sicherung mit Tabgruppen Daten
-sm.tabview.backup.crashed=Abgestürzte Sitzung, Sicherung mit Tabgruppen Daten
-sm.tabview.backup.msg=Tab Mix Plus Sitzungsmanager hat eine Sicherung Ihrer aktuellen Sitzung gespeichert.
-sm.bookmarks.historySession=Sitzungschronik
-sm.bookmarks.closedWindow=Geschlossene Fenster
-sm.bookmarks.sessionFolder=Tab Mix Plus Sitzungen
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Fenster %S
diff --git a/addon/chrome/locale/de/tabmix.dtd b/addon/chrome/locale/de/tabmix.dtd
index 99e8623ce..fca467a88 100644
--- a/addon/chrome/locale/de/tabmix.dtd
+++ b/addon/chrome/locale/de/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Aus der Liste entfernen">
 <!ENTITY deletelist.accesskey "e">
 <!ENTITY settings.label "Einstellungen">
-<!ENTITY saveWindow.label "Dieses Fenster sichern">
-<!ENTITY saveAllWindows.label "Alle Fenster sichern">
 <!ENTITY sm.context.overwrite "Wiederherstellen und bestehende(s) Fenster überschreiben">
 <!ENTITY sm.context.overwrite.key "W">
 <!ENTITY sm.context.restore.new "In neuem Fenster wiederherstellen">
diff --git a/addon/chrome/locale/el/misc.dtd b/addon/chrome/locale/el/misc.dtd
index 7ec1861e0..0e3e344db 100644
--- a/addon/chrome/locale/el/misc.dtd
+++ b/addon/chrome/locale/el/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Επιλέξτε χρόνο από τη λίστα ή εισάγετε την προσωπική σας επιλογή.">
 <!ENTITY specifyreload.label "Καθορίστε τον χρόνο ανανέωσης">
-<!ENTITY sanitizer.entry "Αποθηκευμένες συνεδρίες Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "Τ">
-<!ENTITY sanitizer.entry.confirm "Θέλετε σίγουρα να διαγραφούν όλα τα δεδομένα συνεδριών, συμπεριλαμβανομένων και των αντιγράφων ασφαλείας;">
diff --git a/addon/chrome/locale/el/pref-tabmix.dtd b/addon/chrome/locale/el/pref-tabmix.dtd
index 48f07341b..935e458af 100644
--- a/addon/chrome/locale/el/pref-tabmix.dtd
+++ b/addon/chrome/locale/el/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Προβολή κενής σελίδας">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Χρήση ενσωματωμένης αποκατάστασης συνεδρίας">
-<!ENTITY ss.enable.tooltip "Απεπιλέξτε για να επιτραπεί η χρήση του διαχειριστή συνεδρίας του Tabmix">
 <!ENTITY ss.advanced_setting "Ρυθμίσεις για προχωρημένους">
 <!ENTITY ss.advanced_setting.warning "Μην τις αλλάξετε, εκτός κι αν ξέρετε τι κάνετε">
 <!ENTITY ss.interval "Ελάχιστο μεσοδιάστημα χρόνου μεταξύ της αποθήκευσης δύο καταστάσεων">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Όλες τις σελίδες">
 <!ENTITY ss.privacy_level.unencrypted "Μη κρυπτογραφημένες σελίδες μόνο">
 <!ENTITY ss.privacy_level.nosites "Καμία σελίδα">
-<!ENTITY sessionManger.enable "Ενεργοποίηση διαχειριστή συνεδρίας">
 <!ENTITY crashRecovery.enable "Ενεργοποίηση επαναφοράς μετά από κατάρρευση">
-<!ENTITY sm.StartExit "Εκκίνηση/Κλείσιμο">
-<!ENTITY sm.restore "Επαναφορά">
-<!ENTITY sm.preserve "Διατήρηση">
 <!ENTITY sm.start "Στην εκκίνηση του περιηγητή:">
-<!ENTITY sm.start.restore "Επαναφορά">
-<!ENTITY sm.start.ask "Ερώτηση πριν την επαναφορά">
-<!ENTITY sm.start.nothing "Να μην γίνεται επαναφορά">
-<!ENTITY sm.exit "Στο κλείσιμο του περιηγητή:">
-<!ENTITY sm.exit.save "Αποθήκευση συνεδρίας">
-<!ENTITY sm.exit.ask "Ερώτηση πριν την αποθήκευση">
-<!ENTITY sm.exit.nothing "Να μην γίνεται αποθήκευση">
-<!ENTITY sm.startup "Συνεδρία εκκίνησης:">
-<!ENTITY sm.lastsession "Τελευταία συνεδρία">
-<!ENTITY sm.previouslast "Προτελευταία">
-<!ENTITY sm.chooseifempty "Επιλογή άλλης αν είναι κενή">
-<!ENTITY sm.restore.options "Στην επαναφορά συνεδριών:">
-<!ENTITY sm.restore.overwrite "Αντικατάσταση ήδη υπαρχόντων παραθύρων">
-<!ENTITY sm.restore.overwriteTabs "και καρτελών">
-<!ENTITY sm.restore.closedWinList "Αποθήκευση παραθύρων της λίστας κλεισμένων παραθύρων">
-<!ENTITY sm.restore.merge "Συνένωση όλων των παραθύρων σε ένα">
-<!ENTITY sm.restore.bypassCache "Παράκαμψη λανθάνουσας κατά την επαναφορά">
-<!ENTITY sm.notrestore.label "Όταν δεν γίνεται επαναφορά κατά την εκκίνηση">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Διατήρηση καρτελών:">
 <!ENTITY sm.preserve.history "Ιστορικό">
 <!ENTITY sm.preserve.protect "Κατάσταση προστασίας">
 <!ENTITY sm.preserve.locked "Κατάσταση κλειδώματος">
 <!ENTITY sm.preserve.permission "Δικαιώματα">
 <!ENTITY sm.preserve.scroll1 "Θέση κύλισης">
-<!ENTITY sm.restore.winOptions "Διατήρηση παραθύρων">
-<!ENTITY sm.restore.selectedTab "Επιλεγμένη καρτέλα">
-<!ENTITY sm.restore.closedTabs "Λίστα κλεισμένων καρτελών">
 <!ENTITY incompatible.extensions "Μερικές από τις επεκτάσεις σας είναι ασύμβατες με το Tab Mix Plus, προτείνεται να τις απενεργοποιήσετε ή απεγκαταστήσετε.">
 <!ENTITY incompatible.button.label "Προβολή λίστας">
diff --git a/addon/chrome/locale/el/session-manager.properties b/addon/chrome/locale/el/session-manager.properties
deleted file mode 100644
index 500d6644c..000000000
--- a/addon/chrome/locale/el/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Αποθήκευση της λίστας κλεισμένων καρτελών με την τρέχουσα συνεδρία
-sm.button.continue.label=Συνέχεια
-sm.button.continue.accesskey=Σ
-sm.askBeforeSave.title=Διαχειριστής συνεδρίας - Αποθήκευση συνεδρίας
-sm.askBeforeSave.msg0=Θέλετε να αποθηκευθεί η συνεδρία;
-sm.askBeforeSave.msg2=Θα αποθηκεύονται στο δίσκο μόνο παράθυρα μη ιδιωτικής περιηγήσης
-sm.askBeforeSave.msg1=Αν δεν αποθηκευθεί, την επόμενη φορά που θα ανοίξετε τον περιηγητή η «Τελευταία συνεδρία» θα είναι κενή.
-sm.askBeforeSave.button0.label=Αποθήκευση συνεδρίας
-sm.askBeforeSave.button0.accesskey=Α
-sm.askBeforeSave.button1.label=Χωρίς αποθήκευση
-sm.askBeforeSave.button1.accesskey=Δ
-sm.corrupted.title=Διαχειριστής συνεδρίας - Κατεστραμμένη βάση δεδομένων
-sm.corrupted.msg0=Ο διαχειριστής συνεδρίας δεν μπορεί να φορτώσει τα δεδομένα από το κατεστραμμένο αρχείο session.rdf.
-sm.corrupted.msg1=Το αρχείο session.rdf θα διαγραφεί, αντίγραφό του μπορείτε να βρείτε στο αρχείο session.old του προφίλ σας.
-sm.areYouSure.msg=Θέλετε να συνεχίσετε;
-sm.canChooseStartup.msg=Μπορείτε να επιλέξετε συνεδρία εκκίνησης από τη λίστα:
-sm.addtoStartup.title=Διαχειριστής συνεδρίας - Προσθήκη στη συνεδρία εκκίνησης
-sm.addtoStartup.msg.windows=Πρόκειται να προσθέσετε το/τα παράθυρο/α στη συνεδρία εκκίνησης:
-sm.addtoStartup.msg.tabs=Πρόκειται να προσθέσετε την/τις καρτέλα/ες στη συνεδρία εκκίνησης:
-sm.addtoStartup.button0.label=Προσθήκη στη συνεδρία
-sm.addtoStartup.button0.accesskey=Α
-sm.addtoStartup.button1.label=Να μη γίνει προσθήκη
-sm.addtoStartup.button1.accesskey=Φ
-sm.replaceStartup.title=Διαχειριστής συνεδρίας - Παράκαμψη συνεδρίας εκκίνησης
-sm.replaceStartup.msg=Πρόκειται να αντικαταστήσετε τη συνεδρία εκκίνησης
-sm.replaceStartup.button0.label=Αντικατάσταση συνεδρίας
-sm.replaceStartup.button0.accesskey=Α
-sm.replaceStartup.button1.label=Να μην αντικατασταθεί
-sm.replaceStartup.button1.accesskey=Μ
-sm.removeStartup.title=Διαχειριστής συνεδρίας - Διαγραφή συνεδρίας εκκίνησης
-sm.removeStartup.msg0=Πρόκειται να διαγράψετε τη συνεδρία εκκίνησης
-sm.removeStartup.msg1=Επιλέξτε από τη λίστα ποια συνεδρία θα φορτώνεται κατά την εκκίνηση:
-sm.removeStartup.button0.label=Διαγραφή
-sm.removeStartup.button0.accesskey=Δ
-sm.removeStartup.button1.label=Να μην γίνει διαγραφή
-sm.removeStartup.button1.accesskey=Τ
-sm.title=Διαχειριστής συνεδρίας
-sm.dontSaveBlank.msg=Ο διαχειριστής συνεδρίας δεν αποθηκεύει παράθυρα χωρίς περιεχόμενο
-sm.sessionSave.error=Σφάλμα διαχειριστή συνεδρίας, η συνεδρία δεν αποθηκεύτηκε
-sm.sessionName.title.rename=Διαχειριστής συνεδρίας - Μετονομασία συνεδρίας
-sm.sessionName.title.saveprevious=Διαχειριστής συνεδρίας - Αποθήκευση συνεδρίας
-sm.sessionName.title.savethiswindow=Διαχειριστής συνεδρίας - Αποθήκευση αυτού του παραθύρου
-sm.sessionName.title.saveallwindows=Διαχειριστής συνεδρίας - Αποθήκευση όλων των παραθύρων
-sm.sessionName.msg0=Εισαγωγή ονόματος συνεδρίας:
-sm.sessionName.msg1=Το όνομα πρέπει να αποτελείται τουλάχιστον από ένα αλφαριθμητικό
-sm.sessionName.msg2=Το όνομα αυτό υπάρχει ήδη!
-sm.sessionName.msg3=Θέλετε να αντικαταστήσετε τη συνεδρία;
-sm.sessionName.button0.label=Μετονομασία συνεδρίας
-sm.sessionName.button0.accesskey=Μ
-sm.sessionName.button1.label=Να μη μετονομαστεί
-sm.sessionName.button1.accesskey=Ο
-sm.session.empty=Κενό
-sm.session.tabs=Κ
-sm.session.windows=Π
-sm.removeAll.title.session=Διαχειριστής συνεδρίας - Διαγραφή όλων των αποθηκευμένων συνεδριών
-sm.removeAll.title.closedwindow=Διαχειριστής συνεδρίας - Διαγραφή όλων των κλεισμένων παραθύρων
-sm.removeAll.msg0=Θέλετε να διαγραφούν όλες οι αποθηκευμένες συνεδρίες;
-sm.removeAll.msg1=Αν επιλέξετε «Διαγραφή», η συνεδρία εκκίνησης θα είναι η «Τελευταία συνεδρία»
-sm.removeAll.msg2=Θέλετε να διαγραφούν όλα τα κλεισμένα παράθυρα;
-sm.sessionMenu.last=Τελευταία συνεδρία
-sm.sessionMenu.lastDefault=Τελευταία συνεδρία - Αρχικό
-sm.sessionMenu.lastgood=Τελευταία έγκυρη συνεδρία
-sm.sessionMenu.previous=Προτελευταία
-sm.sessionMenu.crashed=Συνεδρία που κατέρρευσε
-sm.afterCrash.title=Διαχειριστής συνεδρίας - Αποκατάσταση μετά από κατάρρευση
-sm.afterCrash.chkbox.label=Ενεργοποίηση του διαχειριστή συνεδρίας
-sm.afterCrash.msg0=Η τελευταία σας συνεδρία κατέρρευσε!
-sm.afterCrash.msg0.again=Η τελευταία σας συνεδρία που κατέρρευσε, κατέρρευσε πάλι!
-sm.afterCrash.msg1=Επιλογή από τη λίστα συνεδρίας για αποκατάσταση:
-sm.afterCrash.msg2=Επιλογή για συνέχεια
-sm.afterCrash.msg3=Ο διαχειριστής συνεδρίας είναι απενεργοποιημένος. Αν τον ενεργοποιήσετε, θα μπορείτε να αποκαταστήσετε συνεδρίες που κατέρρευσαν, κλεισμένες και αποθηκευμένες συνεδρίες, καθώς και κλεισμένα παράθυρα από το μενού του.
-sm.afterCrash.msg4=Μπορείτε επίσης να αποκαταστήσετε τη συνεδρία που κατέρρευσε από το μενού του διαχειριστή συνεδρίας αργότερα.
-sm.afterCrash.msg5=αλλά δεν αποθηκεύτηκε τίποτα.
-sm.afterCrash.msg6=αλλά δεν υπάρχει κάποιο ανοιχτό παράθυρο στη συνεδρία που κατέρρευσε
-sm.afterCrash.msg7=Επιλέξτε παράθυρο που θα αποκατασταθεί από τη λίστα κλεισμένων παραθύρων
-sm.afterCrash.msg8=(μπορείτε επίσης να αποκαταστήσετε κλεισμένα παράθυρα από το μενού κλεισμένων παραθύρων αργότερα)
-sm.afterCrash.msg9=Η συνεδρία που κατέρρευσε είναι κενή!
-sm.afterCrash.msg10=Ο διαχειριστής συνεδρίας δε βρήκε συνεδρίες για αποκατάσταση.
-sm.afterCrash.button0.label=Αποκατάσταση συνεδρίας
-sm.afterCrash.button0.accesskey=κ
-sm.afterCrash.button0.crashed.label=Αποκατάσταση συνεδρίας που κατέρρευσε
-sm.afterCrash.button0.crashed.accesskey=σ
-sm.afterCrash.button1.label=Να μη γίνει αποκατάσταση
-sm.afterCrash.button1.accesskey=α
-sm.start.title=Διαχειριστής συνεδρίας - Αποκατάσταση συνεδρίας
-sm.start.chkbox.label=Ενεργοποίηση διαχειριστή συνεδρίας
-sm.start.msg0=Η συνεδρία εκκίνησης είναι κενή!
-sm.start.msg1=Η αποκατάσταση έπειτα από κατάρρευση δεν είναι ενεργοποιημένη. Αν την ενεργοποιήσετε θα μπορείτε να αποκαταστήσετε συνεδρίες που κατέρρευσαν.
-sm.start.msg2=Παρουσιάστηκε σφάλμα κατά την αναζήτηση συνεδρίας εκκίνησης, δεν υπάρχει αποθηκευμένη συνεδρία εκκίνησης..
-sm.restoreError.msg0=Σφάλμα σε αρχείο του διαχειριστή συνεδρίας!
-sm.restoreError.msg1=Διαγραφή της συνεδρίας που προσπαθήσατε να αποκαταστήσετε
-sm.disable.msg=Ο Firefox έχει ενσωματωμένη δυνατότητα αποκατάστασης συνεδρίας.
-sm.disable.msg1=Θέλετε να ενεργοποιηθεί η ενσωματωμένη αποκατάσταση συνεδρίας και να απενεργοποιηθεί ο διαχειριστής συνεδρίας του TabMix;
-sm.disable.msg2=Θέλετε να ενεργοποιηθεί ο διαχειριστής συνεδρίας του TabMix και να απενεργοποιηθεί η ενσωματωμένη αποκατάσταση συνεδρίας;
-sm.tabview.hiddengroups=Έχει γίνει επαναφορά περισσότερων καρτελών σε κρυμμένες ομάδες
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/el/tabmix.dtd b/addon/chrome/locale/el/tabmix.dtd
index 206c1f29f..3748cde67 100644
--- a/addon/chrome/locale/el/tabmix.dtd
+++ b/addon/chrome/locale/el/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Διαγραφή από τη λίστα">
 <!ENTITY deletelist.accesskey "Δ">
 <!ENTITY settings.label "Ρυθμίσεις">
-<!ENTITY saveWindow.label "Αποθήκευση αυτού του παραθύρου">
-<!ENTITY saveAllWindows.label "Αποθήκευση όλων των παραθύρων">
 <!ENTITY sm.context.overwrite "Επαναφορά με αντικατάσταση των ήδη ανοιγμένων παραθύρων">
 <!ENTITY sm.context.overwrite.key "ο">
 <!ENTITY sm.context.restore.new "Επαναφορά σε νέο/α παράθυρο/α">
diff --git a/addon/chrome/locale/en-US/misc.dtd b/addon/chrome/locale/en-US/misc.dtd
index 089e509c6..5ab19d10c 100644
--- a/addon/chrome/locale/en-US/misc.dtd
+++ b/addon/chrome/locale/en-US/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Choose time from the list or enter your own time">
 <!ENTITY specifyreload.label "Specify Reload Time">
-<!ENTITY sanitizer.entry "Tab Mix Plus Saved Sessions">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Are you sure you want to erase ALL your saved sessions data including backups ?">
diff --git a/addon/chrome/locale/en-US/pref-tabmix.dtd b/addon/chrome/locale/en-US/pref-tabmix.dtd
index a101e51e5..d8597b1ef 100644
--- a/addon/chrome/locale/en-US/pref-tabmix.dtd
+++ b/addon/chrome/locale/en-US/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Show a blank page">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Use Firefox&apos;s built-in Session Restore feature">
-<!ENTITY ss.enable.tooltip "Uncheck to allow the use with Tab Mix Plus Session Manager">
 <!ENTITY ss.advanced_setting "Advanced Setting">
 <!ENTITY ss.advanced_setting.warning "Don&apos;t change these, unless you know what you&apos;re doing">
 <!ENTITY ss.interval "Minimum time interval between two state saves">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "All sites">
 <!ENTITY ss.privacy_level.unencrypted "Unencrypted sites only">
 <!ENTITY ss.privacy_level.nosites "No sites at all">
-<!ENTITY sessionManger.enable "Enable Session Manager">
 <!ENTITY crashRecovery.enable "Enable Crash Recovery">
-<!ENTITY sm.StartExit "Start/Exit">
-<!ENTITY sm.restore "Restore">
-<!ENTITY sm.preserve "Preserve">
 <!ENTITY sm.start "When Browser Starts:">
-<!ENTITY sm.start.restore "Restore">
-<!ENTITY sm.start.ask "Ask Before Restoring">
-<!ENTITY sm.start.nothing "Don&apos;t Restore">
-<!ENTITY sm.exit "When Browser Exits:">
-<!ENTITY sm.exit.save "Save Session">
-<!ENTITY sm.exit.ask "Ask Before Saving">
-<!ENTITY sm.exit.nothing "Don&apos;t Save">
-<!ENTITY sm.startup "Startup Session:">
-<!ENTITY sm.lastsession "Last Session">
-<!ENTITY sm.previouslast "Previous to Last">
-<!ENTITY sm.chooseifempty "Choose another if empty">
-<!ENTITY sm.restore.options "When Restoring Sessions:">
-<!ENTITY sm.restore.overwrite "Overwrite existing windows">
-<!ENTITY sm.restore.overwriteTabs "And tabs">
-<!ENTITY sm.restore.closedWinList "Save windows in closed windows list">
-<!ENTITY sm.restore.merge "Join multiple windows into one">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "When not restoring on start">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Preserve Tabs:">
 <!ENTITY sm.preserve.history "History">
 <!ENTITY sm.preserve.protect "Protect Status">
 <!ENTITY sm.preserve.locked "Lock Status">
 <!ENTITY sm.preserve.permission "Permissions">
 <!ENTITY sm.preserve.scroll1 "Scroll Position">
-<!ENTITY sm.restore.winOptions "Preserve Windows:">
-<!ENTITY sm.restore.selectedTab "Selected tab">
-<!ENTITY sm.restore.closedTabs "Closed tabs list">
 <!ENTITY incompatible.extensions "Some of your extensions are incompatible with Tab Mix Plus, it is recommended that you will disable or uninstall those extensions.">
 <!ENTITY incompatible.button.label "Show List">
diff --git a/addon/chrome/locale/en-US/session-manager.properties b/addon/chrome/locale/en-US/session-manager.properties
deleted file mode 100644
index 9381a5992..000000000
--- a/addon/chrome/locale/en-US/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Save closed tabs list with this session
-sm.button.continue.label=Continue
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Session Manager - Save Session
-sm.askBeforeSave.msg0=Would you like to save your session?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=If you don\'t save, next time you start the browser the \'Last Session\' will be empty.
-sm.askBeforeSave.button0.label=Save Session
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Don\'t Save
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=Session Manager - Corrupted Database
-sm.corrupted.msg0=Session Manager cannot load its database from corrupted session.rdf.
-sm.corrupted.msg1=The file session.rdf will be deleted, a copy can be found in session.old in your profile. sessions backups are in <profile>/sessionbackups
-sm.areYouSure.msg=Are you sure you want to continue?
-sm.canChooseStartup.msg=You can choose a session to be your new startup session from the list:
-sm.addtoStartup.title=Session Manager - Add to Startup Session
-sm.addtoStartup.msg.windows=You are about to add window(s) to your startup session:
-sm.addtoStartup.msg.tabs=You are about to add tab(s) to your startup session:
-sm.addtoStartup.button0.label=Add to Session
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Don\'t Add
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=Session Manager - Override Startup Session
-sm.replaceStartup.msg=You are about to replace your startup session:
-sm.replaceStartup.button0.label=Replace Session
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=Don\'t Replace
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=Session Manager - Delete Startup Session
-sm.removeStartup.msg0=You are about to delete your startup session:
-sm.removeStartup.msg1=Choose a session to be your new startup session from the list:
-sm.removeStartup.button0.label=Delete
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=Don\'t Delete
-sm.removeStartup.button1.accesskey=T
-sm.title=Session Manager
-sm.dontSaveBlank.msg=Session Manager doesn\'t save blank windows
-sm.sessionSave.error=Error in Session Manager, session didn\'t save
-sm.sessionName.title.rename=Session Manager - Rename Session
-sm.sessionName.title.saveprevious=Session Manager - Save Session
-sm.sessionName.title.savethiswindow=Session Manager - Save This Window
-sm.sessionName.title.saveallwindows=Session Manager - Save All Windows
-sm.sessionName.msg0=Enter Session Name:
-sm.sessionName.msg1=Name must be at least one letter or number.
-sm.sessionName.msg2=This name is already in use!
-sm.sessionName.msg3=Are you sure you want to replace the session?
-sm.sessionName.button0.label=Rename Session
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Don\'t Rename
-sm.sessionName.button1.accesskey=D
-sm.session.empty=empty
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Session Manager - Delete All Saved Sessions
-sm.removeAll.title.closedwindow=Session Manager - Delete All Closed Windows
-sm.removeAll.msg0=Are you sure you want to delete all your saved sessions?
-sm.removeAll.msg1=If you choose \'Delete\' your startup session will be the \'Last Session\'.
-sm.removeAll.msg2=Are you sure you want to delete all your closed windows?
-sm.sessionMenu.last=Last Session
-sm.sessionMenu.lastDefault=Last Session - Default
-sm.sessionMenu.lastgood=Last Good Session
-sm.sessionMenu.previous=Previous to Last
-sm.sessionMenu.crashed=Crashed Session
-sm.afterCrash.title=Session Manager - Restore after Crash
-sm.afterCrash.chkbox.label=Enable Session Manager
-sm.afterCrash.msg0=Your last session Crashed!
-sm.afterCrash.msg0.again=Your last Crashed session Crashed again!
-sm.afterCrash.msg1=Choose session to restore from the list:
-sm.afterCrash.msg2=Choose how to continue
-sm.afterCrash.msg3=Session Manager is currently disabled, if you enable Session Manager, you will be able to restore crashed sessions, closed sessions, saved sessions and closed windows from the Session Manager menu.
-sm.afterCrash.msg4=You can also restore the crashed session later from the Session Manager menu.
-sm.afterCrash.msg5=but nothing was saved.
-sm.afterCrash.msg6=but there isn\'t any open window in your Crashed session
-sm.afterCrash.msg7=Choose window to restore from Closed Windows list
-sm.afterCrash.msg8=(you can also restore closed windows later from the Closed Windows menu)
-sm.afterCrash.msg9=Your Crashed session is empty!
-sm.afterCrash.msg10=Session Manager did not find any sessions to restore from.
-sm.afterCrash.button0.label=Restore Session
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restore Crashed Session
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Don\'t Restore
-sm.afterCrash.button1.accesskey=D
-sm.start.title=Session Manager - Restore Session
-sm.start.chkbox.label=Enable Crash Recovery
-sm.start.msg0=Your Startup session is empty!
-sm.start.msg1=Crash Recovery is currently disabled, if you enable Crash Recovery, you will be able to restore crashed sessions.
-sm.start.msg2=Error while looking for your startup session, your saved startup session does not exist.
-sm.restoreError.msg0=Error in session manager file!
-sm.restoreError.msg1=Delete the session you tried to restore
-sm.disable.msg=Firefox has a built-in session restore feature.
-sm.disable.msg1=Would you like to enable built-in session restore and disable the Tab Mix Plus Session Manager?
-sm.disable.msg2=Would you like to enable Tab Mix Plus Session Manager and disable the built-in session restore?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession = History Session
-sm.bookmarks.closedWindow = Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID = Window %S
diff --git a/addon/chrome/locale/en-US/tabmix.dtd b/addon/chrome/locale/en-US/tabmix.dtd
index 1204c30a3..185342084 100644
--- a/addon/chrome/locale/en-US/tabmix.dtd
+++ b/addon/chrome/locale/en-US/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Delete from the list">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "Preferences">
-<!ENTITY saveWindow.label "Save This Window">
-<!ENTITY saveAllWindows.label "Save All Windows">
 <!ENTITY sm.context.overwrite "Restore, Overwrite Existing Window(s)">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Restore to New Window(s)">
diff --git a/addon/chrome/locale/es-ES/misc.dtd b/addon/chrome/locale/es-ES/misc.dtd
index 1fa5ba191..15890909f 100644
--- a/addon/chrome/locale/es-ES/misc.dtd
+++ b/addon/chrome/locale/es-ES/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Elija zona horaria de la lista o introduzca la suya">
 <!ENTITY specifyreload.label "Especificar tiempo de recarga">
-<!ENTITY sanitizer.entry "Historial de Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "¿Está seguro de querer borrar TODOS los datos de sus sesiones guardadas, incluyendo copias de seguridad?">
diff --git a/addon/chrome/locale/es-ES/pref-tabmix.dtd b/addon/chrome/locale/es-ES/pref-tabmix.dtd
index 4f5b593e6..063015bc0 100644
--- a/addon/chrome/locale/es-ES/pref-tabmix.dtd
+++ b/addon/chrome/locale/es-ES/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Mostrar su página de inicio">
 <!ENTITY startupBlankPage.label "Mostrar página en blanco">
 <!ENTITY startupLastSession1.label "Mostrar ventana y pestañas de última sesión">
-<!ENTITY ss.enable.label "Utilizar la funcionalidad interna de restaurar sesión de Firefox">
-<!ENTITY ss.enable.tooltip "Deseleccionar si se quiere utilizar el Administrador de sesiones de Tabmix">
 <!ENTITY ss.advanced_setting "Predisposiciones avanzadas">
 <!ENTITY ss.advanced_setting.warning "No debe cambiarlas salvo que realmente sepa lo que está haciendo">
 <!ENTITY ss.interval "Mínimo intervalo de tiempo entre guardado de dos estados consecutivos">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Todos los sitios">
 <!ENTITY ss.privacy_level.unencrypted "Sólo sitios no encriptados">
 <!ENTITY ss.privacy_level.nosites "Ningún sitio">
-<!ENTITY sessionManger.enable "Activar Administrador de sesiones">
 <!ENTITY crashRecovery.enable "Activar Restaurar tras cierre anómalo">
-<!ENTITY sm.StartExit "Inicio/cierre">
-<!ENTITY sm.restore "Restaurar">
-<!ENTITY sm.preserve "Conservar">
 <!ENTITY sm.start "Al iniciarse el navegador:">
-<!ENTITY sm.start.restore "Restaurar">
-<!ENTITY sm.start.ask "Preguntar antes de restaurar">
-<!ENTITY sm.start.nothing "No restaurar">
-<!ENTITY sm.exit "Al cerrar el navegador:">
-<!ENTITY sm.exit.save "Guardar sesión">
-<!ENTITY sm.exit.ask "Preguntar antes de guardar">
-<!ENTITY sm.exit.nothing "No guardar">
-<!ENTITY sm.startup "Sesión de inicio:">
-<!ENTITY sm.lastsession "Última sesión">
-<!ENTITY sm.previouslast "Penúltima sesión">
-<!ENTITY sm.chooseifempty "Elegir otra si está vacía">
-<!ENTITY sm.restore.options "Al restaurar sesiones:">
-<!ENTITY sm.restore.overwrite "Sobrescribir ventanas existentes">
-<!ENTITY sm.restore.overwriteTabs "y pestañas">
-<!ENTITY sm.restore.closedWinList "Guardar ventanas en lista de ventanas cerradas">
-<!ENTITY sm.restore.merge "Combinar varias ventanas en una">
-<!ENTITY sm.restore.bypassCache "Evitar la caché al restaurar">
-<!ENTITY sm.notrestore.label "Cuando no se restaura al iniciar">
-<!ENTITY sm.restorePinned1.label "Restaurar sus pestañas fijas de la última sesión">
 <!ENTITY sm.preserve.options "Conservar pestañas:">
 <!ENTITY sm.preserve.history "Historial">
 <!ENTITY sm.preserve.protect "Estatus de protección">
 <!ENTITY sm.preserve.locked "Estatus de bloqueo">
 <!ENTITY sm.preserve.permission "Permisos">
 <!ENTITY sm.preserve.scroll1 "Posición de rotación">
-<!ENTITY sm.restore.winOptions "Conservar para ventanas:">
-<!ENTITY sm.restore.selectedTab "Pestaña seleccionada">
-<!ENTITY sm.restore.closedTabs "Lista de pestañas cerradas">
 <!ENTITY incompatible.extensions "Algunas de sus extensiones son incompatibles con Tab Mix Plus, le recomendamos desactivarlas o desinstalarlas.">
 <!ENTITY incompatible.button.label "Mostrar la lista">
diff --git a/addon/chrome/locale/es-ES/session-manager.properties b/addon/chrome/locale/es-ES/session-manager.properties
deleted file mode 100644
index 39d846271..000000000
--- a/addon/chrome/locale/es-ES/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Guardar lista pestañas cerradas en la sesión
-sm.button.continue.label=Continuar
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Administrador de sesiones - Guardar sesión
-sm.askBeforeSave.msg0=¿Quiere guardar su sesión?
-sm.askBeforeSave.msg2=Sólo se guardarán en disco las ventanas no privadas
-sm.askBeforeSave.msg1=Si no la guarda, la próxima vez que inicie el navegador la Última sesión estará vacía.
-sm.askBeforeSave.button0.label=Guardar sesión
-sm.askBeforeSave.button0.accesskey=G
-sm.askBeforeSave.button1.label=No guardar
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Administrador de sesiones - Base de datos corrupta
-sm.corrupted.msg0=El Administrador de sesiones no pudo cargar su base de datos del archivo corrupto session.rdf
-sm.corrupted.msg1=Se eliminará el archivo session.rdf, pero se guardará una copia en su perfil como session.old. Las copias de respaldo de sesión están en <profile>/sessionbackups
-sm.areYouSure.msg=¿Está seguro de querer continuar?
-sm.canChooseStartup.msg=Puede elegir una sesión de la lista como su nueva sesión de inicio.
-sm.addtoStartup.title=Administrador de sesiones - Añadir a sesión de inicio
-sm.addtoStartup.msg.windows=Va a añadir una(s) ventana(s) a su sesión de inicio:
-sm.addtoStartup.msg.tabs=Va a añadir una(s) pestaña(s) a su sesión de inicio:
-sm.addtoStartup.button0.label=Añadir a sesión
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=No añadir
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Administrador de sesiones - Reemplazar sesión de inicio
-sm.replaceStartup.msg=Va a cambiar su sesión de inicio:
-sm.replaceStartup.button0.label=Reemplazar sesión
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=No reemplazar
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Administrador de sesiones - Eliminar sesión de inicio
-sm.removeStartup.msg0=Va a eliminar su sesión de inicio:
-sm.removeStartup.msg1=Elija una sesión de la lista como su nueva sesión de inicio:
-sm.removeStartup.button0.label=Eliminar
-sm.removeStartup.button0.accesskey=E
-sm.removeStartup.button1.label=No eliminar
-sm.removeStartup.button1.accesskey=N
-sm.title=Administrador de sesiones
-sm.dontSaveBlank.msg=El Administrador de sesiones no guarda ventanas vacías
-sm.sessionSave.error=Error de Administrador de sesiones, no se guardó la sesión
-sm.sessionName.title.rename=Administrador de sesiones - Renombrar sesión
-sm.sessionName.title.saveprevious=Administrador de sesiones - Guardar sesión
-sm.sessionName.title.savethiswindow=Administrador de sesiones - Guardar esta ventana
-sm.sessionName.title.saveallwindows=Administrador de sesiones - Guardar todas las ventanas
-sm.sessionName.msg0=Introducir nombre sesión:
-sm.sessionName.msg1=Nombre debe contener al menos una letra o número.
-sm.sessionName.msg2=Este nombre ya está siendo utilizado
-sm.sessionName.msg3=¿Está seguro de querer reemplazar la sesión?
-sm.sessionName.button0.label=Renombrar sesión
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=No renombrar
-sm.sessionName.button1.accesskey=D
-sm.session.empty=vacía
-sm.session.tabs=P
-sm.session.windows=V
-sm.removeAll.title.session=Administrador de sesiones - Eliminar todas las sesiones guardadas
-sm.removeAll.title.closedwindow=Administrador de sesiones - Eliminar todas las ventanas cerradas
-sm.removeAll.msg0=¿Está seguro de querer eliminar todas las sesiones guardadas?
-sm.removeAll.msg1=Si selecciona Eliminar su sesión de inicio será la Última sesión.
-sm.removeAll.msg2=¿Está seguro de querer eliminar todas las ventanas cerradas?
-sm.sessionMenu.last=Última sesión
-sm.sessionMenu.lastDefault=Última sesión - Predeterminada
-sm.sessionMenu.lastgood=Última sesión sin errores
-sm.sessionMenu.previous=Penúltima
-sm.sessionMenu.crashed=Sesión finalizada de forma anómala
-sm.afterCrash.title=Administrador de sesiones - Recuperación tras finalizar anómalamente
-sm.afterCrash.chkbox.label=Activar Administrador de sesiones
-sm.afterCrash.msg0=Su última sesión finalizó de forma anómala
-sm.afterCrash.msg0.again=¡Su última sesión finalizada anómalamente falló de nuevo!
-sm.afterCrash.msg1=Escoger de la lista la sesión a restaurar:
-sm.afterCrash.msg2=Elegir como continuar
-sm.afterCrash.msg3=El Administrador de sesiones está desactivado, si lo activa podrá recuperar sesiones finalizadas anómalamente, sesiones cerradas, sesiones guardadas y ventanas cerradas del menú del Administrador de sesiones
-sm.afterCrash.msg4=También puede recuperar más tarde la sesión finalizada de forma anómala a partir del menú del Administrador de sesiones
-sm.afterCrash.msg5=pero no se ha guardado nada.
-sm.afterCrash.msg6=pero no hay ninguna ventana abierta en la sesión que finalizó anómalamente.
-sm.afterCrash.msg7=Elegir ventana a recuperar en la lista de ventanas cerradas
-sm.afterCrash.msg8=(también puede recuperar más tarde las ventanas cerradas con el menú de ventanas cerradas)
-sm.afterCrash.msg9=La sesión que finalizó anómalamente está vacía!
-sm.afterCrash.msg10=El Administrador de sesiones no encontró ninguna sesión que restaurar.
-sm.afterCrash.button0.label=Restaurar sesión
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaurar sesión finalizada anómalamente
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=No restaurar
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Administrador de sesiones - Restaurar sesión
-sm.start.chkbox.label=Activar Administrador de sesiones
-sm.start.msg0=Su sesión de inicio está vacía
-sm.start.msg1=La función Restaurar tras cerrar de forma anómala está desactivada, si la activa podrá restaurar sesiones que terminaron incorrectamente o con problemas.
-sm.start.msg2=Error al buscar su sesión inicio, no existe sesión de inicio guardada.
-sm.restoreError.msg0=Error en archivo de Administrador de sesiones
-sm.restoreError.msg1=Eliminar la sesión que intentaba restaurar
-sm.disable.msg=Firefox tiene una funcionalidad estándar de restauración de sesión fallida.
-sm.disable.msg1=¿Desea habilitar la funcionalidad estándar de restauración de sesión de Firefox y deshabilitar el Administrador de sesiones de Tabmix?
-sm.disable.msg2=¿Quiere habilitar el Administrador de sesiones de Tabmix y deshabilitar la funcionalidad estándar de restauración de sesión de Firefox?
-sm.tabview.hiddengroups=Otras pestañas se restauraron en grupos ocultos.
-sm.tabview.hiddengroups.removed=Eliminados grupos de pestañas ocultos.
-sm.tabview.removed=Se eliminó de Firefox la función de grupos de pestañas (Panorama).
-sm.tabview.removed.learnMore.label=Más información
-sm.tabview.removed.learnMore.accesskey=f
-sm.tabview.install.label=Instalar la extensión Tab Groups
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Historial de sesiones, copia de respaldo con datos de grupos
-sm.tabview.backup.crashed=Sesiones terminadas anómalamente, copia de respaldo con datos de grupos
-sm.tabview.backup.msg=El administrador de sesiones de Tab Mix Plus ha guardado una copia de su sesión.
-sm.bookmarks.historySession=Historial de sesión
-sm.bookmarks.closedWindow=Ventana cerrada
-sm.bookmarks.sessionFolder=Sesiones de Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Ventana %S
diff --git a/addon/chrome/locale/es-ES/tabmix.dtd b/addon/chrome/locale/es-ES/tabmix.dtd
index 652e482eb..31bf0925d 100644
--- a/addon/chrome/locale/es-ES/tabmix.dtd
+++ b/addon/chrome/locale/es-ES/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Eliminar de la lista">
 <!ENTITY deletelist.accesskey "l">
 <!ENTITY settings.label "Predisposiciones">
-<!ENTITY saveWindow.label "Guardar esta ventana">
-<!ENTITY saveAllWindows.label "Guardar todas las ventanas">
 <!ENTITY sm.context.overwrite "Restaurar sobreescribiendo ventana(s) existente(s)">
 <!ENTITY sm.context.overwrite.key "o">
 <!ENTITY sm.context.restore.new "Restaurar en nueva(s) ventana(s)">
diff --git a/addon/chrome/locale/et-EE/misc.dtd b/addon/chrome/locale/et-EE/misc.dtd
index 66ed30d38..e19ab181b 100644
--- a/addon/chrome/locale/et-EE/misc.dtd
+++ b/addon/chrome/locale/et-EE/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Vali ajavahemik loendist või sisesta oma ajavahemik">
 <!ENTITY specifyreload.label "Määra uuestilaadimiste ajavahe">
-<!ENTITY sanitizer.entry "Tab Mix Plus'i salvestatud seansid">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Kas oled kindel, et tahad kustutada KÕIK salvestatud seansid ja varufailid?">
diff --git a/addon/chrome/locale/et-EE/pref-tabmix.dtd b/addon/chrome/locale/et-EE/pref-tabmix.dtd
index 8efcca73a..10e9b6e31 100644
--- a/addon/chrome/locale/et-EE/pref-tabmix.dtd
+++ b/addon/chrome/locale/et-EE/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Kuvatakse avalehte">
 <!ENTITY startupBlankPage.label "Kuvatakse tühja lehte">
 <!ENTITY startupLastSession1.label "Kuvatakse viimati lahti olnud aknaid ja kaarte">
-<!ENTITY ss.enable.label "Kasuta Firefoxi sisseehitatud seansi taastamise funktsiooni">
-<!ENTITY ss.enable.tooltip "Tab Mix Plus'i Seansside halduri kasutamiseks eemalda märgistus">
 <!ENTITY ss.advanced_setting "Täpsemad sätted">
 <!ENTITY ss.advanced_setting.warning "Ära neid sätteid muuda, kui sa pole kindel, mida sa teed">
 <!ENTITY ss.interval "Väikseim ajavahe kahe salvestamise vahel">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Kõik saidid">
 <!ENTITY ss.privacy_level.unencrypted "Ainult krüptimata saidid">
 <!ENTITY ss.privacy_level.nosites "Mitte ükski sait">
-<!ENTITY sessionManger.enable "Luba Seansside halduri kasutamine">
 <!ENTITY crashRecovery.enable "Luba krahhieelse olukorra taastamine">
-<!ENTITY sm.StartExit "Käivitumine/Väljumine">
-<!ENTITY sm.restore "Taastamine">
-<!ENTITY sm.preserve "Meelde jätmine">
 <!ENTITY sm.start "Brauseri käivitumisel:">
-<!ENTITY sm.start.restore "Taasta">
-<!ENTITY sm.start.ask "Küsi enne taastamist">
-<!ENTITY sm.start.nothing "Ära taasta">
-<!ENTITY sm.exit "Brauserist väljumisel:">
-<!ENTITY sm.exit.save "Salvesta seanss">
-<!ENTITY sm.exit.ask "Küsi enne salvestamist">
-<!ENTITY sm.exit.nothing "Ära salvesta">
-<!ENTITY sm.startup "Käivitus-seanss">
-<!ENTITY sm.lastsession "Viimane seanss">
-<!ENTITY sm.previouslast "Eelviimane">
-<!ENTITY sm.chooseifempty "Vali mõni muu, kui see on tühi">
-<!ENTITY sm.restore.options "Seansside taastamisel:">
-<!ENTITY sm.restore.overwrite "Kirjuta üle olemasolevad aknad">
-<!ENTITY sm.restore.overwriteTabs "Ja kaardid">
-<!ENTITY sm.restore.closedWinList "Salvesta suletud akende loendis olevad aknad">
-<!ENTITY sm.restore.merge "Ühenda kõik aknad">
-<!ENTITY sm.restore.bypassCache "Taastamisel ära kasuta vahemälu">
-<!ENTITY sm.notrestore.label "Kui käivitumisel seanssi ei taastata, siis">
-<!ENTITY sm.restorePinned1.label "Taasta oma viimase seansi püsikaardid">
 <!ENTITY sm.preserve.options "Jäta meelde kaartide:">
 <!ENTITY sm.preserve.history "Ajalugu">
 <!ENTITY sm.preserve.protect "Kaitstuse olek">
 <!ENTITY sm.preserve.locked "Lukustatuse olek">
 <!ENTITY sm.preserve.permission "Kasutada lubamised">
 <!ENTITY sm.preserve.scroll1 "Kerimise olek">
-<!ENTITY sm.restore.winOptions "Jäta meelde akende:">
-<!ENTITY sm.restore.selectedTab "Valitud kaart">
-<!ENTITY sm.restore.closedTabs "Suletud kaartide loend">
 <!ENTITY incompatible.extensions "Mõni sinu lisa ei ühildu Tab Max Plusiga; on soovitatav, et sa kas keelad või eemaldad need lisad.">
 <!ENTITY incompatible.button.label "Näita nimekirja">
diff --git a/addon/chrome/locale/et-EE/session-manager.properties b/addon/chrome/locale/et-EE/session-manager.properties
deleted file mode 100644
index f8ca62c1c..000000000
--- a/addon/chrome/locale/et-EE/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Salvesta suletud kaartide loend selle seansiga
-sm.button.continue.label=Jätka
-sm.button.continue.accesskey=J
-sm.askBeforeSave.title=Seansside haldur - Seansi salvestamine
-sm.askBeforeSave.msg0=Kas soovid oma seansi salvestada?
-sm.askBeforeSave.msg2=Salvestatakse ainult mitteprivaatsed aknad
-sm.askBeforeSave.msg1=Kui sa ei salvesta, siis on järgmisel brauseri käivitumisel \'Viimane seanss\' tühi.
-sm.askBeforeSave.button0.label=Salvesta seanss
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Ära salvesta
-sm.askBeforeSave.button1.accesskey=R
-sm.corrupted.title=Seansside haldur - Vigane andmebaas
-sm.corrupted.msg0=Seansside haldur ei saa oma andmebaasi laadida vigasest session.rdf failist.
-sm.corrupted.msg1=Fail session.rdf kustutatakse, selle koopia võib leida oma profiili kaustast nimega session.old. Seansside varufailid on kaustas <profiil>/sessionbackups
-sm.areYouSure.msg=Kas oled kindel, et tahad jätkata?
-sm.canChooseStartup.msg=Sa võid valida omale uue käivitumis-seansi seansside loendist:
-sm.addtoStartup.title=Seansside haldur - Käivitumis-seansile lisamine
-sm.addtoStartup.msg.windows=Sa oled lisamas akent/aknaid oma käivitumis-seansile:
-sm.addtoStartup.msg.tabs=Sa oled lisamas kaarti/kaarte oma käivitumis-seansile:
-sm.addtoStartup.button0.label=Lisa seansile
-sm.addtoStartup.button0.accesskey=L
-sm.addtoStartup.button1.label=Ära lisa
-sm.addtoStartup.button1.accesskey=R
-sm.replaceStartup.title=Seansside haldur - Käivitumis-seansi muutmine
-sm.replaceStartup.msg=Sa oled asendamas oma käivitumis-seanssi:
-sm.replaceStartup.button0.label=Asenda seanss
-sm.replaceStartup.button0.accesskey=A
-sm.replaceStartup.button1.label=Ära asenda
-sm.replaceStartup.button1.accesskey=R
-sm.removeStartup.title=Seansside haldur - Käivitumis-seansi kustutamine
-sm.removeStartup.msg0=Sa oled kustutamas oma käivitumis-seanssi:
-sm.removeStartup.msg1=Vali loendist seanss, mis määratakse sinu käivitumis-seansiks:
-sm.removeStartup.button0.label=Kustuta
-sm.removeStartup.button0.accesskey=K
-sm.removeStartup.button1.label=Ära kustuta
-sm.removeStartup.button1.accesskey=R
-sm.title=Seansside haldur
-sm.dontSaveBlank.msg=Seansside haldur ei salvesta tühje aknaid
-sm.sessionSave.error=Viga Seansside halduris, seanssi ei salvestatud
-sm.sessionName.title.rename=Seansside haldur - Seansi nime muutmine
-sm.sessionName.title.saveprevious=Seansside haldur - Seansi salvestamine
-sm.sessionName.title.savethiswindow=Seansside haldur - Selle akna salvestamine
-sm.sessionName.title.saveallwindows=Seansside haldur - Kõikide akende salvestamine
-sm.sessionName.msg0=Sisesta seansi nimi:
-sm.sessionName.msg1=Nimi peab sisaldama vähemalt ühte tähte või numbrit.
-sm.sessionName.msg2=See nimi on juba kasutuses!
-sm.sessionName.msg3=Kas oled kindel, et tahad selle seansi asendada?
-sm.sessionName.button0.label=Muuda seansi nimi
-sm.sessionName.button0.accesskey=M
-sm.sessionName.button1.label=Ära muuda nime
-sm.sessionName.button1.accesskey=R
-sm.session.empty=tühi
-sm.session.tabs=K
-sm.session.windows=A
-sm.removeAll.title.session=Seansside haldur - Kõikide salvestatud seansside kustutamine
-sm.removeAll.title.closedwindow=Seansside haldur - Kõikide suletud akende kustutamine
-sm.removeAll.msg0=Kas oled kindel, et tahad kustutada kõik salvestatud seansid?
-sm.removeAll.msg1=Kui sa valid \'Kustuta\', siis sinu käivitumis-seansiks määratakse \'Viimane seanss\'.
-sm.removeAll.msg2=Kas oled kindel, et tahad kustutada kõik suletud aknad?
-sm.sessionMenu.last=Viimane seanss
-sm.sessionMenu.lastDefault=Viimane seanss - Vaikimisi
-sm.sessionMenu.lastgood=Viimane korralikult töötav seanss
-sm.sessionMenu.previous=Eelviimane
-sm.sessionMenu.crashed=Kokkujooksnud seanss
-sm.afterCrash.title=Seansside haldur - Krahhijärgne taastamine
-sm.afterCrash.chkbox.label=Luba Seansside halduri kasutamine
-sm.afterCrash.msg0=Sinu viimane seanss sulgus ootamatult!
-sm.afterCrash.msg0.again=Sinu viimane kokkujooksnud seanss sulgus jälle ootamatult!
-sm.afterCrash.msg1=Vali loendist, milline seanss taastada:
-sm.afterCrash.msg2=Vali, kuidas jätkata
-sm.afterCrash.msg3=Seansside halduri kasutamine on hetkel keelatud; kui sa lubad selle kasutamise, siis oled võimeline seansside halduri menüü kaudu taastama kokkujooksnud seansse, suletud seansse ja suletud aknaid.
-sm.afterCrash.msg4=Sa võid kokkujooksnud seansi taastada ka hiljem seansside halduri menüü kaudu.
-sm.afterCrash.msg5=aga midagi ei salvestatud.
-sm.afterCrash.msg6=aga sinu kokkujooksnud seansis ei ole ühtki avatud akent
-sm.afterCrash.msg7=Vali Suletud Akende loendist, milline aken taasavada
-sm.afterCrash.msg8=(suletud aknaid on võimalik taasavada ka menüüs Suletud aknad)
-sm.afterCrash.msg9=Sinu kokkujooksnud seanss on tühi!
-sm.afterCrash.msg10=Seansside haldur ei leidnud seansse, mida taastada.
-sm.afterCrash.button0.label=Taasta seanss
-sm.afterCrash.button0.accesskey=T
-sm.afterCrash.button0.crashed.label=Taasta kokkujooksnud seanss
-sm.afterCrash.button0.crashed.accesskey=T
-sm.afterCrash.button1.label=Ära taasta
-sm.afterCrash.button1.accesskey=R
-sm.start.title=Seansside haldur - Seansi taastamine
-sm.start.chkbox.label=Luba krahhijärgne taastamine
-sm.start.msg0=Sinu käivitumis-seanss on tühi!
-sm.start.msg1=Krahhijärgne taastamine on hetkel keelatud; kui sa selle lubad, siis suudad sa kokkujooksnud seansse taastada.
-sm.start.msg2=Viga käivitus-seansi otsimisel, salvestatud käivitus-seanssi pole olemas.
-sm.restoreError.msg0=Viga seansside halduri failis!
-sm.restoreError.msg1=Kustuta seanss, mida sa üritasid taastada
-sm.disable.msg=Firefoxil on sisseehitatud seansi taastamise funktsioon.
-sm.disable.msg1=Kas soovid lubada Firefoxi sisseehitatud seansside taastamise funktsiooni ja keelata Tab Mix Plus\'i Seansside halduri?
-sm.disable.msg2=Kas sa soovid lubada Tab Mix Plus\'i Seansside halduri ja keelata Firefoxi sisseehitatud seansside taastamise funktsiooni?
-sm.tabview.hiddengroups=Veel kaarte taastatud peidetud gruppidesse.
-sm.tabview.hiddengroups.removed=Peidetud kaardigrupid eemaldati.
-sm.tabview.removed=Kaardigruppide funktsioon Tab Groups (Panorama) eemaldati Firefoxist.
-sm.tabview.removed.learnMore.label=Lisateave
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Paigalda lisa Tab Groups
-sm.tabview.install.accesskey=P
-sm.tabview.backup.session=Ajaloo seanss, varundus gruppide andmetega
-sm.tabview.backup.crashed=Kokkujooksnud seanss, varundus gruppide andmetega
-sm.tabview.backup.msg=Tab Mix Plusi seansside haldur on sinu seansi koopia salvestanud.
-sm.bookmarks.historySession=Ajaloo seanss
-sm.bookmarks.closedWindow=Suletud aken
-sm.bookmarks.sessionFolder=Tab Mix Plusi seansid
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=%S. aken
diff --git a/addon/chrome/locale/et-EE/tabmix.dtd b/addon/chrome/locale/et-EE/tabmix.dtd
index 0d957b937..9cc6f4f79 100644
--- a/addon/chrome/locale/et-EE/tabmix.dtd
+++ b/addon/chrome/locale/et-EE/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Kustuta loendist">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "Sätted">
-<!ENTITY saveWindow.label "Salvesta see aken">
-<!ENTITY saveAllWindows.label "Salvesta kõik aknad">
 <!ENTITY sm.context.overwrite "Taasta, kirjutades olemasoleva(d) akna(d) üle">
 <!ENTITY sm.context.overwrite.key "Ü">
 <!ENTITY sm.context.restore.new "Taasta uude aknasse (uutesse akendesse)">
diff --git a/addon/chrome/locale/fa-IR/misc.dtd b/addon/chrome/locale/fa-IR/misc.dtd
index 365225873..169ae6688 100644
--- a/addon/chrome/locale/fa-IR/misc.dtd
+++ b/addon/chrome/locale/fa-IR/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Choose time from the list or enter your own time">
 <!ENTITY specifyreload.label "تعیین زمان بارگذاری دوباره">
-<!ENTITY sanitizer.entry "پیشینه Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "پ">
-<!ENTITY sanitizer.entry.confirm "Are you sure you want to erase ALL your saved sessions data including backups ?">
diff --git a/addon/chrome/locale/fa-IR/pref-tabmix.dtd b/addon/chrome/locale/fa-IR/pref-tabmix.dtd
index fb95db789..e4e39a74c 100644
--- a/addon/chrome/locale/fa-IR/pref-tabmix.dtd
+++ b/addon/chrome/locale/fa-IR/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "نمایش یک صفحه خالی">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "استفاده از برنامه بازگردانی نشست داخلی فایرفاکس">
-<!ENTITY ss.enable.tooltip "با انتخاب نکردن این گزینه هر دو مدیر نشست هزمان استفاده خواهند شد">
 <!ENTITY ss.advanced_setting "تنظیمات پیشرفته">
 <!ENTITY ss.advanced_setting.warning "فقط در صورتی این گزینه را تغییر دهید که از کار خود مطمئن باشید">
 <!ENTITY ss.interval "حداقل زمان بین دو ذخیره">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "تمام سایت ها">
 <!ENTITY ss.privacy_level.unencrypted "فقط سایت های رمزبندی نشده">
 <!ENTITY ss.privacy_level.nosites "هیچ سایتی">
-<!ENTITY sessionManger.enable "فعال کردن مدیریت نشست">
 <!ENTITY crashRecovery.enable "فعال کردن بازیافت نشست قفل شده">
-<!ENTITY sm.StartExit "شروع/خروج">
-<!ENTITY sm.restore "بازگردانی">
-<!ENTITY sm.preserve "محافظت کردن">
 <!ENTITY sm.start "هنگام اجرای مروگر:">
-<!ENTITY sm.start.restore "بازگردانی">
-<!ENTITY sm.start.ask "پرسیدن سوال قبل از بازگردانی">
-<!ENTITY sm.start.nothing "بازگردانی نکن">
-<!ENTITY sm.exit "هنگام بستن مرورگر:">
-<!ENTITY sm.exit.save "ذخیره نشست">
-<!ENTITY sm.exit.ask "پرسیدن سوال قبل از ذخیره کردن">
-<!ENTITY sm.exit.nothing "ذخیره نکن">
-<!ENTITY sm.startup "نشست اولیه:">
-<!ENTITY sm.lastsession "آخرین نشست">
-<!ENTITY sm.previouslast "یکی مانده به آخر">
-<!ENTITY sm.chooseifempty "انتخاب یکی دیگر در صورت خالی بودن">
-<!ENTITY sm.restore.options "هنگام بازگردانی نشست ها:">
-<!ENTITY sm.restore.overwrite "باز نویسی روی پنجره ها و تب های">
-<!ENTITY sm.restore.overwriteTabs "فعلی">
-<!ENTITY sm.restore.closedWinList "پنجره های موجود در لیست پنجره های بسته شده را ذخیره کن">
-<!ENTITY sm.restore.merge "ترکیب کردن پنجره های">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "When not restoring on start">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "نگاه داشتن تب ها:">
 <!ENTITY sm.preserve.history "تاریخچه">
 <!ENTITY sm.preserve.protect "وضعیت محافظت شده">
 <!ENTITY sm.preserve.locked "وضعیت قفل">
 <!ENTITY sm.preserve.permission "مجوزها">
 <!ENTITY sm.preserve.scroll1 "Scroll Position">
-<!ENTITY sm.restore.winOptions "نگاه داشتن پنجره ها:">
-<!ENTITY sm.restore.selectedTab "تب های انتخاب شده">
-<!ENTITY sm.restore.closedTabs "لیست تب های بسته شده">
 <!ENTITY incompatible.extensions "سازگار نیستند.بهتر است آنها را پاک یا غیرفعال کنید Tab Mix Plus بعضی از اکستنشن های شما با">
 <!ENTITY incompatible.button.label "نمایش لیست">
diff --git a/addon/chrome/locale/fa-IR/session-manager.properties b/addon/chrome/locale/fa-IR/session-manager.properties
deleted file mode 100644
index f820afa52..000000000
--- a/addon/chrome/locale/fa-IR/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=ذخیره لیست برگه ها همراه با نشست
-sm.button.continue.label=ادامه
-sm.button.continue.accesskey=h
-sm.askBeforeSave.title=مدیریت نشست-ذخیره نشست
-sm.askBeforeSave.msg0=نشست ذخیره شود؟
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=اگر نشست را ذخیره نکنید برای استفاده بعدی بخش آخرین نشست خالی خواهد بود
-sm.askBeforeSave.button0.label=ذخیره نشست
-sm.askBeforeSave.button0.accesskey=ذ
-sm.askBeforeSave.button1.label=ذخیره نکن
-sm.askBeforeSave.button1.accesskey=ذ
-sm.corrupted.title=مدیریت نشست-مشکل در دیتابیس
-sm.corrupted.msg0=مدیر نشست نمی تواند دیتابیس را بارگذاری کند.فایل session.rdf آسیب دیده است.
-sm.corrupted.msg1=فایل session.rdf پاک خواهد شد.نسخه ای از این فایل با نام session.old ذخیره می شود.
-sm.areYouSure.msg=آیا از ادامه کار اطمینان دارید؟
-sm.canChooseStartup.msg=شما می توانید یک نشست را از لیست به عنوان نشست اولیه خود تعیین کنید
-sm.addtoStartup.title=مدیریت نشست-افزودن به نشست اولیه
-sm.addtoStartup.msg.windows=شما تصمیم به افزودن پنجره(ها) به نشست اولیه دارید
-sm.addtoStartup.msg.tabs=شما تصمیم به افزودن برگه(ها) به نشست اولیه دارید
-sm.addtoStartup.button0.label=افزودن به نشست
-sm.addtoStartup.button0.accesskey=ا
-sm.addtoStartup.button1.label=اضافه نکن
-sm.addtoStartup.button1.accesskey=ا
-sm.replaceStartup.title=مدیریت نشست-متوقف کردن نشست اولیه
-sm.replaceStartup.msg=شما تصمیم دارید نشست اولیه را جایگزین کنید
-sm.replaceStartup.button0.label=جایگزینی نشست
-sm.replaceStartup.button0.accesskey=ا
-sm.replaceStartup.button1.label=جایگزین نکن
-sm.replaceStartup.button1.accesskey=ا
-sm.removeStartup.title=مدیریت نشست-پاک کردن نشست اولیه
-sm.removeStartup.msg0=شما تصمیم دارید نشست اولیه را پاک کنید
-sm.removeStartup.msg1=یک نشست را (از لیست ) بعنوان نشست اولیه تعیین کنید
-sm.removeStartup.button0.label=پاک کردن
-sm.removeStartup.button0.accesskey=ک
-sm.removeStartup.button1.label=پاک نکن
-sm.removeStartup.button1.accesskey=ک
-sm.title=مدیریت نشست
-sm.dontSaveBlank.msg=مدیریت نشست صفحه های خالی را ذخیره نمی کند
-sm.sessionSave.error=خطا در مدیریت نشست،نشست ذخیره نشد
-sm.sessionName.title.rename=مدیریت نشست-تغییر نام نشست
-sm.sessionName.title.saveprevious=مدیریت نشست-ذخیره نشست
-sm.sessionName.title.savethiswindow=مدیریت نشست-ذخیره کردن این پنجره
-sm.sessionName.title.saveallwindows=مدیریت نشست-ذخیره کردن تمام پنجره ها
-sm.sessionName.msg0=نام نشست را وارد کنید
-sm.sessionName.msg1=نام نشست حداقل باید یک حرف یا عدد باشد
-sm.sessionName.msg2=پیش تر از این نام استفاده شده
-sm.sessionName.msg3=آیا از جایگزین کردن نشست اطمینان دارید؟
-sm.sessionName.button0.label=تغییر نام نشست
-sm.sessionName.button0.accesskey=م
-sm.sessionName.button1.label=نام را تغییر نده
-sm.sessionName.button1.accesskey=م
-sm.session.empty=خالی
-sm.session.tabs=ه
-sm.session.windows=ه
-sm.removeAll.title.session=مدیریت نشست-پاک کردن تمام نشست های ذخیره شده
-sm.removeAll.title.closedwindow=مدیریت نشست-پاک کردن لیست پنجره های بسته شده
-sm.removeAll.msg0=آیا از پاک کردن تمام نشست ها اطمینان دارید؟
-sm.removeAll.msg1=اگر گزینه حذف را انتخاب کنید نشست اولیه آخرین نشست خواهد بود
-sm.removeAll.msg2=آیا از پاک کردن لیست پنجره های بسته شده اطمینان دارید؟
-sm.sessionMenu.last=آخرین نشست
-sm.sessionMenu.lastDefault=آخرین نشست-پیش فرض
-sm.sessionMenu.lastgood=آخرین نشست مناسب
-sm.sessionMenu.previous=یکی مانده به آخر
-sm.sessionMenu.crashed=نشست قفل شده
-sm.afterCrash.title=مدیریت نشست-بازگردانی پس از قفل شدن
-sm.afterCrash.chkbox.label=فعال کردن مدیریت نشست
-sm.afterCrash.msg0=آخرین نشست شما خراب است
-sm.afterCrash.msg0.again=!آخرین نشست قفل شده شما دوباره قفل شد
-sm.afterCrash.msg1=نشستی را برای بازگردانی انتخاب کنید
-sm.afterCrash.msg2=روش ادامه کار را تعیین کنید
-sm.afterCrash.msg3=در حال حاضر مدیریت نشست غیر فعال است.در صورتی که آن را فعال کنید می توانید نشست های قفل شده،بسته شده،ذهیره شده و ... را بازگردانی کنید
-sm.afterCrash.msg4=شما می توانید نشست های قفل شده قبلی را نیز از منو بازگردانی کنید
-sm.afterCrash.msg5=چیزی ذخیره نشد
-sm.afterCrash.msg6=پنجره بازی در آخرین نشست قفل شده شما وجود ندارد
-sm.afterCrash.msg7=از لیست پنجره مورد نظر را برای بازگردانی انتخاب کنید
-sm.afterCrash.msg8=شما می توانید پنجره های بسته شده قبلی را نیز از منو بازگردانی کنید
-sm.afterCrash.msg9=نشست قفل شده شما خالی است
-sm.afterCrash.msg10=مدیریت نشست،نشستی را برای بازگردانی پیدا نکرد
-sm.afterCrash.button0.label=بازگردانی نشست
-sm.afterCrash.button0.accesskey=ا
-sm.afterCrash.button0.crashed.label=بازگردانی نشست قفل شده
-sm.afterCrash.button0.crashed.accesskey=ا
-sm.afterCrash.button1.label=نشست را باز گردانی نکن
-sm.afterCrash.button1.accesskey=ا
-sm.start.title=مدیریت نشست-بازگردانی نشست
-sm.start.chkbox.label=مدیریت نشست را فعال کن
-sm.start.msg0=نشست اولیه شما خالی است
-sm.start.msg1=بازیافت نشست های قفل شده غیر فعال است در صورتی که آن را فعال کنید می توانید نشست های قفل شده را بازگردانی کنید
-sm.start.msg2=خطا در اجرای نشست اولیه.نشست اولیه ذخیره شده پیدا نشد
-sm.restoreError.msg0=خطا در فایل مدیریت نشست
-sm.restoreError.msg1=حذف نشستی که سعی کردید آن را بازگردانی کنید
-sm.disable.msg=.فایرفاکس از یک مدیر نشست داخلی استفاده می کند
-sm.disable.msg1=آیا می خواهید مدیر نشست پیش فرض را فعال کرده و مدیر نشست TabMix را غیر فعال کنید؟
-sm.disable.msg2=دارید؟ TabMix آیا تصمیم به استفاده از مدیر نشست
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/fa-IR/tabmix.dtd b/addon/chrome/locale/fa-IR/tabmix.dtd
index 3fc169cfb..3c68609b3 100644
--- a/addon/chrome/locale/fa-IR/tabmix.dtd
+++ b/addon/chrome/locale/fa-IR/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "پاک کردن از لیست">
 <!ENTITY deletelist.accesskey "ز">
 <!ENTITY settings.label "تنظیمات">
-<!ENTITY saveWindow.label "ذخیره کردن این پنجره">
-<!ENTITY saveAllWindows.label "ذخیره کردن تمام پنجره ها">
 <!ENTITY sm.context.overwrite "بازگردانی،بازنویسی پنجره(های) فعلی">
 <!ENTITY sm.context.overwrite.key "ر">
 <!ENTITY sm.context.restore.new "بازگردانی در پنجره(های) جدید">
diff --git a/addon/chrome/locale/fr/misc.dtd b/addon/chrome/locale/fr/misc.dtd
index 96975a2f1..aede7b807 100644
--- a/addon/chrome/locale/fr/misc.dtd
+++ b/addon/chrome/locale/fr/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Choisir l&apos;intervalle de temps désiré dans la liste ou entrer une valeur particulière">
 <!ENTITY specifyreload.label "Spécifier le temps de rechargement">
-<!ENTITY sanitizer.entry "Historique de Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "H">
-<!ENTITY sanitizer.entry.confirm "Voulez-vous vraiment effacer la totalité de vos sessions enregistrées y compris les sauvegardes ?">
diff --git a/addon/chrome/locale/fr/pref-tabmix.dtd b/addon/chrome/locale/fr/pref-tabmix.dtd
index 2fbec658f..86a5689c0 100644
--- a/addon/chrome/locale/fr/pref-tabmix.dtd
+++ b/addon/chrome/locale/fr/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Afficher une page blanche">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Utiliser la fonctionnalité de restauration de sessions intégrée">
-<!ENTITY ss.enable.tooltip "Décocher pour autoriser l'utilisation avec le gestionnaire de sessions de Tabmix">
 <!ENTITY ss.advanced_setting "Réglages avancés">
 <!ENTITY ss.advanced_setting.warning "Ne les modifiez pas, à moins d'être certain de ce que vous faites">
 <!ENTITY ss.interval "Intervalle minimum de temps entre deux sauvegardes d'état">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Tous les sites">
 <!ENTITY ss.privacy_level.unencrypted "Les sites non chiffrés seulement">
 <!ENTITY ss.privacy_level.nosites "Aucun site">
-<!ENTITY sessionManger.enable "Activer le gestionnaire de sessions">
 <!ENTITY crashRecovery.enable "Activer la restauration après crash">
-<!ENTITY sm.StartExit "Démarrage/Fermeture">
-<!ENTITY sm.restore "Restaurer">
-<!ENTITY sm.preserve "Préserver">
 <!ENTITY sm.start "Quand le navigateur démarre :">
-<!ENTITY sm.start.restore "Restaurer">
-<!ENTITY sm.start.ask "Demander avant de restaurer">
-<!ENTITY sm.start.nothing "Ne pas restaurer">
-<!ENTITY sm.exit "Quand le navigateur est fermé :">
-<!ENTITY sm.exit.save "Enregistrer la session">
-<!ENTITY sm.exit.ask "Demander avant d'enregistrer la session">
-<!ENTITY sm.exit.nothing "Ne pas enregistrer">
-<!ENTITY sm.startup "Session de démarrage :">
-<!ENTITY sm.lastsession "Dernière session">
-<!ENTITY sm.previouslast "Avant-dernière">
-<!ENTITY sm.chooseifempty "Choisir une autre si vide">
-<!ENTITY sm.restore.options "À la restauration des sessions :">
-<!ENTITY sm.restore.overwrite "Écraser les fenêtres existantes">
-<!ENTITY sm.restore.overwriteTabs "Et les onglets">
-<!ENTITY sm.restore.closedWinList "Enregistrer les fenêtres dans la liste des fenêtres fermées">
-<!ENTITY sm.restore.merge "Regrouper plusieurs fenêtres en une seule">
-<!ENTITY sm.restore.bypassCache "Ne pas utiliser le cache lors d'une restauration">
-<!ENTITY sm.notrestore.label "En cas de non restauration au démarrage">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Conserver dans les onglets :">
 <!ENTITY sm.preserve.history "Historique">
 <!ENTITY sm.preserve.protect "États de protection">
 <!ENTITY sm.preserve.locked "États de verrouillage">
 <!ENTITY sm.preserve.permission "Permissions">
 <!ENTITY sm.preserve.scroll1 "Position de défilement">
-<!ENTITY sm.restore.winOptions "Conserver dans les fenêtres :">
-<!ENTITY sm.restore.selectedTab "L'onglet sélectionné">
-<!ENTITY sm.restore.closedTabs "La liste des onglets récemment fermés">
 <!ENTITY incompatible.extensions "Certaines de vos extensions sont incompatibles avec Tab Mix Plus, il est recommandé de désactiver ou désinstaller ces extensions.">
 <!ENTITY incompatible.button.label "Afficher la liste">
diff --git a/addon/chrome/locale/fr/session-manager.properties b/addon/chrome/locale/fr/session-manager.properties
deleted file mode 100644
index 8af6c05fd..000000000
--- a/addon/chrome/locale/fr/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Enregistrer la liste des onglets fermés dans cette session
-sm.button.continue.label=Continuer
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Gestionnaire de sessions - Enregistrer la session
-sm.askBeforeSave.msg0=Voulez-vous enregistrer votre session ?
-sm.askBeforeSave.msg2=Ne seront sauvegardées sur le disque que les fenêtres non-privées
-sm.askBeforeSave.msg1=Si vous n\'enregistrez pas, au prochain démarrage la \'Dernière session\' sera vide.
-sm.askBeforeSave.button0.label=Enregistrer la session
-sm.askBeforeSave.button0.accesskey=E
-sm.askBeforeSave.button1.label=Ne pas enregistrer
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Gestionnaire de sessions - Base de données corrompue
-sm.corrupted.msg0=Le gestionnaire de sessions ne peut pas charger sa base de données depuis un fichier session.rdf corrompu.
-sm.corrupted.msg1=Le fichier session.rdf sera effacé, une copie session.old se trouve dans votre profil.
-sm.areYouSure.msg=Voulez-vous vraiment continuer ?
-sm.canChooseStartup.msg=Vous pouvez choisir une session de la liste qui sera votre nouvelle session de démarrage :
-sm.addtoStartup.title=Gestionnaire de sessions - Ajouter à la session de démarrage
-sm.addtoStartup.msg.windows=Vous êtes sur le point d\'ajouter les fenêtres suivantes à votre session de démarrage :
-sm.addtoStartup.msg.tabs=Vous êtes sur le point d\'ajouter les onglets suivants à votre session de démarrage :
-sm.addtoStartup.button0.label=Ajouter à la session
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Ne pas ajouter
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Gestionnaire de sessions - Écraser la session de démarrage
-sm.replaceStartup.msg=Vous êtes sur le point de remplacer votre session de démarrage :
-sm.replaceStartup.button0.label=Remplacer la session
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=Ne pas remplacer
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Gestionnaire de sessions - Effacer la session de démarrage
-sm.removeStartup.msg0=Vous êtes sur le point d\'effacer votre session de démarrage :
-sm.removeStartup.msg1=Choisissez dans la liste une session qui sera votre nouvelle session de démarrage :
-sm.removeStartup.button0.label=Effacer
-sm.removeStartup.button0.accesskey=E
-sm.removeStartup.button1.label=Ne pas effacer
-sm.removeStartup.button1.accesskey=N
-sm.title=Gestionnaire de sessions
-sm.dontSaveBlank.msg=Le gestionnaire de sessions n\'enregistre pas les fenêtres vides
-sm.sessionSave.error=Erreur dans le gestionnaire de session, session non enregistrée
-sm.sessionName.title.rename=Gestionnaire de sessions - Renommer la session
-sm.sessionName.title.saveprevious=Gestionnaire de sessions - Enregistrer la session
-sm.sessionName.title.savethiswindow=Gestionnaire de sessions - Enregistrer cette fenêtre
-sm.sessionName.title.saveallwindows=Gestionnaire de sessions - Enregistrer toutes les fenêtres
-sm.sessionName.msg0=Entrer le nom de la session :
-sm.sessionName.msg1=Le nom doit comporter au moins une lettre ou un nombre.
-sm.sessionName.msg2=Ce nom est déjà utilisé !
-sm.sessionName.msg3=Voulez-vous vraiment remplacer cette session ?
-sm.sessionName.button0.label=Renommer la session
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Ne pas renommer
-sm.sessionName.button1.accesskey=N
-sm.session.empty=vide
-sm.session.tabs=T
-sm.session.windows=F
-sm.removeAll.title.session=Gestionnaire de sessions - Effacer toutes les sessions enregistrées
-sm.removeAll.title.closedwindow=Gestionnaire de sessions - Effacer toutes les fenêtres fermées
-sm.removeAll.msg0=Voulez-vous vraiment effacer toutes vos sessions enregistrées ?
-sm.removeAll.msg1=Si vous choisissez \'Effacer\', votre session de démarrage sera la \'Dernière session\'.
-sm.removeAll.msg2=Voulez-vous vraiment effacer toutes vos fenêtres fermées ?
-sm.sessionMenu.last=Dernière session
-sm.sessionMenu.lastDefault=Dernière session - Par défaut
-sm.sessionMenu.lastgood=Dernière session valide
-sm.sessionMenu.previous=Avant-dernière
-sm.sessionMenu.crashed=Session durant un crash
-sm.afterCrash.title=Gestionnaire de sessions - Restaurer après un crash
-sm.afterCrash.chkbox.label=Activer le gestionnaire de sessions
-sm.afterCrash.msg0=Votre dernière session a subi un crash !
-sm.afterCrash.msg0.again=Votre dernière session crashée a subi de nouveau un crash !
-sm.afterCrash.msg1=Choisissez une session à restaurer depuis la liste :
-sm.afterCrash.msg2=Choisissez comment continuer
-sm.afterCrash.msg3=Le gestionnaire de sessions est actuellement désactivé. Si vous activez le gestionnaire de sessions, vous pourrez restaurer des sessions crashées, fermées, enregistrées et des fenêtres fermées, depuis le menu du gestionnaire de sessions.
-sm.afterCrash.msg4=Vous pouvez également restaurer la session crashée par la suite depuis le menu du gestionnaire de sessions.
-sm.afterCrash.msg5=mais rien n\'a été enregistré.
-sm.afterCrash.msg6=mais il n\'y avait aucune fenêtre d\'ouverte durant la session crashée
-sm.afterCrash.msg7=Choisissez une fenêtre à restaurer depuis la liste des fenêtres fermées
-sm.afterCrash.msg8=(vous pouvez également restaurer par la suite les fenêtres fermées depuis le menu des fenêtres fermées)
-sm.afterCrash.msg9=Votre session crashée est vide !
-sm.afterCrash.msg10=Le gestionnaire de sessions n\'a trouvé aucune session à restaurer.
-sm.afterCrash.button0.label=Restaurer la session
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaurer la session crashée
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Ne pas restaurer
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Gestionnaire de sessions - Restaurer la session
-sm.start.chkbox.label=Activer le gestionnaire de sessions
-sm.start.msg0=Votre session de démarrage est vide !
-sm.start.msg1=La restauration après crash est actuellement désactivée. Si vous activez la restauration après crash, vous pourrez restaurer les sessions crashées.
-sm.start.msg2=Erreur pendant le chargement de votre session de démarrage, elle n\'existe pas.
-sm.restoreError.msg0=Erreur dans le fichier du gestionnaire de sessions !
-sm.restoreError.msg1=Effacez la session que vous essayez de restaurer
-sm.disable.msg=Firefox a une fonction de restauration de sessions intégrée.
-sm.disable.msg1=Voulez-vous activer la restauration de sessions intégrée et désactiver le gestionnaire de sessions TabMix ?
-sm.disable.msg2=Voulez-vous activer le gestionnaire de sessions TabMix et désactiver la restauration de sessions intégrée ?
-sm.tabview.hiddengroups=Davantage d'onglets sont restaurés dans des groupes cachés.
-sm.tabview.hiddengroups.removed=Les groupes d'onglets cachés ont été supprimés.
-sm.tabview.removed=Les groupes d'onglets (Panorama) ont été supprimés de Firefox.
-sm.tabview.removed.learnMore.label=Pour en savoir plus
-sm.tabview.removed.learnMore.accesskey=P
-sm.tabview.install.label=Installer l'extension Tab Groups (groupes d'onglets)
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Historique, sauvegarde des données des groupes d'onglets
-sm.tabview.backup.crashed=Plantage, sauvegarde des données des groupes d'onglets
-sm.tabview.backup.msg=Le gestionnaire d'événements de Tab Mix Plus a enregistré une sauvegarde de votre session.
-sm.bookmarks.historySession=Session historique
-sm.bookmarks.closedWindow=Fenêtre fermée
-sm.bookmarks.sessionFolder=Sessions deTab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Fenêtre N°%S
diff --git a/addon/chrome/locale/fr/tabmix.dtd b/addon/chrome/locale/fr/tabmix.dtd
index 00c926ef0..5263c39f0 100644
--- a/addon/chrome/locale/fr/tabmix.dtd
+++ b/addon/chrome/locale/fr/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Supprimer de la liste">
 <!ENTITY deletelist.accesskey "S">
 <!ENTITY settings.label "Réglages">
-<!ENTITY saveWindow.label "Enregistrer cette fenêtre">
-<!ENTITY saveAllWindows.label "Enregistrer toutes les fenêtres">
 <!ENTITY sm.context.overwrite "Restaurer, écraser la/les fenêtre(s) existante(s)">
 <!ENTITY sm.context.overwrite.key "e">
 <!ENTITY sm.context.restore.new "Restaurer dans une nouvelle fenêtre">
diff --git a/addon/chrome/locale/he-IL/misc.dtd b/addon/chrome/locale/he-IL/misc.dtd
index fa67b5b98..6166d6009 100644
--- a/addon/chrome/locale/he-IL/misc.dtd
+++ b/addon/chrome/locale/he-IL/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "בחר זמן מהרשימה או הכנס זמן משלך">
 <!ENTITY specifyreload.label "זמן טעינה מוגדר">
-<!ENTITY sanitizer.entry "רשימת לשוניות שמורות">
-<!ENTITY sanitizer.entry.accesskey "ר">
-<!ENTITY sanitizer.entry.confirm "אתה בטוח שברצונך למחוק את כל ההפעלות השמורות שלך כולל גיבויים?">
diff --git a/addon/chrome/locale/he-IL/pref-tabmix.dtd b/addon/chrome/locale/he-IL/pref-tabmix.dtd
index 1d529d792..a29bc5557 100644
--- a/addon/chrome/locale/he-IL/pref-tabmix.dtd
+++ b/addon/chrome/locale/he-IL/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "הצג דף ריק">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "השתמש בשחזור ההפעלות של פיירפוקס">
-<!ENTITY ss.enable.tooltip "אל תסמן על מנת לאפשר את מנהל ההפעלות של Tabmix.">
 <!ENTITY ss.advanced_setting "אפשרויות מתקדמות">
 <!ENTITY ss.advanced_setting.warning "אל תשנה כאן אלא אם כן אתה יודע מה אתה עושה">
 <!ENTITY ss.interval "מרווח זמן מינימלי בין שני מצבי שמירה">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "כל האתרים">
 <!ENTITY ss.privacy_level.unencrypted "אתרים לא מוצפנים בלבד">
 <!ENTITY ss.privacy_level.nosites "שום אתר">
-<!ENTITY sessionManger.enable "אפשר מנהל ההפעלות">
 <!ENTITY crashRecovery.enable "אפשר שחזור קריסות">
-<!ENTITY sm.StartExit "התחלה/יציאה">
-<!ENTITY sm.restore "שחזר">
-<!ENTITY sm.preserve "שימור">
 <!ENTITY sm.start "כשהדפדפן מותחל:">
-<!ENTITY sm.start.restore "שחזר">
-<!ENTITY sm.start.ask "שאל לפני שחזור">
-<!ENTITY sm.start.nothing "אל תשחזר">
-<!ENTITY sm.exit "כשהדפדפן נסגר:">
-<!ENTITY sm.exit.save "שמור הפעלה">
-<!ENTITY sm.exit.ask "שאל לפני שמירה">
-<!ENTITY sm.exit.nothing "אל תשמור">
-<!ENTITY sm.startup "הפעלה התחלתית:">
-<!ENTITY sm.lastsession "הפעלה אחרונה">
-<!ENTITY sm.previouslast "ראשון לאחרון">
-<!ENTITY sm.chooseifempty "בחר אחר אם נוכחי ריק">
-<!ENTITY sm.restore.options "כשהפעלה משוחזרת:">
-<!ENTITY sm.restore.overwrite "החלף חלונות נוכחיים">
-<!ENTITY sm.restore.overwriteTabs "ולשוניות">
-<!ENTITY sm.restore.closedWinList "שמור חלון ברשימת חלונות שנסגרו">
-<!ENTITY sm.restore.merge "מזג מספר חלונות לחלון אחד">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "When not restoring on start">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "שימור לשוניות:">
 <!ENTITY sm.preserve.history "היסטוריה">
 <!ENTITY sm.preserve.protect "מצב הגנה">
 <!ENTITY sm.preserve.locked "מצב נעילה">
 <!ENTITY sm.preserve.permission "הרשאה">
 <!ENTITY sm.preserve.scroll1 "מיקום גלילה">
-<!ENTITY sm.restore.winOptions "שימור חלונות:">
-<!ENTITY sm.restore.selectedTab "לשונית שנבחרה">
-<!ENTITY sm.restore.closedTabs "רשימת לשוניות שנסגרו">
 <!ENTITY incompatible.extensions "כמה תוספות לא תואמות עם Tab Mix Plus, מומלץ שתנטרל אותן.">
 <!ENTITY incompatible.button.label "הצג רשימה">
diff --git a/addon/chrome/locale/he-IL/session-manager.properties b/addon/chrome/locale/he-IL/session-manager.properties
deleted file mode 100644
index 76fc5b737..000000000
--- a/addon/chrome/locale/he-IL/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=שמור רשימת לשוניות שנסגרו עם הפעלה זו
-sm.button.continue.label=המשך
-sm.button.continue.accesskey=ה
-sm.askBeforeSave.title=מנהל ההפעלות - שמירת הפעלה
-sm.askBeforeSave.msg0=תרצה לשמור הפעלה זו?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=אם לא תשמור, בהפעלה הבאה של הדפדפן רשימת ה\'הפעלות האחרונות\' תהיה ריקה.
-sm.askBeforeSave.button0.label=שמור הפעלה
-sm.askBeforeSave.button0.accesskey=ש
-sm.askBeforeSave.button1.label=אל תשמור
-sm.askBeforeSave.button1.accesskey=ת
-sm.corrupted.title=מנהל ההפעלות - מידע פגום
-sm.corrupted.msg0=מנהל ההפעלות לא יכול לטעון את המידע מ session.rdf
-sm.corrupted.msg1=הקובץ session.rdf ימחק, עותק יכול להימצא בפרופיל שלך.
-sm.areYouSure.msg=אתה בטוח שברצונך להמשיך?
-sm.canChooseStartup.msg=תוכל לבחור מהרשימה הפעלה שתהיה ההפעלה ההתחלתית שלך.
-sm.addtoStartup.title=מנהל ההפעלות - הוסף להפעלה ההתחלתית
-sm.addtoStartup.msg.windows=אתה עומד להוסיף חלון(ות) להפעלה ההתחלתית:
-sm.addtoStartup.msg.tabs=אתה עומד להוסיף לשוניות(ות) להפעלה ההתחלתית
-sm.addtoStartup.button0.label=הוסף להפעלה
-sm.addtoStartup.button0.accesskey=ה
-sm.addtoStartup.button1.label=אל תוסיף
-sm.addtoStartup.button1.accesskey=א
-sm.replaceStartup.title=מנהל ההפעלות - כתוב על ההפעלה ההתחלתית
-sm.replaceStartup.msg=אתה עומד להחליף את ההפעלה ההתחלתית:
-sm.replaceStartup.button0.label=החלף הפעלה
-sm.replaceStartup.button0.accesskey=ה
-sm.replaceStartup.button1.label=אל תחליף
-sm.replaceStartup.button1.accesskey=א
-sm.removeStartup.title=מנהל ההפעלות - מחק הפעלה התחלתית
-sm.removeStartup.msg0=אתה עומד למחוק את ההפעלה ההתחלתית
-sm.removeStartup.msg1=בחר מהרשימה הפעלה שתהיה ההפעלה ההתחלתית החדשה שלך:
-sm.removeStartup.button0.label=מחק
-sm.removeStartup.button0.accesskey=מ
-sm.removeStartup.button1.label=אל תמחק
-sm.removeStartup.button1.accesskey=א
-sm.title=מנהל ההפעלות
-sm.dontSaveBlank.msg=מנהל ההפעלות לא שומר חלונות ריקים
-sm.sessionSave.error=שגיאה במנהל ההפעלות, הפעלה לא נשמרת
-sm.sessionName.title.rename=מנהל ההפעלות - שנה שם הפעלה
-sm.sessionName.title.saveprevious=מנהל ההפעלות - שמור הפעלה
-sm.sessionName.title.savethiswindow=מנהל ההפעלות - שמור חלון זה
-sm.sessionName.title.saveallwindows=מנהל ההפעלות - שמור כל החלונות
-sm.sessionName.msg0=הכנס שם הפעלה:
-sm.sessionName.msg1=שם חייב להכיל לפחות תו אחד.
-sm.sessionName.msg2=השם בשימוש!
-sm.sessionName.msg3=אתה בטוח שברצונך להחליף את ההפעלה?
-sm.sessionName.button0.label=שנה שם הפעלה
-sm.sessionName.button0.accesskey=ש
-sm.sessionName.button1.label=אל תשנה שם
-sm.sessionName.button1.accesskey=א
-sm.session.empty=ריק
-sm.session.tabs=ל
-sm.session.windows=ח
-sm.removeAll.title.session=מנהל ההפעלות - מחק כל ההפעלות השמורות
-sm.removeAll.title.closedwindow=מנהל ההפעלות - מחק את כל החלונות שנסגרו
-sm.removeAll.msg0=אתה בטוח שברצונך למחוק את כל ההפעלות השמורות?
-sm.removeAll.msg1=אם תבחר \'מחק\' ההפעלה ההתחלתית שלך תהיה \'הפעלה אחרונה\'.
-sm.removeAll.msg2=אתה בטוח שברצונך למחוק את כל החלונות שנסגרו?
-sm.sessionMenu.last=הפעלה אחרונה
-sm.sessionMenu.lastDefault=הפעלה אחרונה - ברירת מחדל
-sm.sessionMenu.lastgood=הפעלה אחרונה טובה
-sm.sessionMenu.previous=קודם לאחרונה
-sm.sessionMenu.crashed=הפעלה שקרסה
-sm.afterCrash.title=מנהל ההפעלות - שחזר לאחר קריסה
-sm.afterCrash.chkbox.label=אפשר את מנהל ההפעלות
-sm.afterCrash.msg0=ההפעלה האחרונה שלך קרסה!
-sm.afterCrash.msg0.again=ההפעלה האחרונה שלך קרסה שוב!
-sm.afterCrash.msg1=בחר הפעלה לשחזור מהרשימה:
-sm.afterCrash.msg2=בחר איך להמשיך
-sm.afterCrash.msg3=מנהל ההפעלות מנוטרל, אם תאפשר את מנהל ההפעלות, תוכל לשחזר הפעלות שקרסו, לסגור הפעלות, לשמור הפעלות ולסגור חלונות מתפריט מנהל ההפעלות.
-sm.afterCrash.msg4=ביכולתך לשחזר את ההפעלות שקרסו מאוחר יותר מתפריט מנהל ההפעלות.
-sm.afterCrash.msg5=אבל שום דבר לא נשמר.
-sm.afterCrash.msg6=אבל אין שום חלון פתוח בהפעלה שקרסה
-sm.afterCrash.msg7=בחר חלון לשיחזור מרשימת החלונות שנסגרו
-sm.afterCrash.msg8=(ביכולתך לשחזר חלונות שנסגרו מתפריט החלונות שנסגרו)
-sm.afterCrash.msg9=רשימת ה\"הפעלות שקרסו\" ריקה!
-sm.afterCrash.msg10=מנהל ההפעלות לא מצא שום הפעלות לשחזור.
-sm.afterCrash.button0.label=שחזר הפעלה
-sm.afterCrash.button0.accesskey=ש
-sm.afterCrash.button0.crashed.label=שחזר הפעלה שקרסה
-sm.afterCrash.button0.crashed.accesskey=ש
-sm.afterCrash.button1.label=אל תשזר
-sm.afterCrash.button1.accesskey=א
-sm.start.title=מנהל ההפעלות - משחזר הקריסות
-sm.start.chkbox.label=אפשר את משחזר הקריסות
-sm.start.msg0=ההפעלה ההתחלתית שלך ריקה!
-sm.start.msg1=משחזר קריסות מנוטרל, אם תאפשר את משחזר הקריסות, תוכל לשחזר הפעלות שקרסו.
-sm.start.msg2=שגיאה בהפעלה ההתחלתית שלך, ההפעלה ההתחלתית שלך איננה קיימת.
-sm.restoreError.msg0=שגיאה בקובץ מנהל ההפעלות!
-sm.restoreError.msg1=נמחקה ההפעלה שניסית לשחזר
-sm.disable.msg=פיירפוקס תומך בתכונת שיחזור הפעלות.
-sm.disable.msg1=תרצה לאפשר את שחזור ההפעלות המובנה של פיירפוקס ולנטרל את מנהל ההפעלות של TabMix?
-sm.disable.msg2=תרצה לאפשר את מנהל ההפעלות של של TabMix ולנטרל את שחזור ההפעלות המובנה של פיירפוקס?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/he-IL/tabmix.dtd b/addon/chrome/locale/he-IL/tabmix.dtd
index 10bd1d196..67fbd72d4 100644
--- a/addon/chrome/locale/he-IL/tabmix.dtd
+++ b/addon/chrome/locale/he-IL/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "מחק מהרשימה">
 <!ENTITY deletelist.accesskey "מ">
 <!ENTITY settings.label "הגדרות">
-<!ENTITY saveWindow.label "שמור חלון זה">
-<!ENTITY saveAllWindows.label "שמור את כל החלונות">
 <!ENTITY sm.context.overwrite "שחזר על חלונות קיימים">
 <!ENTITY sm.context.overwrite.key "ע">
 <!ENTITY sm.context.restore.new "שחזר לחלונות חדשים">
diff --git a/addon/chrome/locale/hr-HR/misc.dtd b/addon/chrome/locale/hr-HR/misc.dtd
index 28997804b..369ed7cc5 100644
--- a/addon/chrome/locale/hr-HR/misc.dtd
+++ b/addon/chrome/locale/hr-HR/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Choose time from the list or enter your own time">
 <!ENTITY specifyreload.label "Odredite vrijeme ponovnog učitavanja">
-<!ENTITY sanitizer.entry "Tab Mix Plus Povijest">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Are you sure you want to erase ALL your saved sessions data including backups ?">
diff --git a/addon/chrome/locale/hr-HR/pref-tabmix.dtd b/addon/chrome/locale/hr-HR/pref-tabmix.dtd
index 81ec6f0eb..64fbea42e 100644
--- a/addon/chrome/locale/hr-HR/pref-tabmix.dtd
+++ b/addon/chrome/locale/hr-HR/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Prikaži praznu stranicu">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Koristi ugrađenu osobinu Vraćanja Prijava">
-<!ENTITY ss.enable.tooltip "Odznačite da biste dopustili korištenje s Tabmix Upraviteljem Prijava">
 <!ENTITY ss.advanced_setting "Napredne postavke">
 <!ENTITY ss.advanced_setting.warning "Nemojte ih mijenjati, osim ako znate što radite">
 <!ENTITY ss.interval "Minimalni vremenski razmaci prije spremanja dva stanja">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Sve stranice">
 <!ENTITY ss.privacy_level.unencrypted "Samo nekodirane stranice">
 <!ENTITY ss.privacy_level.nosites "Niti jednu stranicu">
-<!ENTITY sessionManger.enable "Omogući Upravitelja Prijavama">
 <!ENTITY crashRecovery.enable "Omogući Vraćanje nakon rušenja">
-<!ENTITY sm.StartExit "Pokreni/Izađi">
-<!ENTITY sm.restore "Vrati">
-<!ENTITY sm.preserve "Sačuvaj">
 <!ENTITY sm.start "Prilikom pokretanja preglednika:">
-<!ENTITY sm.start.restore "Vrati">
-<!ENTITY sm.start.ask "Pitaj prije vraćanja">
-<!ENTITY sm.start.nothing "Ne vraćaj">
-<!ENTITY sm.exit "Prilikom izlaska iz preglednika:">
-<!ENTITY sm.exit.save "Spremi Prijave">
-<!ENTITY sm.exit.ask "Pitaj prije spremanja">
-<!ENTITY sm.exit.nothing "Ne spremaj">
-<!ENTITY sm.startup "Početna Prijava:">
-<!ENTITY sm.lastsession "Zadnja Prijava">
-<!ENTITY sm.previouslast "Predzadnja Prijava">
-<!ENTITY sm.chooseifempty "Izaberi drugu ako je prazna">
-<!ENTITY sm.restore.options "Prilikom vraćanja Prijava:">
-<!ENTITY sm.restore.overwrite "Prebriši postojeći prozor">
-<!ENTITY sm.restore.overwriteTabs "I kartice">
-<!ENTITY sm.restore.closedWinList "Sačuvaj prozore u popisu zatvorenih prozora">
-<!ENTITY sm.restore.merge "Spoji više prozora u jedan">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "When not restoring on start">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Sačuvaj kartice:">
 <!ENTITY sm.preserve.history "Povijesti">
 <!ENTITY sm.preserve.protect "Zaštićenog statusa">
 <!ENTITY sm.preserve.locked "Zaključanog statusa">
 <!ENTITY sm.preserve.permission "Dopuštenja">
 <!ENTITY sm.preserve.scroll1 "Scroll Position">
-<!ENTITY sm.restore.winOptions "Sačuvaj prozore:">
-<!ENTITY sm.restore.selectedTab "Odabrane kartice">
-<!ENTITY sm.restore.closedTabs "Popisa zatvorenih kartica">
 <!ENTITY incompatible.extensions "Neka Vaša proširenja nisu kopaktibilna s Tab Mix Plus, preporučljivo je da onemogućite ili deinstalirate ta proširenja..">
 <!ENTITY incompatible.button.label "Prikaži popis">
diff --git a/addon/chrome/locale/hr-HR/session-manager.properties b/addon/chrome/locale/hr-HR/session-manager.properties
deleted file mode 100644
index e9f18a76c..000000000
--- a/addon/chrome/locale/hr-HR/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label= Spremi popis zatvorenih kartica u ovoj Prijavi
-sm.button.continue.label= Nastavi
-sm.button.continue.accesskey= N
-sm.askBeforeSave.title= Upravitelj prijavama - Spremi Prijavu
-sm.askBeforeSave.msg0= Želite li snimiti Vašu Prijavu?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1= Ako ne snimite, slijedeći put kada pokrenete preglednik \'Posljednja Prijava\' će biti prazna.
-sm.askBeforeSave.button0.label= Spremi Prijavu
-sm.askBeforeSave.button0.accesskey= S
-sm.askBeforeSave.button1.label= Nemoj spremiti
-sm.askBeforeSave.button1.accesskey= m
-sm.corrupted.title= Upravitelj prijavama - Oštećena baza podataka
-sm.corrupted.msg0= Upravitelj prijavama ne može učitati svoju bazu podataka iz oštećene datoteke session.rdf.
-sm.corrupted.msg1= Datoteka session.rdf će biti obrisana, kopija se nalazi u datoteci session.old u Vašem profilu.
-sm.areYouSure.msg= Sigurni ste da želite nastaviti?
-sm.canChooseStartup.msg= Iz popisa možete izabrati Prijavu za koju želite da bude početna:
-sm.addtoStartup.title= Upravitelj Prijavama - Dodaj u Početnu Prijavu
-sm.addtoStartup.msg.windows= Dodat ćete prozor(e) u Vašu Početnu Prijavu:
-sm.addtoStartup.msg.tabs= Dodat ćete karticu(e) u Vašu Početnu Prijavu:
-sm.addtoStartup.button0.label= Dodaj u Prijavu
-sm.addtoStartup.button0.accesskey= D
-sm.addtoStartup.button1.label= Nemoj dodati
-sm.addtoStartup.button1.accesskey= m
-sm.replaceStartup.title= Upravitelj Prijavama - Premosti Početnu Prijavu
-sm.replaceStartup.msg= Zamijenit ćete Vašu Početnu Prijavu:
-sm.replaceStartup.button0.label= Zamijeni Prijavu
-sm.replaceStartup.button0.accesskey= Z
-sm.replaceStartup.button1.label= Nemoj zamijeniti
-sm.replaceStartup.button1.accesskey= m
-sm.removeStartup.title= Upravitelj prijavama - Obriši Početnu Prijavu
-sm.removeStartup.msg0= Obrisat ćete Vašu Početnu Prijavu:
-sm.removeStartup.msg1= Izaberite prijavu koja će biti Vaša nova Početna Prijava:
-sm.removeStartup.button0.label= Obriši
-sm.removeStartup.button0.accesskey= O
-sm.removeStartup.button1.label= Nemoj obrisati
-sm.removeStartup.button1.accesskey= b
-sm.title= Upravitelj Prijavama
-sm.dontSaveBlank.msg= Upravitelj Prijavama ne može spremiti prazne prozore
-sm.sessionSave.error= Greška u Upravitelju Prijavama, Prijava nije sačuvana
-sm.sessionName.title.rename= Upravitelj Prijavama - Preimenuj Prijavu
-sm.sessionName.title.saveprevious= Upravitelj Prijavama - Spremi prijavu
-sm.sessionName.title.savethiswindow= Upravitelj Prijavama - Spremi ovaj prozor
-sm.sessionName.title.saveallwindows= Upravitelj Prijavama - Spremi sve prozore
-sm.sessionName.msg0= Unesi ime Prijave:
-sm.sessionName.msg1= Ime mora biti najmanje jedno slovo ili broj.
-sm.sessionName.msg2= Ovo ime se već koristi!
-sm.sessionName.msg3= Sigurni ste da želite zamijeniti Prijavu?
-sm.sessionName.button0.label= Preimenuj Prijavu
-sm.sessionName.button0.accesskey= r
-sm.sessionName.button1.label= Nemoj preimenovati
-sm.sessionName.button1.accesskey= m
-sm.session.empty= Prazno
-sm.session.tabs= n
-sm.session.windows= P
-sm.removeAll.title.session= Upravitelj Prijavama - Obriši sve Sačuvane Prijave
-sm.removeAll.title.closedwindow= Upravitelj Prijavama - Obriši sve zatvorene prozore
-sm.removeAll.msg0= Sigurni ste da želite obrisati sve Vaše Spremljene Prijave?
-sm.removeAll.msg1= Ako izaberete \'Obriši\' Vaša Početna Prijava će biti \'Poslijednja Prijava\'.
-sm.removeAll.msg2= Sigurni ste da želite obrisati sve Vaše zatvorene prozore?
-sm.sessionMenu.last= Posljednja Prijava
-sm.sessionMenu.lastDefault= Posljednja Prijava - Zadana
-sm.sessionMenu.lastgood= Posljednja ispravna Prijava
-sm.sessionMenu.previous= Predposljednja
-sm.sessionMenu.crashed= Srušena Prijava
-sm.afterCrash.title= Upravitelj Prijavama - Vrati nakon rušenja
-sm.afterCrash.chkbox.label= Omoguči Upravitelja Prijavama
-sm.afterCrash.msg0= Vaša se Zadnja Prijava srušila!
-sm.afterCrash.msg0.again= Vaša se Zadnja Prijava ponovno srušila!
-sm.afterCrash.msg1= Izaberite sa liste Prijavu koju želite vratiti:
-sm.afterCrash.msg2= Izaberite kako nastaviti
-sm.afterCrash.msg3= Upravitelj Prijavama je trenutno onemogućen, ako omogućite Upravitelja Prijavama, bit ćete u mogućnosti iz izbornika Upravitelja Prijavama vratiti srušene Prijave, zatvorene Prijave, spremljene Prijave i zatvorene prozore.
-sm.afterCrash.msg4= Također, srušenu Prijavu možete vratiti i kasnije kroz izbornik Upravitelja Prijavama.
-sm.afterCrash.msg5= ali ništa nije spremljeno.
-sm.afterCrash.msg6= ali nema niti jednog otvorenog prozora u Vašim Srušenim Prijavama
-sm.afterCrash.msg7= Izaberite prozor koji želite vratiti iz popisa Zatvorenih prozora
-sm.afterCrash.msg8= (zatvorene prozore možete također vratiti i kasnije iz izbornika Zatvoreni prozori)
-sm.afterCrash.msg9= Vaše Srušene Prijave su prazne!
-sm.afterCrash.msg10= Upravitelj Prijavama nije našao niti jednu Prijavu koju bi vratio.
-sm.afterCrash.button0.label= Vrati Prijavu
-sm.afterCrash.button0.accesskey= r
-sm.afterCrash.button0.crashed.label= Vrati srušenu prijavu
-sm.afterCrash.button0.crashed.accesskey= r
-sm.afterCrash.button1.label= Nemoj vratiti
-sm.afterCrash.button1.accesskey= m
-sm.start.title= Upravitelj Prijavama - Vrati Prijavu
-sm.start.chkbox.label= Omogući Upravitelja Prijavama
-sm.start.msg0= Vaša Početna Prijava je prazna!
-sm.start.msg1= Vraćanje nakon rušenja je trenutno onemogućeno, ako omogućite Vraćanje nakon rušenja, bit ćete u mogućnosti vratiti srušene Prijave.
-sm.start.msg2= Greška prilikom traženja Vaše početne Prijave, Vaša spremljena početna Prijava ne postoji..
-sm.restoreError.msg0= Greška u datoteci Upravitelja Prijavama!
-sm.restoreError.msg1= Obriši Prijavu koju ste pokušali vratiti
-sm.disable.msg= Firefox ima ugrađenu osobinu vraćanj Prijava.
-sm.disable.msg1= Želite li omogućiti ugrađeno vraćanje Prijava i onemogućiti TabMix Upravitelja Prijavama?
-sm.disable.msg2= Želite li omogućiti TabMix Upravitelj Prijavama i onemogućiti ugrađeno vražanje Prijava?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/hr-HR/tabmix.dtd b/addon/chrome/locale/hr-HR/tabmix.dtd
index d3f585f74..019bff36f 100644
--- a/addon/chrome/locale/hr-HR/tabmix.dtd
+++ b/addon/chrome/locale/hr-HR/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Obriši sa popisa">
 <!ENTITY deletelist.accesskey "b">
 <!ENTITY settings.label "Postavke">
-<!ENTITY saveWindow.label "Spremi ovaj prozor">
-<!ENTITY saveAllWindows.label "Spremi sve prozore">
 <!ENTITY sm.context.overwrite "Vrati, Prepiši postojeći prozor(e)">
 <!ENTITY sm.context.overwrite.key "V">
 <!ENTITY sm.context.restore.new "Vrati u novi prozor(e)">
diff --git a/addon/chrome/locale/hu-HU/misc.dtd b/addon/chrome/locale/hu-HU/misc.dtd
index 76b5a432c..e1eb59f5b 100644
--- a/addon/chrome/locale/hu-HU/misc.dtd
+++ b/addon/chrome/locale/hu-HU/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Válassza ki az időközt a listáról vagy írjon be egyet">
 <!ENTITY specifyreload.label "Újratöltési idő megadása">
-<!ENTITY sanitizer.entry "Személyes adatok törlése">
-<!ENTITY sanitizer.entry.accesskey "S">
-<!ENTITY sanitizer.entry.confirm "Valóban le kívánja törölni az összes elmentett munkamenetet és a biztonsági másolatokat is?">
diff --git a/addon/chrome/locale/hu-HU/pref-tabmix.dtd b/addon/chrome/locale/hu-HU/pref-tabmix.dtd
index 5bda3d4d4..1837359f6 100644
--- a/addon/chrome/locale/hu-HU/pref-tabmix.dtd
+++ b/addon/chrome/locale/hu-HU/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Üres oldal megjelenítése">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Beépített munkamenet-visszaállító használata">
-<!ENTITY ss.enable.tooltip "Kijelölés nélkül a TabMix Munkamenet-kezelője kerül engedélyezésre">
 <!ENTITY ss.advanced_setting "Haladó beállítások">
 <!ENTITY ss.advanced_setting.warning "Ne változtassa meg ezeket a beállításokat, csak ha biztosan tudja mit jelentenek ezek a beállítások.">
 <!ENTITY ss.interval "Időintervallum két állapotmentés között">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Minden oldalnál">
 <!ENTITY ss.privacy_level.unencrypted "Nem titkosított oldalaknál">
 <!ENTITY ss.privacy_level.nosites "Semmilyen oldalnál">
-<!ENTITY sessionManger.enable "Munkamenet-kezelő engedélyezése">
 <!ENTITY crashRecovery.enable "Hiba-helyreállító engedélyezése">
-<!ENTITY sm.StartExit "Indítás/Kilépés">
-<!ENTITY sm.restore "Visszaállítás">
-<!ENTITY sm.preserve "Védelem">
 <!ENTITY sm.start "Amikor a böngésző elindul">
-<!ENTITY sm.start.restore "Visszaállítás">
-<!ENTITY sm.start.ask "Kérdezzen visszaállítás előtt">
-<!ENTITY sm.start.nothing "Ne állítsa vissza">
-<!ENTITY sm.exit "Ha a böngésző kilép:">
-<!ENTITY sm.exit.save "Munkamenet mentése">
-<!ENTITY sm.exit.ask "Kérdezzen mentés előtt">
-<!ENTITY sm.exit.nothing "Ne mentse el">
-<!ENTITY sm.startup "Indítási munkamenet:">
-<!ENTITY sm.lastsession "Utolsó munkamenet">
-<!ENTITY sm.previouslast "Előzőtől az utolsóig">
-<!ENTITY sm.chooseifempty "Másikat választ, ha üres">
-<!ENTITY sm.restore.options "Munkamenetek visszaállításakor">
-<!ENTITY sm.restore.overwrite "Felülírja a létező ablakokat">
-<!ENTITY sm.restore.overwriteTabs "és lapokat">
-<!ENTITY sm.restore.closedWinList "Bezárt ablakok listájának mentése">
-<!ENTITY sm.restore.merge "Több ablak összefűzése eggyé">
-<!ENTITY sm.restore.bypassCache "Gyorsítótár figyelmen kívül hagyása visszaállításkor">
-<!ENTITY sm.notrestore.label "Ha nem állítható vissza induláskor">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Védett lapok">
 <!ENTITY sm.preserve.history "Előzmények">
 <!ENTITY sm.preserve.protect "Védelem állapota">
 <!ENTITY sm.preserve.locked "Zárolás állapota">
 <!ENTITY sm.preserve.permission "Engedélyek">
 <!ENTITY sm.preserve.scroll1 "Gördítősáv helye">
-<!ENTITY sm.restore.winOptions "Védett ablak">
-<!ENTITY sm.restore.selectedTab "Kiválasztott lap">
-<!ENTITY sm.restore.closedTabs "Bezárt lapok listája">
 <!ENTITY incompatible.extensions "Néhány telepített Kiterjesztés nem kompatibilis Tab Mix Plus kiterjesztéssel. Ajánlatos ezeket a Kiterjesztéseket letiltani vagy eltávolítani.">
 <!ENTITY incompatible.button.label "Listázás">
diff --git a/addon/chrome/locale/hu-HU/session-manager.properties b/addon/chrome/locale/hu-HU/session-manager.properties
deleted file mode 100644
index b64ff1e63..000000000
--- a/addon/chrome/locale/hu-HU/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Bezárt lapok listájának mentése a munkamenettel
-sm.button.continue.label=Folytatás
-sm.button.continue.accesskey=F
-sm.askBeforeSave.title=Munkamenet-kezelő - Munkamenet mentés
-sm.askBeforeSave.msg0=Menteni kívánja a jelenlegi munkamenetet?
-sm.askBeforeSave.msg2=Csak a nem privát ablakok adatai kerülhetnek a meghajtóra
-sm.askBeforeSave.msg1=Ha nem menti el, akkor a böngésző következő indításakor az "Utolsó munkamenet" bejegyzés üres lesz.
-sm.askBeforeSave.button0.label=Munkamenet mentés
-sm.askBeforeSave.button0.accesskey=m
-sm.askBeforeSave.button1.label=Ne mentse
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Munkamenet-kezelő - Hibás adatbázis
-sm.corrupted.msg0=Munkamenet-kezelő nem tudja betölteni az adatokat, mert a session.rdf adatbázisfájl hibás.
-sm.corrupted.msg1=A session.rdf fájl törlésre kerül. Egy biztonsági másolatot session.old néven a Profiljában talál.
-sm.areYouSure.msg=Valóban folytatni akarja?
-sm.canChooseStartup.msg=Választhat egy munkamenetet, ami az Ön indítási munkamenete lesz:
-sm.addtoStartup.title=Munkamenet-kezelő - Indítási munkamenet hozzáadása
-sm.addtoStartup.msg.windows=Ablakok hozzáadása az Indítási munkamenethez:
-sm.addtoStartup.msg.tabs=Lapok hozzáadása az Indítási munkamenethez:
-sm.addtoStartup.button0.label=Hozzáadás a munkamenethez
-sm.addtoStartup.button0.accesskey=H
-sm.addtoStartup.button1.label=Ne adja hozzá
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Munkamenet-kezelő - Indítási munkamenetek felülbírálása
-sm.replaceStartup.msg=Munkamenet lecserélése a következőre:
-sm.replaceStartup.button0.label=Munkamenet lecserélése
-sm.replaceStartup.button0.accesskey=l
-sm.replaceStartup.button1.label=Ne cserélje le
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Munkamenet-kezelő - Indítási munkamenet törlése
-sm.removeStartup.msg0=Indítási munkamenet törlése:
-sm.removeStartup.msg1=Válasszon egy munkamenetet új Indítási munkamenetnek:
-sm.removeStartup.button0.label=Törlés
-sm.removeStartup.button0.accesskey=T
-sm.removeStartup.button1.label=Ne törölje
-sm.removeStartup.button1.accesskey=N
-sm.title=Munkamenet-kezelő
-sm.dontSaveBlank.msg=Munkamenet-kezelő nem ment el üres ablakokat
-sm.sessionSave.error=Hiba a Munkamenet-kezelőben! A munkamenet nem menthető el.
-sm.sessionName.title.rename=Munkamenet-kezelő - Munkamenet átnevezése
-sm.sessionName.title.saveprevious=Munkamenet-kezelő - Munkamenet mentése
-sm.sessionName.title.savethiswindow=Munkamenet-kezelő - Aktuális ablak mentése
-sm.sessionName.title.saveallwindows=Munkamenet-kezelő - Összes ablak mentése
-sm.sessionName.msg0=Munkamenet név:
-sm.sessionName.msg1=A névnek legalább egy számot vagy betűt kell tartalmaznia.
-sm.sessionName.msg2=Ez a név már használatban van!
-sm.sessionName.msg3=Valóban le kívánja cserélni a munkamenetet?
-sm.sessionName.button0.label=Munkamenet átnevezése
-sm.sessionName.button0.accesskey=v
-sm.sessionName.button1.label=Ne nevezze át
-sm.sessionName.button1.accesskey=N
-sm.session.empty=üres
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Munkamenet-kezelő - Összes mentett munkamenet törlése
-sm.removeAll.title.closedwindow=Munkamenet-kezelő - Összes Bezárt ablak törlése
-sm.removeAll.msg0=Valóban törölni kívánja az összes mentett munkamenetet?
-sm.removeAll.msg1=A 'Törlés'-t választva az Indítási munkamenet lesz az 'Utolsó munkamenet'.
-sm.removeAll.msg2=Valóban törölni kívánja az összes bezárt ablakot?
-sm.sessionMenu.last=Utolsó munkamenet
-sm.sessionMenu.lastDefault=Utolsó munkamenet - Alapértelmezett
-sm.sessionMenu.lastgood=Utolsó jó munkamenet
-sm.sessionMenu.previous=Előzőtől az utolsóig
-sm.sessionMenu.crashed=Hibával végződő munkamenetek
-sm.afterCrash.title=Munkamenet-kezelő - Visszaállítás hiba után
-sm.afterCrash.chkbox.label=Munkamenet-kezelő engedélyezése
-sm.afterCrash.msg0=Az utolsó munkamenet hibával végződött!
-sm.afterCrash.msg0.again=Az utolsó hibával végződött munkamenet ismét hibával végződött!
-sm.afterCrash.msg1=Válasszon egy visszaállítandó munkamenetet:
-sm.afterCrash.msg2=Válassza ki a folytatást
-sm.afterCrash.msg3=A Munkamenet-kezelő jelenleg nem engedélyezett. A Munkamenet-kezelő engedélyezésével lehetőség van a hibát okozó, bezárt, mentett munkamenetek és mentett ablakok visszaállítására a Munkamenet-kezelő menüből.
-sm.afterCrash.msg4=(Továbbá visszaállíthatja a hibát okozó munkamenetet később a Munkamenet-kezelő menüből)
-sm.afterCrash.msg5=de semmi sem került mentésre.
-sm.afterCrash.msg6=de nincsen egyetlen nyitott ablak sem a Hibát okozó munkamenetben
-sm.afterCrash.msg7=Válasszon egy visszaállítandó ablakot a Bezárt ablakok listájából
-sm.afterCrash.msg8=(Továbbá visszaállíthatja a bezárt ablakokat később, a Bezárt ablakok menüből)
-sm.afterCrash.msg9=A Hibát okozó munkamenetek listája üres!
-sm.afterCrash.msg10=A Munkamenet-kezelő nem talál egyetlen visszaállítható munkamenetet sem.
-sm.afterCrash.button0.label=Munkamenet visszaállítása
-sm.afterCrash.button0.accesskey=v
-sm.afterCrash.button0.crashed.label=Hibát okozó munkamenet visszaállítása
-sm.afterCrash.button0.crashed.accesskey=H
-sm.afterCrash.button1.label=Ne állítsa vissza
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Munkamenet-kezelő - Munkamenet visszaállítása
-sm.start.chkbox.label=Munkamenet-kezelő engedélyezése
-sm.start.msg0=Az Indítási munkamenet üres!
-sm.start.msg1=A Hiba helyreállítása szolgáltatás nem engedélyezett. Hiba helyreállítása szolgáltatás engedélyezésével lehetősége van, hogy a hibát okozó munkameneteket visszaállítsa.
-sm.start.msg2=Hiba az Indítási munkamenet visszaállításakor! Az Indítási munkamenet nem létezik.
-sm.restoreError.msg0=Hiba a Munkamenet-kezelő adatfájlban!
-sm.restoreError.msg1=A betöltésre szánt hibás munkamenet eltávolítása
-sm.disable.msg=A Firefox beépített Munkamenet visszaállítás funkcióval rendelkezik.
-sm.disable.msg1=Engedélyezni kívánja a beépített Munkamenet visszaállítás funkciót és letiltja a TabMix Munkamenet-kezelőjét?
-sm.disable.msg2=Engedélyezni kívánja a TabMix Munkamenet-kezelőjét és letiltja a beépített Munkamenet visszaállítás funkciót?
-sm.tabview.hiddengroups=A többi lap rejtett csoportokban került visszaállításra.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/hu-HU/tabmix.dtd b/addon/chrome/locale/hu-HU/tabmix.dtd
index efb92e285..0286990a1 100644
--- a/addon/chrome/locale/hu-HU/tabmix.dtd
+++ b/addon/chrome/locale/hu-HU/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Törlés a listáról">
 <!ENTITY deletelist.accesskey "T">
 <!ENTITY settings.label "Beállítások">
-<!ENTITY saveWindow.label "Aktuális ablak mentése">
-<!ENTITY saveAllWindows.label "Összes ablak mentése">
 <!ENTITY sm.context.overwrite "Visszaállítás, felülírva a meglévő ablakot...">
 <!ENTITY sm.context.overwrite.key "f">
 <!ENTITY sm.context.restore.new "Visszaállítás új ablakba">
diff --git a/addon/chrome/locale/it/misc.dtd b/addon/chrome/locale/it/misc.dtd
index 65554c94e..19ff8d22d 100644
--- a/addon/chrome/locale/it/misc.dtd
+++ b/addon/chrome/locale/it/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Tempo di ricarica da specificare">
 <!ENTITY specifyreload.label "Personalizzazione del tempo di ricarica">
-<!ENTITY sanitizer.entry "Cronologia di Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Eliminare tutti i dati di sessioni salvate inclusi i backup?">
diff --git a/addon/chrome/locale/it/pref-tabmix.dtd b/addon/chrome/locale/it/pref-tabmix.dtd
index 840fdab2b..2b3b051d9 100644
--- a/addon/chrome/locale/it/pref-tabmix.dtd
+++ b/addon/chrome/locale/it/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "mostra una pagina vuota">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Attiva il ripristino delle sessioni nativo del browser">
-<!ENTITY ss.enable.tooltip "Deselezionare per permettere il ripristino delle sessioni di Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Impostazioni avanzate">
 <!ENTITY ss.advanced_setting.warning "Non modificare queste impostazioni se non si è utenti avanzati">
 <!ENTITY ss.interval "Intervallo minimo di tempo fra due stati">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "tutti i siti">
 <!ENTITY ss.privacy_level.unencrypted "i siti non cifrati">
 <!ENTITY ss.privacy_level.nosites "nessun sito">
-<!ENTITY sessionManger.enable "Attiva il ripristino delle sessioni di Tab Mix Plus">
 <!ENTITY crashRecovery.enable "Attiva il ripristino delle sessioni dopo crash">
-<!ENTITY sm.StartExit "Avvio/Chiusura">
-<!ENTITY sm.restore "Fase di ripristino">
-<!ENTITY sm.preserve "Fase di preservazione">
 <!ENTITY sm.start "Azione da effettuare quando si avvia il browser">
-<!ENTITY sm.start.restore "Ripristina">
-<!ENTITY sm.start.ask "Chiedi prima di ripristinare">
-<!ENTITY sm.start.nothing "Non ripristinare">
-<!ENTITY sm.exit "Azione da effettuare quando si chiude il browser">
-<!ENTITY sm.exit.save "Salva la sessione">
-<!ENTITY sm.exit.ask "Chiedi prima di salvare">
-<!ENTITY sm.exit.nothing "Non salvare">
-<!ENTITY sm.startup "Quando si avvia il browser ripristina:">
-<!ENTITY sm.lastsession "l&apos;ultima sessione">
-<!ENTITY sm.previouslast "la penultima sessione">
-<!ENTITY sm.chooseifempty "Permetti di selezionare un&apos;altra sessione se quella scelta fosse vuota">
-<!ENTITY sm.restore.options "Azione da effettuare quando si ripristinano le sessioni">
-<!ENTITY sm.restore.overwrite "Sovrascrivi le finestre esistenti">
-<!ENTITY sm.restore.overwriteTabs "comprese le schede">
-<!ENTITY sm.restore.closedWinList "Salva le finestre esistenti nella lista delle schede chiuse">
-<!ENTITY sm.restore.merge "Avvia la sessione unendo le varie finestre in una sola">
-<!ENTITY sm.restore.bypassCache "Bypassa la cache">
-<!ENTITY sm.notrestore.label "Se all&apos;avvio del browser non viene ripristinata alcuna sessione">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Dati da preservare per le schede">
 <!ENTITY sm.preserve.history "Cronologia">
 <!ENTITY sm.preserve.protect "Stato &apos;protetto&apos;">
 <!ENTITY sm.preserve.locked "Stato &apos;bloccato&apos;">
 <!ENTITY sm.preserve.permission "Permessi">
 <!ENTITY sm.preserve.scroll1 "Posizione di scorrimento e dimensione testo">
-<!ENTITY sm.restore.winOptions "Dati da preservare per le finestre">
-<!ENTITY sm.restore.selectedTab "Scheda selezionata">
-<!ENTITY sm.restore.closedTabs "Lista delle schede chiuse">
 <!ENTITY incompatible.extensions "Alcune delle estensioni installate sono incompatibili con Tab Mix Plus. Disattivare o disinstallare tali estensioni">
 <!ENTITY incompatible.button.label "Estensioni incompatibili">
diff --git a/addon/chrome/locale/it/session-manager.properties b/addon/chrome/locale/it/session-manager.properties
deleted file mode 100644
index bd059b223..000000000
--- a/addon/chrome/locale/it/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label= Salva la lista delle schede chiuse insieme alla sessione
-sm.button.continue.label= Continua
-sm.button.continue.accesskey= C
-sm.askBeforeSave.title= Salvataggio della sessione
-sm.askBeforeSave.msg0= Salvare la sessione?
-sm.askBeforeSave.msg2=Verranno salvate solo finestre di navigazione non anonima
-sm.askBeforeSave.msg1= In caso non si salvi la sessione, al prossimo riavvio del browser 'l'ultima sessione' sarà vuota
-sm.askBeforeSave.button0.label= Salva la sessione
-sm.askBeforeSave.button0.accesskey= S
-sm.askBeforeSave.button1.label= Non salvare
-sm.askBeforeSave.button1.accesskey= N
-sm.corrupted.title= Database della sessione corrotto
-sm.corrupted.msg0= Impossibile recuperare il database dal file session.rdf poiché è corrotto.
-sm.corrupted.msg1= Il file session.rdf verrà eliminato, e verrà salvata una copia col nome session.old nella cartella del proprio profilo.
-sm.areYouSure.msg= Continuare?
-sm.canChooseStartup.msg= È possibile selezionare una sessione da impostare come quella d'avvio dalla lista:
-sm.addtoStartup.title= Aggiunta di finestre/schede alla sessione d'avvio
-sm.addtoStartup.msg.windows= Si stanno per aggiungere alla sessione d'avvio le seguenti finestre:
-sm.addtoStartup.msg.tabs= Si stanno per aggiungere alla sessione d'avvio le seguenti schede:
-sm.addtoStartup.button0.label= Aggiungi alla sessione
-sm.addtoStartup.button0.accesskey= A
-sm.addtoStartup.button1.label= Non aggiungere
-sm.addtoStartup.button1.accesskey= N
-sm.replaceStartup.title= Sovrascrizione della sessione d'avvio
-sm.replaceStartup.msg= Si sta per sovrascrivere la seguente sessione d'avvio:
-sm.replaceStartup.button0.label= Sovrascrivi la sessione
-sm.replaceStartup.button0.accesskey= r
-sm.replaceStartup.button1.label= Non sovrascrivere
-sm.replaceStartup.button1.accesskey= N
-sm.removeStartup.title= Eliminazione della sessione d'avvio
-sm.removeStartup.msg0= Si sta per eliminare la seguente sessione d'avvio:
-sm.removeStartup.msg1= Selezionare una sessione da impostare come quella d'avvio dalla lista:
-sm.removeStartup.button0.label= Elimina la sessione d'avvio
-sm.removeStartup.button0.accesskey= E
-sm.removeStartup.button1.label= Non eliminare
-sm.removeStartup.button1.accesskey= N
-sm.title= Gestione delle sessioni di Tab Mix Plus
-sm.dontSaveBlank.msg= La gestione delle sessioni non salva finestre vuote
-sm.sessionSave.error= Errore nella gestione delle sessioni, la sessione non è stata salvata
-sm.sessionName.title.rename= Nuovo nome della sessione
-sm.sessionName.title.saveprevious= Salvataggio della sessione
-sm.sessionName.title.savethiswindow= Salvataggio della finestra attuale
-sm.sessionName.title.saveallwindows= Salvataggio di tutte le finestre
-sm.sessionName.msg0= Nome della sessione:
-sm.sessionName.msg1= Il nome deve contenere almeno una lettera o un numero
-sm.sessionName.msg2= Il nome è già in uso
-sm.sessionName.msg3=; sovrascrivere la sessione?
-sm.sessionName.button0.label= Rinomima la sessione
-sm.sessionName.button0.accesskey= R
-sm.sessionName.button1.label= Non rinominare
-sm.sessionName.button1.accesskey= N
-sm.session.empty= Sessione vuota
-sm.session.tabs= S
-sm.session.windows= F
-sm.removeAll.title.session= Eliminazione di tutte le sessioni salvate
-sm.removeAll.title.closedwindow= Eliminazione di tutte le finestre chiuse
-sm.removeAll.msg0= Eliminare tutte le sessioni salvate?
-sm.removeAll.msg1= Selezionando 'Elimina' la sessione d'avvio sarà 'l'ultima sessione'.
-sm.removeAll.msg2= Eliminare tutte le finestre chiuse?
-sm.sessionMenu.last= Ultima sessione
-sm.sessionMenu.lastDefault= Ultima sessione predefinita
-sm.sessionMenu.lastgood= Ultima sessione valida
-sm.sessionMenu.previous= Penultima
-sm.sessionMenu.crashed= Sessione chiusa in modo inaspettato
-sm.afterCrash.title= Ripristino della sessione dopo un crash
-sm.afterCrash.chkbox.label= Attiva la gestione delle sessioni
-sm.afterCrash.msg0= L'ultima sessione si è chiusa in modo inaspettato.
-sm.afterCrash.msg0.again= L'ultima sessione chiusasi in modo inaspettato si è richiusa in modo inaspettato.
-sm.afterCrash.msg1= Selezionare una sessione da ripristinare dalla lista:
-sm.afterCrash.msg2= Indicare come continuare
-sm.afterCrash.msg3= La gestione delle sessioni è attualmente disattivata. Se la si attiva si potranno ripristinare le sessioni chiuse in modo inaspettato/chiuse/salvate ed infine le finestre chiuse dal menu della Gestione delle sessioni
-sm.afterCrash.msg4= Si può ripristinare la sessione chiusa in modo inaspettato anche in un secondo momento dal menu della Gestione delle sessioni
-sm.afterCrash.msg5= e nulla è stato salvato
-sm.afterCrash.msg6= ma non c'è alcuna finestra aperta nelle sessioni chiuse in modo inaspettato
-sm.afterCrash.msg7= Selezionare la finestra da ripristinare dalla lista delle finestre chiuse
-sm.afterCrash.msg8= (si possono ripristinare le finestre chiuse anche in un secondo momento dal menu delle finestre chiuse)
-sm.afterCrash.msg9= La sessione chiusa in modo inaspettato è vuota!
-sm.afterCrash.msg10= La gestione delle sessioni non ha trovato alcuna sessione da ripristinare
-sm.afterCrash.button0.label= Ripristina la sessione
-sm.afterCrash.button0.accesskey= R
-sm.afterCrash.button0.crashed.label= Ripristina la sessione chiusa in modo inaspettato
-sm.afterCrash.button0.crashed.accesskey= i
-sm.afterCrash.button1.label= Non ripristinare
-sm.afterCrash.button1.accesskey= N
-sm.start.title= Ripristino della sessione
-sm.start.chkbox.label= Attiva la gestione delle sessioni
-sm.start.msg0= La sessione d'avvio è vuota
-sm.start.msg1= ed il ripristino dopo crash è attualmente disattivato. Se lo si attiva si potranno ripristinare le sessioni chiuse in modo inaspettato
-sm.start.msg2= Errore durante la ricerca della sessione d'avvio. La sessione d'avvio non esiste
-sm.restoreError.msg0= Errore nel file della gestione delle sessioni
-sm.restoreError.msg1= Eliminare la sessione che si è provato a ripristinare
-sm.disable.msg= In Firefox è stato aggiunto il ripristino delle sessioni integrato
-sm.disable.msg1= Attivare il ripristino delle sessioni integrato e disattivare la gestione delle sessioni di Tab Mix Plus?
-sm.disable.msg2= Attivare la gestione delle sessioni di Tab Mix Plus e disattivare il ripristino delle sessioni integrato?
-sm.tabview.hiddengroups=Molteplici schede ripristinate in gruppi nascosti
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/it/tabmix.dtd b/addon/chrome/locale/it/tabmix.dtd
index a32d62adb..938e2a248 100644
--- a/addon/chrome/locale/it/tabmix.dtd
+++ b/addon/chrome/locale/it/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Elimina dalla lista">
 <!ENTITY deletelist.accesskey "E">
 <!ENTITY settings.label "Impostazioni">
-<!ENTITY saveWindow.label "Salva questa finestra">
-<!ENTITY saveAllWindows.label "Salva tutte le finestre">
 <!ENTITY sm.context.overwrite "Ripristina la sessione sostituendo schede/finestra attuali">
 <!ENTITY sm.context.overwrite.key "o">
 <!ENTITY sm.context.restore.new "Ripristina la sessione in una nuova finestra">
diff --git a/addon/chrome/locale/ja/misc.dtd b/addon/chrome/locale/ja/misc.dtd
index b03efeb71..4c199184c 100644
--- a/addon/chrome/locale/ja/misc.dtd
+++ b/addon/chrome/locale/ja/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "リストから時間を選ぶか、自分の設定時間を入力">
 <!ENTITY specifyreload.label "再読み込み間隔の指定">
-<!ENTITY sanitizer.entry "Tab Mix Plus の保存セッション">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "すべての保存したセッションデータとバックアップが削除されますがよろしいですか？">
diff --git a/addon/chrome/locale/ja/pref-tabmix.dtd b/addon/chrome/locale/ja/pref-tabmix.dtd
index 0f0fb407f..f011fac9e 100644
--- a/addon/chrome/locale/ja/pref-tabmix.dtd
+++ b/addon/chrome/locale/ja/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "ホームページを表示する">
 <!ENTITY startupBlankPage.label "空白ページを表示する">
 <!ENTITY startupLastSession1.label "前回終了時のウィンドウとタブを表示する">
-<!ENTITY ss.enable.label "Firefox 内蔵のセッション復元機能を使用する">
-<!ENTITY ss.enable.tooltip "チェックを外すと Tab Mix Plus のセッションマネージャーを使用します">
 <!ENTITY ss.advanced_setting "拡張設定">
 <!ENTITY ss.advanced_setting.warning "よくわからない場合は以下の設定を変更しないでください">
 <!ENTITY ss.interval "セッション状態の最小保存間隔">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "すべてのサイトに対して保存">
 <!ENTITY ss.privacy_level.unencrypted "暗号化されていないサイトに対して保存">
 <!ENTITY ss.privacy_level.nosites "すべてのサイトに対して保存しない">
-<!ENTITY sessionManger.enable "セッションマネージャーを有効にする">
 <!ENTITY crashRecovery.enable "クラッシュリカバリーを有効にする">
-<!ENTITY sm.StartExit "起動／終了時">
-<!ENTITY sm.restore "復元">
-<!ENTITY sm.preserve "状態の保持">
 <!ENTITY sm.start "ブラウザ起動時:">
-<!ENTITY sm.start.restore "復元する">
-<!ENTITY sm.start.ask "復元する前に尋ねる">
-<!ENTITY sm.start.nothing "復元しない">
-<!ENTITY sm.exit "ブラウザ終了時:">
-<!ENTITY sm.exit.save "セッションを保存する">
-<!ENTITY sm.exit.ask "保存する前に尋ねる">
-<!ENTITY sm.exit.nothing "保存しない">
-<!ENTITY sm.startup "起動時のセッション:">
-<!ENTITY sm.lastsession "最後のセッション">
-<!ENTITY sm.previouslast "最後の一つ前のセッション">
-<!ENTITY sm.chooseifempty "空の場合はもう一方セッションを選択">
-<!ENTITY sm.restore.options "セッションを復元する場合:">
-<!ENTITY sm.restore.overwrite "現在のウィンドウに上書きする">
-<!ENTITY sm.restore.overwriteTabs "タブも上書きする">
-<!ENTITY sm.restore.closedWinList "上書きされたウィンドウを [最近閉じたウィンドウ] リストに保存する">
-<!ENTITY sm.restore.merge "複数のウィンドウをひとつにする">
-<!ENTITY sm.restore.bypassCache "復元時にキャッシュを使わない">
-<!ENTITY sm.notrestore.label "起動時に復元しない時">
-<!ENTITY sm.restorePinned1.label "前回ピン留めしていたタブを復元する">
 <!ENTITY sm.preserve.options "タブで状態保持する項目:">
 <!ENTITY sm.preserve.history "履歴">
 <!ENTITY sm.preserve.protect "[タブを保護] の状態">
 <!ENTITY sm.preserve.locked "[タブをロック] の状態">
 <!ENTITY sm.preserve.permission "[機能の許可] の状態">
 <!ENTITY sm.preserve.scroll1 "スクロール位置">
-<!ENTITY sm.restore.winOptions "ウィンドウで状態保持する項目:">
-<!ENTITY sm.restore.selectedTab "選択されたタブ">
-<!ENTITY sm.restore.closedTabs "最近閉じたタブ">
 <!ENTITY incompatible.extensions "いくつかの拡張機能が Tab Mix Plus と不整合を起こします。これらの拡張機能を無効にするか削除することを推奨します。">
 <!ENTITY incompatible.button.label "リストを表示">
diff --git a/addon/chrome/locale/ja/session-manager.properties b/addon/chrome/locale/ja/session-manager.properties
deleted file mode 100644
index fb7bb94fc..000000000
--- a/addon/chrome/locale/ja/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=このセッションと [最近閉じたタブ] のリストも保存する
-sm.button.continue.label=続行
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=セッションマネージャー - セッションを保存
-sm.askBeforeSave.msg0=セッションを保存しますか？
-sm.askBeforeSave.msg2=プライベートブラウジング以外のウィンドウがディスクに保存されます
-sm.askBeforeSave.msg1=保存しない場合、次回ブラウザ起動時に [最後のセッション] は空になります
-sm.askBeforeSave.button0.label=セッションを保存
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=保存しない
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=セッションマネージャー - 破損したデータベース
-sm.corrupted.msg0=セッションマネージャーは破損した session.rdf からデータベースを読み込むことができませんでした
-sm.corrupted.msg1=session.rdf は削除され、プロファイルフォルダに session.old としてコピーが残されます。セッションファイルのバックアップはプロファイルフォルダの sessionbackups フォルダにあります。
-sm.areYouSure.msg=本当に続行しますか
-sm.canChooseStartup.msg=起動時に読み込むセッションを指定:
-sm.addtoStartup.title=セッションマネージャー - 起動時に読み込むセッションを追加
-sm.addtoStartup.msg.windows=起動時に読み込むセッションにウィンドウを追加しようとしています:
-sm.addtoStartup.msg.tabs=起動時に読み込むセッションにタブを追加しようとしています:
-sm.addtoStartup.button0.label=セッションに追加
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=追加しない
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=セッションマネージャー - 起動時に読み込むセッションを置き換え
-sm.replaceStartup.msg=起動時に読み込むセッションを置き換えようとしています:
-sm.replaceStartup.button0.label=セッションを置き換える
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=置き換えない
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=セッションマネージャー - 起動時に読み込むセッションを削除
-sm.removeStartup.msg0=起動時に読み込むセッションを削除しようとしています:
-sm.removeStartup.msg1=新しく起動時に読み込むセッションを選択:
-sm.removeStartup.button0.label=削除
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=削除しない
-sm.removeStartup.button1.accesskey=T
-sm.title=セッションマネージャー
-sm.dontSaveBlank.msg=空のウィンドウは保存出来ません
-sm.sessionSave.error=セッションマネージャーにエラーが発生しましたのでセッションは保存されません
-sm.sessionName.title.rename=セッションマネージャー - セッションをリネーム
-sm.sessionName.title.saveprevious=セッションマネージャー - セッションを保存
-sm.sessionName.title.savethiswindow=セッションマネージャー - このウィンドウを保存
-sm.sessionName.title.saveallwindows=セッションマネージャー - すべてのウィンドウを保存
-sm.sessionName.msg0=セッション名を入力:
-sm.sessionName.msg1=セッション名には最低ひとつの文字が含まれていなければいけません
-sm.sessionName.msg2=このセッション名は既に使われています！
-sm.sessionName.msg3=本当にセッションを置き換えますか？
-sm.sessionName.button0.label=セッションをリネーム
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=リネームしない
-sm.sessionName.button1.accesskey=D
-sm.session.empty=空
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=セッションマネージャー - 保存されているすべてのセッションを削除
-sm.removeAll.title.closedwindow=セッションマネージャー - 保存されているすべての[最近閉じたウィンドウ]を削除
-sm.removeAll.msg0=本当に保存されているすべてのセッションを削除しますか？
-sm.removeAll.msg1=[削除] を選択した場合、起動時に読み込むセッションは [最後のセッション] になります
-sm.removeAll.msg2=本当に保存されているすべての [最近閉じたウィンドウ] を削除を削除しますか？
-sm.sessionMenu.last=最後のセッション
-sm.sessionMenu.lastDefault=最後のセッション - 既定値
-sm.sessionMenu.lastgood=最後の有効なセッション
-sm.sessionMenu.previous=最後の一つ前
-sm.sessionMenu.crashed=クラッシュ時に保存されたセッション
-sm.afterCrash.title=セッションマネージャー - クラッシュ後の復元
-sm.afterCrash.chkbox.label=セッションマネージャーを有効にする
-sm.afterCrash.msg0=最後のセッションはブラウザクラッシュ時に保存されたセッションです！
-sm.afterCrash.msg0.again=ブラウザクラッシュ時のセッションのため再度クラッシュしました！
-sm.afterCrash.msg1=復元するセッションを選択:
-sm.afterCrash.msg2=続行する方法を選択
-sm.afterCrash.msg3=セッションマネージャーは現在無効となっています。セッションマネージャーを有効にするとクラッシュ時に保存されたセッション、閉じたセッション、保存されたセッション、及び最近閉じたウィンドウをセッションマネージャーのメニューから復元できるようになります。
-sm.afterCrash.msg4=後でセッションマネージャーのメニューからクラッシュ時に保存されたセッションを復元することもできます
-sm.afterCrash.msg5=何も保存されていません
-sm.afterCrash.msg6=クラッシュ時に保存されたセッションには開いているウィンドウがありません
-sm.afterCrash.msg7=最近閉じたウィンドウのリストから復元したいウィンドウを選択
-sm.afterCrash.msg8=(後で [最近閉じたウィンドウ] のメニューから復元することもできます)
-sm.afterCrash.msg9=クラッシュ時に保存されたセッションは空です！
-sm.afterCrash.msg10=セッションマネージャーは復元するセッションを見つけることができませんでした
-sm.afterCrash.button0.label=セッションを復元
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=クラッシュ時に保存されたセッションから復元
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=復元しない
-sm.afterCrash.button1.accesskey=D
-sm.start.title=セッションマネージャー - セッションを復元
-sm.start.chkbox.label=セッションマネージャーを有効にする
-sm.start.msg0=起動時に読み込むセッションは空です！
-sm.start.msg1=有効にするとクラッシュ時に保存されたセッションを復元できるようになります
-sm.start.msg2=起動時に読み込むセッションを探しているときにエラーが発生しました。保存されたはずの起動時に読み込むセッションが存在しません。
-sm.restoreError.msg0=セッションマネージャーのファイルにエラーが発生しました！
-sm.restoreError.msg1=復元しようとしたセッションを削除しました
-sm.disable.msg=Firefox はセッション復元機能を内蔵しています
-sm.disable.msg1=Firefox 内蔵のセッション復元機能を有効にし、Tab Mix Plus のセッションマネージャーを無効にしますか？
-sm.disable.msg2=Tab Mix Plus のセッションマネージャーを有効にし、Firefox 内蔵のセッション復元機能を無効にしますか？
-sm.tabview.hiddengroups=他のタブは隠れているグループに復元（Ctrl + Shift + E）。
-sm.tabview.hiddengroups.removed=表示されていないタブグループは削除されました。
-sm.tabview.removed=Firefox から タブグループ (Panorama) 機能は削除されました。
-sm.tabview.removed.learnMore.label=詳細
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=タブグループ
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=履歴セッション, グループデータ付き
-sm.tabview.backup.crashed=クラッシュしたセッション, グループデータ付き
-sm.tabview.backup.msg=Tab Mix Plus のセッションマネージャーがあなたのセッションを保存しました。
-sm.bookmarks.historySession =セッション履歴
-sm.bookmarks.closedWindow =ウィンドウを閉じる
-sm.bookmarks.sessionFolder=Tab Mix Plus セッション
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID = Window %S
diff --git a/addon/chrome/locale/ja/tabmix.dtd b/addon/chrome/locale/ja/tabmix.dtd
index 958176812..88a9754cf 100644
--- a/addon/chrome/locale/ja/tabmix.dtd
+++ b/addon/chrome/locale/ja/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "リストから削除">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "設定">
-<!ENTITY saveWindow.label "このウィンドウを保存">
-<!ENTITY saveAllWindows.label "すべてのウィンドウを保存">
 <!ENTITY sm.context.overwrite "既存のウィンドウに上書きして復元する">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "新しいウィンドウに復元する">
diff --git a/addon/chrome/locale/ko-KR/misc.dtd b/addon/chrome/locale/ko-KR/misc.dtd
index 904c3a8a4..c6f714c71 100644
--- a/addon/chrome/locale/ko-KR/misc.dtd
+++ b/addon/chrome/locale/ko-KR/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "목록에서 시간을 선택하거나 원하는 시간을 직접 입력">
 <!ENTITY specifyreload.label "새로 고침 시간 설정">
-<!ENTITY sanitizer.entry "Tab Mix Plus 저장된 세션들">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "정말로 백업 데이터를 포함한 모든 세션 데이터를 모두 지우시겠습니까?">
diff --git a/addon/chrome/locale/ko-KR/pref-tabmix.dtd b/addon/chrome/locale/ko-KR/pref-tabmix.dtd
index d916d0718..d397654c2 100644
--- a/addon/chrome/locale/ko-KR/pref-tabmix.dtd
+++ b/addon/chrome/locale/ko-KR/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "빈 페이지 열기">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "내장된 세션 복구 기능 쓰기">
-<!ENTITY ss.enable.tooltip "선택하지 않으면 Tab Mix Plus 세션 관리자를 씁니다.">
 <!ENTITY ss.advanced_setting "고급 설정">
 <!ENTITY ss.advanced_setting.warning "이 설정에 대해 정확히 알지 못하면 건드리지 마십시오.">
 <!ENTITY ss.interval "아래의 간격으로 브라우저 상태를 저장하기">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "모든 사이트에서">
 <!ENTITY ss.privacy_level.unencrypted "암호화되지 않은 사이트만">
 <!ENTITY ss.privacy_level.nosites "저장 안함">
-<!ENTITY sessionManger.enable "세션 관리자 쓰기">
 <!ENTITY crashRecovery.enable "충돌 후 복구 쓰기">
-<!ENTITY sm.StartExit "켤 때/끌 때">
-<!ENTITY sm.restore "복구">
-<!ENTITY sm.preserve "보존">
 <!ENTITY sm.start "브라우저를 시작할 때:">
-<!ENTITY sm.start.restore "세션 복구하기">
-<!ENTITY sm.start.ask "복구할지 물어 보기">
-<!ENTITY sm.start.nothing "세션 복구 안함">
-<!ENTITY sm.exit "브라우저를 닫을 때:">
-<!ENTITY sm.exit.save "세션 저장하기">
-<!ENTITY sm.exit.ask "저장할지 물어 보기">
-<!ENTITY sm.exit.nothing "저장 안함">
-<!ENTITY sm.startup "시작 세션:">
-<!ENTITY sm.lastsession "마지막 세션">
-<!ENTITY sm.previouslast "끝에서 두번째 세션">
-<!ENTITY sm.chooseifempty "비어 있으면 다른 것 선택하기">
-<!ENTITY sm.restore.options "세션을 복구할 때:">
-<!ENTITY sm.restore.overwrite "현재 창에 덮어 씌우기">
-<!ENTITY sm.restore.overwriteTabs "탭에 덮어 씌우기">
-<!ENTITY sm.restore.closedWinList "닫은 창 목록에 저장하기">
-<!ENTITY sm.restore.merge "하나의 창에 여러개의 창 연결하기">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "시작할 때 복구 안하기">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "탭 상태 중 보존할 것:">
 <!ENTITY sm.preserve.history "방문 기록">
 <!ENTITY sm.preserve.protect "보호된 상태">
 <!ENTITY sm.preserve.locked "닫힌 상태">
 <!ENTITY sm.preserve.permission "기능 사용 여부">
 <!ENTITY sm.preserve.scroll1 "스크롤 위치">
-<!ENTITY sm.restore.winOptions "창 상태 중 보존할 것:">
-<!ENTITY sm.restore.selectedTab "선택된 탭">
-<!ENTITY sm.restore.closedTabs "닫은 탭 목록">
 <!ENTITY incompatible.extensions "몇몇 확장 기능이 Tab Mix Plus와 충돌합니다. 해당 확장 기능을 지우거나 끄는 것을 추천합니다.">
 <!ENTITY incompatible.button.label "목록 보이기">
diff --git a/addon/chrome/locale/ko-KR/session-manager.properties b/addon/chrome/locale/ko-KR/session-manager.properties
deleted file mode 100644
index 25b5a8076..000000000
--- a/addon/chrome/locale/ko-KR/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=닫은 탭 목록을 이 세션에 저장
-sm.button.continue.label=계속
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=세션 관리자 - 세션 저장
-sm.askBeforeSave.msg0=세션을 저장하시겠습니까?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=세션을 저장하지 않는다면 다음에 브라우저를 시작할 때 \'마지막 세션\'이 비어 있게 됩니다.
-sm.askBeforeSave.button0.label=세션을 저장하기
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=저장 안하기
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=세션 관리자 - 손상된 데이터베이스
-sm.corrupted.msg0=세션 관리자는 손상된 session.rdf에서 데이터베이스를 불러올 수 없습니다.
-sm.corrupted.msg1=session.rdf 파일을 지웁니다. 프로필 폴더에서 사본인 session.old를 찾을 수 있습니다. 백업된 세션은 <profile>/sessionbackups에 있습니다.
-sm.areYouSure.msg=계속 하시겠습니까?
-sm.canChooseStartup.msg=아래의 목록에서 새 시작 세션으로 사용할 세션을 선택할 수 있습니다.
-sm.addtoStartup.title=세션 관리자 - 시작 세션 추가
-sm.addtoStartup.msg.windows=아래의 창(들)을 시작 세션에 추가하시겠습니까?
-sm.addtoStartup.msg.tabs=아래의 탭(들)을 시작 세션에 추가하시겠습니까?
-sm.addtoStartup.button0.label=세션 추가하기
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=추가하지 않기
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=세션 관리자 - 시작 세션 덮어쓰기
-sm.replaceStartup.msg=아래의 시작 세션을 바꾸시겠습니까?
-sm.replaceStartup.button0.label=세션 바꾸기
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=바꾸지 않기
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=세션 관리자 - 시작 세션 지우기
-sm.removeStartup.msg0=아래의 시작 세션을 지우시겠습니까?
-sm.removeStartup.msg1=아래의 목록에서 새 시작 세션으로 사용할 세션을 선택하십시오.
-sm.removeStartup.button0.label=지우기
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=지우지 않기
-sm.removeStartup.button1.accesskey=T
-sm.title=세션 관리자
-sm.dontSaveBlank.msg=세션 관리자는 빈 창은 저장하지 않습니다.
-sm.sessionSave.error=세션 관리자의 오류로 인해 세션이 저장되지 않았습니다.
-sm.sessionName.title.rename=세션 관리자 - 세션 이름 바꾸기
-sm.sessionName.title.saveprevious=세션 관리자 - 세션 저장
-sm.sessionName.title.savethiswindow=세션 관리자 - 이 창을 저장
-sm.sessionName.title.saveallwindows=세션 관리자 - 모든 창을 저장
-sm.sessionName.msg0=세션 이름 입력:
-sm.sessionName.msg1=이름에는 반드시 하나 이상의 문자가 있어야 합니다.
-sm.sessionName.msg2=이 이름은 이미 사용 중입니다!
-sm.sessionName.msg3=정말 세션을 바꾸시겠습니까?
-sm.sessionName.button0.label=세션 이름 바꾸기
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=바꾸지 않기
-sm.sessionName.button1.accesskey=D
-sm.session.empty=비어있음
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=세션 관리자 - 모든 세션 지우기
-sm.removeAll.title.closedwindow=세션 관리자 - 모든 닫은 창 목록 지우기
-sm.removeAll.msg0=정말 저장된 모든 세션을 지우시겠습니까?
-sm.removeAll.msg1=만약 \'지우기\'를 선택하면 시작 세션은 \'마지막 세션\'이 됩니다.
-sm.removeAll.msg2=정말 모든 닫은 창 목록을 삭제 하시겠습니까?
-sm.sessionMenu.last=마지막 세션
-sm.sessionMenu.lastDefault=마지막 세션 - 기본값
-sm.sessionMenu.lastgood=마지막 정상 세션
-sm.sessionMenu.previous=끝에서 두번째 세션
-sm.sessionMenu.crashed=충돌한 세션
-sm.afterCrash.title=세션 관리자 - 충돌 후 복구
-sm.afterCrash.chkbox.label=세션 관리자 사용
-sm.afterCrash.msg0=마지막 세션이 충돌하였습니다!
-sm.afterCrash.msg0.again=마지막 충돌한 세션이 또 다시 충돌하였습니다!
-sm.afterCrash.msg1=목록에서 복구할 세션을 선택하십시오.
-sm.afterCrash.msg2=계속할 방법을 선택하십시오.
-sm.afterCrash.msg3=현재 세션 관리자를 쓰지 않고 있습니다. 세션 관리자를 사용하시면 충돌한 세션, 닫은 세션, 저장된 세션들 및 닫은 창들을 세션 관리자 메뉴에서 복구할 수 있습니다.
-sm.afterCrash.msg4=나중에 세션 관리자 메뉴에서 충돌한 세션을 복구할 수 있습니다.
-sm.afterCrash.msg5=하지만 아무것도 저장되지 않았습니다.
-sm.afterCrash.msg6=하지만 충돌한 세션에 있는 어떤 창도 열 수 없습니다.
-sm.afterCrash.msg7=닫은 창 목록에서 복구할 창을 선택하십시오.
-sm.afterCrash.msg8=(나중에 닫은 창 메뉴에서 닫은 창을 복구할 수 있습니다.)
-sm.afterCrash.msg9=충돌한 세션이 비어있습니다!
-sm.afterCrash.msg10=세션관리자가 복구할 어떤 세션도 찾을 수 없습니다.
-sm.afterCrash.button0.label=세션을 복구하기
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=충돌한 세션을 복구하기
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=복구 안하기
-sm.afterCrash.button1.accesskey=D
-sm.start.title=세션 관리자 - 세션 복구
-sm.start.chkbox.label=충돌 후 복구 사용
-sm.start.msg0=시작 세션이 비어 있습니다!
-sm.start.msg1=현재 충돌 후 복구를 쓰지 않고 있습니다. 충돌 후 복구를 사용하면 충돌한 세션을 복구할 수 있습니다.
-sm.start.msg2=시작 세션을 찾는 도중에 오류가 발생했습니다. 저장된 시작 세션이 존제하지 않습니다.
-sm.restoreError.msg0=세션 관리자 파일에서 오류 발생!
-sm.restoreError.msg1=복구를 시도한 세션을 지웁니다.
-sm.disable.msg=불여우는 세션 복구 기능을 내장하고 있습니다.
-sm.disable.msg1=탭믹스 세션 관리자를 끄고 내장된 세션 복구 기능을 쓰시겠습니까?
-sm.disable.msg2=내장된 세션 복구기능을 끄고 탭믹스 세션 관리자를 쓰시겠습니까?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/ko-KR/tabmix.dtd b/addon/chrome/locale/ko-KR/tabmix.dtd
index 6b3d4aa85..469a37f6e 100644
--- a/addon/chrome/locale/ko-KR/tabmix.dtd
+++ b/addon/chrome/locale/ko-KR/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "목록에서 지우기">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "설정">
-<!ENTITY saveWindow.label "이 창을 저장하기">
-<!ENTITY saveAllWindows.label "모든 창을 저장하기">
 <!ENTITY sm.context.overwrite "복구하기, 현재 창에 덮어쓰기">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "새 창으로 복구하기">
diff --git a/addon/chrome/locale/nl/misc.dtd b/addon/chrome/locale/nl/misc.dtd
index 37d651ce8..9a6e8cc1e 100644
--- a/addon/chrome/locale/nl/misc.dtd
+++ b/addon/chrome/locale/nl/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Selecteer een tijd uit de lijst of voer zelf een tijd in">
 <!ENTITY specifyreload.label "Specificeer het tijdsinterval voor herladen">
-<!ENTITY sanitizer.entry "Tab Mix Plus geschiedenis">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "ALLE opgeslagen sessiegegevens inclusief back-ups werkelijk verwijderen?">
diff --git a/addon/chrome/locale/nl/pref-tabmix.dtd b/addon/chrome/locale/nl/pref-tabmix.dtd
index 49b7322b3..f0ad078de 100644
--- a/addon/chrome/locale/nl/pref-tabmix.dtd
+++ b/addon/chrome/locale/nl/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Startpagina weergeven">
 <!ENTITY startupBlankPage.label "Een blanco pagina weergeven">
 <!ENTITY startupLastSession1.label "Vensters en tabbladen van laatste sessie weergeven">
-<!ENTITY ss.enable.label "Ingebouwde sessieherstelmogelijkheid Firefox gebruiken">
-<!ENTITY ss.enable.tooltip "Vink dit uit om de Tab Mix Sessiebeheerder te gebruiken">
 <!ENTITY ss.advanced_setting "Geavanceerde instellingen">
 <!ENTITY ss.advanced_setting.warning "Wijzig hier niets, tenzij u weet wat u doet">
 <!ENTITY ss.interval "Minimale tijdsinterval tussen twee statusopslagen">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Alle sites">
 <!ENTITY ss.privacy_level.unencrypted "Alleen onversleutelde sites">
 <!ENTITY ss.privacy_level.nosites "Geen enkele site">
-<!ENTITY sessionManger.enable "Sessiebeheerder inschakelen">
 <!ENTITY crashRecovery.enable "Vastloopherstel inschakelen">
-<!ENTITY sm.StartExit "Starten/Afsluiten">
-<!ENTITY sm.restore "Herstellen">
-<!ENTITY sm.preserve "Bewaren">
 <!ENTITY sm.start "Wanneer de browser start:">
-<!ENTITY sm.start.restore "Herstellen">
-<!ENTITY sm.start.ask "Vragen voor herstellen">
-<!ENTITY sm.start.nothing "Niet herstellen">
-<!ENTITY sm.exit "Wanneer de browser wordt afgesloten:">
-<!ENTITY sm.exit.save "Sessie bewaren">
-<!ENTITY sm.exit.ask "Vragen voor bewaren">
-<!ENTITY sm.exit.nothing "Niet bewaren">
-<!ENTITY sm.startup "Opstartsessie:">
-<!ENTITY sm.lastsession "Laatste sessie">
-<!ENTITY sm.previouslast "Voorlaatste sessie">
-<!ENTITY sm.chooseifempty "Een andere kiezen indien leeg">
-<!ENTITY sm.restore.options "Bij het herstellen van sessies:">
-<!ENTITY sm.restore.overwrite "Bestaande vensters overschrijven">
-<!ENTITY sm.restore.overwriteTabs "ook tabbladen overschrijven">
-<!ENTITY sm.restore.closedWinList "Vensters in lijst met gesloten vensters bewaren">
-<!ENTITY sm.restore.merge "Meerdere vensters tot één samenvoegen">
-<!ENTITY sm.restore.bypassCache "Cache negeren bij herstellen">
-<!ENTITY sm.notrestore.label "Indien sessies niet hersteld worden bij starten">
-<!ENTITY sm.restorePinned1.label "Uw vastgezette tabbladen van laatste sessie herstellen">
 <!ENTITY sm.preserve.options "Bewaren van tabbladen:">
 <!ENTITY sm.preserve.history "Geschiedenis">
 <!ENTITY sm.preserve.protect "Status beschermen">
 <!ENTITY sm.preserve.locked "Status op slot zetten">
 <!ENTITY sm.preserve.permission "Toestemmingen">
 <!ENTITY sm.preserve.scroll1 "Schuifpositie">
-<!ENTITY sm.restore.winOptions "Bewaren van vensters:">
-<!ENTITY sm.restore.selectedTab "Geselecteerde tabblad">
-<!ENTITY sm.restore.closedTabs "Lijst met gesloten tabbladen">
 <!ENTITY incompatible.extensions "Enkele van de geïnstalleerde extensies werken niet samen met Tab Mix Plus. Het wordt aanbevolen deze extensies uit te schakelen of te deïnstalleren.">
 <!ENTITY incompatible.button.label "Lijst weergeven">
diff --git a/addon/chrome/locale/nl/session-manager.properties b/addon/chrome/locale/nl/session-manager.properties
deleted file mode 100644
index 15951eda7..000000000
--- a/addon/chrome/locale/nl/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Tijdens deze sessie gesloten tabbladen in lijst opslaan
-sm.button.continue.label=Doorgaan
-sm.button.continue.accesskey=D
-sm.askBeforeSave.title=Sessiebeheerder - Sessie opslaan
-sm.askBeforeSave.msg0=Wilt u uw sessie opslaan?
-sm.askBeforeSave.msg2=Alleen niet-privé-vensters worden opgeslagen
-sm.askBeforeSave.msg1=Als u niets opslaat, zal de ‘Laatste sessie’ de volgende keer dat u de browser opstart leeg zijn.
-sm.askBeforeSave.button0.label=Sessie opslaan
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Niet opslaan
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Sessiebeheerder - Beschadigd gegevensbestand
-sm.corrupted.msg0=De sessiebeheerder kan het gegevensbestand van beschadigde session.rdf niet laden.
-sm.corrupted.msg1=Het bestand session.rdf zal worden verwijderd; een kopie kan worden gevonden in session.old in het profiel, sessieback-ups in <profiel>/sessionbackups
-sm.areYouSure.msg=Werkelijk doorgaan?
-sm.canChooseStartup.msg=U kunt uit de lijst een sessie selecteren als de nieuwe opstartsessie:
-sm.addtoStartup.title=Sessiebeheerder - toevoegen aan opstartsessie
-sm.addtoStartup.msg.windows=U staat op het punt om (een) venster(s) toe te voegen aan de opstartsessie:
-sm.addtoStartup.msg.tabs=U staat op het punt om (een) tabblad(en) toe te voegen aan de opstartsessie:
-sm.addtoStartup.button0.label=Aan sessie toevoegen
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Niet toevoegen
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Sessiebeheerder - opstartsessie vervangen
-sm.replaceStartup.msg=U staat op het punt om de opstartsessie te vervangen:
-sm.replaceStartup.button0.label=Sessie vervangen
-sm.replaceStartup.button0.accesskey=v
-sm.replaceStartup.button1.label=Niet vervangen
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Sessiebeheerder - opstartsessie verwijderen
-sm.removeStartup.msg0=U staat op het punt de opstartsessie te verwijderen:
-sm.removeStartup.msg1=Kies een sessie als de nieuwe opstartsessie uit de lijst:
-sm.removeStartup.button0.label=Verwijderen
-sm.removeStartup.button0.accesskey=V
-sm.removeStartup.button1.label=Niet verwijderen
-sm.removeStartup.button1.accesskey=N
-sm.title=Sessiebeheerder
-sm.dontSaveBlank.msg=Sessiebeheerder slaat geen lege vensters op
-sm.sessionSave.error=Fout in de sessiebeheerder. De sessie is niet opgeslagen.
-sm.sessionName.title.rename=Sessiebeheerder - sessie hernoemen
-sm.sessionName.title.saveprevious=Sessiebeheerder - sessie opslaan
-sm.sessionName.title.savethiswindow=Sessiebeheerder - dit venster opslaan
-sm.sessionName.title.saveallwindows=Sessiebeheerder - alle vensters opslaan
-sm.sessionName.msg0=Voer sessienaam in:
-sm.sessionName.msg1=De naam dient uit ten minste één letter of cijfer te bestaan.
-sm.sessionName.msg2=Deze naam wordt al gebruikt!
-sm.sessionName.msg3=De sessie werkelijk vervangen?
-sm.sessionName.button0.label=Sessie hernoemen
-sm.sessionName.button0.accesskey=H
-sm.sessionName.button1.label=Niet hernoemen
-sm.sessionName.button1.accesskey=N
-sm.session.empty=leeg
-sm.session.tabs=T
-sm.session.windows=V
-sm.removeAll.title.session=Sessiebeheerder - alle opgeslagen sessies verwijderen
-sm.removeAll.title.closedwindow=Sessiebeheerder - alle gesloten vensters verwijderen
-sm.removeAll.msg0=Alle opgeslagen sessies werkelijk verwijderen?
-sm.removeAll.msg1=Als ‘Verwijderen’ wordt gekozen, zal de opstartsessie de ‘Laatste sessie’ zijn.
-sm.removeAll.msg2=Alle gesloten vensters werkelijk verwijderen?
-sm.sessionMenu.last=Laatste sessie
-sm.sessionMenu.lastDefault=Laatste sessie - standaard
-sm.sessionMenu.lastgood=Laatste goede sessie
-sm.sessionMenu.previous=Voorlaatste sessie
-sm.sessionMenu.crashed=Vastgelopen sessie
-sm.afterCrash.title=Sessiebeheerder - Herstellen na vastlopen
-sm.afterCrash.chkbox.label=Sessiebeheerder inschakelen
-sm.afterCrash.msg0=De laatste sessie is vastgelopen!
-sm.afterCrash.msg0.again=De laatste vastgelopen sessie is weer vastgelopen!
-sm.afterCrash.msg1=Selecteer een te herstellen sessie uit de lijst:
-sm.afterCrash.msg2=Kies hoe verder te gaan
-sm.afterCrash.msg3=De sessiebeheerder is momenteel uitgeschakeld. Als u de sessiebeheerder inschakelt kunnen vastgelopen sessies, gesloten sessies, opgeslagen sessies en gesloten vensters worden hersteld vanuit het menu Sessiebeheerder.
-sm.afterCrash.msg4=De vastgelopen sessie kan ook later worden hersteld vanuit het menu Sessiebeheerder.
-sm.afterCrash.msg5=maar er is niets opgeslagen.
-sm.afterCrash.msg6=maar er is geen open venster in de vastgelopen sessie.
-sm.afterCrash.msg7=Selecteer het te herstellen venster uit de lijst Gesloten vensters
-sm.afterCrash.msg8=(gesloten vensters kunnen ook later worden hersteld vanuit het menu Gesloten vensters)
-sm.afterCrash.msg9=Uw vastgelopen sessie is leeg!
-sm.afterCrash.msg10=De sessiebeheerder heeft geen sessies gevonden die hersteld kunnen worden.
-sm.afterCrash.button0.label=Sessie herstellen
-sm.afterCrash.button0.accesskey=H
-sm.afterCrash.button0.crashed.label=Vastgelopen sessie herstellen
-sm.afterCrash.button0.crashed.accesskey=H
-sm.afterCrash.button1.label=Niet herstellen
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Sessiebeheerder - sessie herstellen
-sm.start.chkbox.label=Herstellen vastlopen inschakelen
-sm.start.msg0=De opstartsessie is leeg!
-sm.start.msg1=Vastgelopen herstel is momenteel uitgeschakeld. Als vastgelopen herstel wordt ingeschakeld, kunnen vastgelopen sessies worden hersteld.
-sm.start.msg2=Fout bij opzoeken opstartsessie. De opgeslagen opstartsessie bestaat niet.
-sm.restoreError.msg0=Fout in sessiebeheerbestand!
-sm.restoreError.msg1=Vergeefs herstelde sessie verwijderen
-sm.disable.msg=Firefox heeft een ingebouwde mogelijkheid om sessies te herstellen.
-sm.disable.msg1=De ingebouwde sessieherstelmogelijkheid inschakelen en de Tab Mix Plus Sessiebeheerder uitschakelen?
-sm.disable.msg2=De Tab Mix Plus Sessiebeheerder inschakelen en de ingebouwde sessieherstelmogelijkheid uitschakelen?
-sm.tabview.hiddengroups=Meer tabbladen hersteld naar verborgen groepen.
-sm.tabview.hiddengroups.removed=Verborgen tabbladgroepen is verwijderd.
-sm.tabview.removed=De functie Tabbladgroepen (Panorama) is uit Firefox verwijderd.
-sm.tabview.removed.learnMore.label=Meer lezen
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Extensie Tab Groups installeren
-sm.tabview.install.accesskey=l
-sm.tabview.backup.session=Geschiedenissessie, back-up met groepsgegevens
-sm.tabview.backup.crashed=Gecrashte sessie, back-up met groepsgegevens
-sm.tabview.backup.msg=De Tab Mix Plus-sessiebeheerder heeft een back-up van uw sessie bewaard.
-sm.bookmarks.historySession=Geschiedenissessie
-sm.bookmarks.closedWindow=Gesloten venster
-sm.bookmarks.sessionFolder=Tab Mix Plus-sessies
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Venster %S
diff --git a/addon/chrome/locale/nl/tabmix.dtd b/addon/chrome/locale/nl/tabmix.dtd
index 92dd1902b..4afdebef4 100644
--- a/addon/chrome/locale/nl/tabmix.dtd
+++ b/addon/chrome/locale/nl/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Uit de lijst verwijderen">
 <!ENTITY deletelist.accesskey "V">
 <!ENTITY settings.label "Instellingen">
-<!ENTITY saveWindow.label "Dit venster bewaren">
-<!ENTITY saveAllWindows.label "Alle vensters bewaren">
 <!ENTITY sm.context.overwrite "Bestaand(e) venster(s) herstellen/overschrijven">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Naar nieuw(e) venster(s) herstellen">
diff --git a/addon/chrome/locale/pl/misc.dtd b/addon/chrome/locale/pl/misc.dtd
index a0616bba9..c786c9aeb 100644
--- a/addon/chrome/locale/pl/misc.dtd
+++ b/addon/chrome/locale/pl/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Wybierz czas z listy lub wprowadź swój czas">
 <!ENTITY specifyreload.label "Czas odświeżania">
-<!ENTITY sanitizer.entry "Sesje Tab Mix Plusa">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Czy na pewno chcesz usunąć wszystkie zapisane dane sesji i kopie zapasowe?">
diff --git a/addon/chrome/locale/pl/pref-tabmix.dtd b/addon/chrome/locale/pl/pref-tabmix.dtd
index 79c1f69ef..6b907c075 100644
--- a/addon/chrome/locale/pl/pref-tabmix.dtd
+++ b/addon/chrome/locale/pl/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "wyświetlaj stronę startową">
 <!ENTITY startupBlankPage.label "wyświetlaj pustą stronę">
 <!ENTITY startupLastSession1.label "wyświetlaj okna i karty z poprzedniej sesji">
-<!ENTITY ss.enable.label "Używaj menedżera sesji Firefoksa">
-<!ENTITY ss.enable.tooltip "Odznacz tę opcję, aby używać menedżera sesji Tab Mix Plusa">
 <!ENTITY ss.advanced_setting "Ustawienia zaawansowane">
 <!ENTITY ss.advanced_setting.warning "Nie zmieniaj tych ustawień, jeżeli nie masz o nich odpowiedniej wiedzy!">
 <!ENTITY ss.interval "Minimalna przerwa pomiędzy kolejnymi zapisami">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "wszystkich witryn">
 <!ENTITY ss.privacy_level.unencrypted "tylko witryn nieszyfrowanych">
 <!ENTITY ss.privacy_level.nosites "- nie zapisuj -">
-<!ENTITY sessionManger.enable "Włącz menedżera sesji">
 <!ENTITY crashRecovery.enable "Włącz odzyskiwanie sesji">
-<!ENTITY sm.StartExit "Uruchamianie/Zamykanie">
-<!ENTITY sm.restore "Odtwarzanie">
-<!ENTITY sm.preserve "Zachowywanie danych">
 <!ENTITY sm.start "Gdy przeglądarka jest uruchamiana:">
-<!ENTITY sm.start.restore "odtwarzaj sesję">
-<!ENTITY sm.start.ask "pytaj czy odtworzyć sesję">
-<!ENTITY sm.start.nothing "nie odtwarzaj">
-<!ENTITY sm.exit "Gdy przeglądarka jest zamykana:">
-<!ENTITY sm.exit.save "zapisuj sesję">
-<!ENTITY sm.exit.ask "pytaj czy zapisać sesję">
-<!ENTITY sm.exit.nothing "nie zapisuj">
-<!ENTITY sm.startup "Sesja startowa:">
-<!ENTITY sm.lastsession "ostatnia sesja">
-<!ENTITY sm.previouslast "przedostatnia sesja">
-<!ENTITY sm.chooseifempty "Wybierz inną, jeśli sesja startowa jest pusta">
-<!ENTITY sm.restore.options "Podczas odtwarzania sesji:">
-<!ENTITY sm.restore.overwrite "Nadpisuj istniejące okna">
-<!ENTITY sm.restore.overwriteTabs "i karty">
-<!ENTITY sm.restore.closedWinList "Zapisuj istniejące okna na liście zamkniętych okien">
-<!ENTITY sm.restore.merge "Połącz wszystkie okna w jedno">
-<!ENTITY sm.restore.bypassCache "Podczas przywracania pomijaj bufor">
-<!ENTITY sm.notrestore.label "Gdy nieodtwarzane podczas uruchamiania">
-<!ENTITY sm.restorePinned1.label "Odtwarzaj przypięte karty z poprzedniej sesji">
 <!ENTITY sm.preserve.options "Dla kart zachowaj następujące dane:">
 <!ENTITY sm.preserve.history "historię">
 <!ENTITY sm.preserve.protect "status zabezpieczenia">
 <!ENTITY sm.preserve.locked "status blokady">
 <!ENTITY sm.preserve.permission "zezwolenia">
 <!ENTITY sm.preserve.scroll1 "Pozycja przewijania">
-<!ENTITY sm.restore.winOptions "Dla okien zachowaj następujące dane:">
-<!ENTITY sm.restore.selectedTab "aktywną kartę">
-<!ENTITY sm.restore.closedTabs "listę zamkniętych kart">
 <!ENTITY incompatible.extensions "Niektóre z zainstalowanych rozszerzeń są niekompatybilne z Tab Mix Plusem. Zaleca się odinstalowanie lub wyłączenie tych rozszerzeń.">
 <!ENTITY incompatible.button.label "Wyświetl listę">
diff --git a/addon/chrome/locale/pl/session-manager.properties b/addon/chrome/locale/pl/session-manager.properties
deleted file mode 100644
index e89c7481c..000000000
--- a/addon/chrome/locale/pl/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Razem z sesją, zapisz listę zamkniętych kart
-sm.button.continue.label=Kontynuuj
-sm.button.continue.accesskey=K
-sm.askBeforeSave.title=Menedżer sesji - zapis sesji
-sm.askBeforeSave.msg0=Czy chcesz zapisać sesję?
-sm.askBeforeSave.msg2=Okna otwarte w trybie prywatnym nie zostaną zapisane.
-sm.askBeforeSave.msg1=Jeśli nie zapiszesz sesji, podczas następnego uruchomienia przeglądarka otworzy się z pustą sesją
-sm.askBeforeSave.button0.label=Zapisz
-sm.askBeforeSave.button0.accesskey=Z
-sm.askBeforeSave.button1.label=Nie zapisuj
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Menedżer sesji - uszkodzona baza danych
-sm.corrupted.msg0=Menedżer sesji nie może wczytać bazy danych ponieważ jest uszkodzony plik session.rdf.
-sm.corrupted.msg1=Plik session.rdf zostanie usunięty. Jego kopia o nazwie session.old będzie dostępna w katalogu profilu.
-sm.areYouSure.msg=Czy na pewno chcesz kontynuować?
-sm.canChooseStartup.msg=Możesz wybrać z listy nową sesję startową:
-sm.addtoStartup.title=Menedżer sesji - dodawanie kart i okien do sesji startowej
-sm.addtoStartup.msg.windows=Zamierzasz dodać okna do sesji startowej:
-sm.addtoStartup.msg.tabs=Zamierzasz dodać karty do sesji startowej:
-sm.addtoStartup.button0.label=Dodaj
-sm.addtoStartup.button0.accesskey=D
-sm.addtoStartup.button1.label=Anuluj
-sm.addtoStartup.button1.accesskey=A
-sm.replaceStartup.title=Menedżer sesji - zmiana sesji startowej
-sm.replaceStartup.msg=Zamierzasz zmienić sesję startową:
-sm.replaceStartup.button0.label=Zmień
-sm.replaceStartup.button0.accesskey=Z
-sm.replaceStartup.button1.label=Anuluj
-sm.replaceStartup.button1.accesskey=A
-sm.removeStartup.title=Menedżer sesji - usuwanie sesji startowej
-sm.removeStartup.msg0=Zamierzasz usunąć sesję startową:
-sm.removeStartup.msg1=Wybierz z listy nową sesję startową
-sm.removeStartup.button0.label=Usuń
-sm.removeStartup.button0.accesskey=U
-sm.removeStartup.button1.label=Anuluj
-sm.removeStartup.button1.accesskey=A
-sm.title=Menedżer sesji
-sm.dontSaveBlank.msg=Menedżer sesji nie może zapisywać pustych okien
-sm.sessionSave.error=Błąd menedżera sesji. Sesja nie została zapisana.
-sm.sessionName.title.rename=Menedżer sesji - zmiana nazwy sesji
-sm.sessionName.title.saveprevious=Menedżer sesji - zapis sesji
-sm.sessionName.title.savethiswindow=Menedżer sesji - zapis aktywnego okna
-sm.sessionName.title.saveallwindows=Menedżer sesji - zapis wszystkich okien
-sm.sessionName.msg0=Wprowadź nazwę sesji:
-sm.sessionName.msg1=Nazwa musi składać się minimum z jednej litery lub cyfry
-sm.sessionName.msg2=Ta nazwa jest już używana!
-sm.sessionName.msg3=Czy na pewno chcesz zamienić nazwę sesji?
-sm.sessionName.button0.label=Zmień
-sm.sessionName.button0.accesskey=Z
-sm.sessionName.button1.label=Anuluj
-sm.sessionName.button1.accesskey=A
-sm.session.empty=pusta
-sm.session.tabs=K
-sm.session.windows=O
-sm.removeAll.title.session=Menedżer sesji - usuwanie zapisanych sesji
-sm.removeAll.title.closedwindow=Menedżer sesji - usuwanie zamkniętych okien
-sm.removeAll.msg0=Czy na pewno chcesz usunąć wszystkie zapisane sesje?
-sm.removeAll.msg1=Jeżeli wybierzesz „Usuń”, sesją startową będzie ostatnia sesja
-sm.removeAll.msg2=Czy na pewno chcesz usunąć wszystkie zamknięte okna?
-sm.sessionMenu.last=Ostatnia sesja
-sm.sessionMenu.lastDefault=Ostatnia sesja (domyślna)
-sm.sessionMenu.lastgood=Ostatnia prawidłowa sesja
-sm.sessionMenu.previous=Przedostatnia sesja
-sm.sessionMenu.crashed=Uszkodzona sesja
-sm.afterCrash.title=Menedżer sesji - odtwarzanie nieprawidłowo zakończonej sesji
-sm.afterCrash.chkbox.label=Włącz menedżera sesji
-sm.afterCrash.msg0=Ostatnia sesja Firefoksa została nieprawidłowo zakończona!
-sm.afterCrash.msg0.again=Ostatnia nieprawidłowo zakończona sesja uległa ponownemu uszkodzeniu!
-sm.afterCrash.msg1=Wybierz z listy sesję do odtworzenia
-sm.afterCrash.msg2=Wybierz sposób kontynuowania
-sm.afterCrash.msg3=Menedżer sesji jest wyłączony. Włączenie menedżera sesji pozwoli na odtwarzanie z poziomu jego menu, nieprawidłowo zakończonych sesji, zapisanych sesji, zamkniętych sesji i zamkniętych okien.
-sm.afterCrash.msg4=Nieprawidłowo zakończoną sesję można także odtworzyć w późniejszym czasie, z poziomu menu menedżera sesji.
-sm.afterCrash.msg5=ale nic nie zostało zapisane.
-sm.afterCrash.msg6=ale w sesji, która została nieprawidłowo zakończona nie było żadnych otwartych okien.
-sm.afterCrash.msg7=Z listy zamkniętych okien wybierz okno do odtworzenia
-sm.afterCrash.msg8=(zamknięte okna można także odtworzyć w późniejszym czasie, z poziomu menu listy zamkniętych okien)
-sm.afterCrash.msg9=Nieprawidłowo zakończona sesja jest pusta!
-sm.afterCrash.msg10=Menedżer sesji nie znalazł żadnej sesji do odtworzenia
-sm.afterCrash.button0.label=Odtwórz
-sm.afterCrash.button0.accesskey=O
-sm.afterCrash.button0.crashed.label=Odtwórz nieprawidłowo zakończoną sesję
-sm.afterCrash.button0.crashed.accesskey=W
-sm.afterCrash.button1.label=Anuluj
-sm.afterCrash.button1.accesskey=A
-sm.start.title=Menedżer sesji - odtwarzanie sesji
-sm.start.chkbox.label=Włącz odzyskiwanie sesji po nieprawidłowym zakończeniu
-sm.start.msg0=Sesja startowa jest pusta!
-sm.start.msg1=Odzyskiwanie sesji jest wyłączone. Włączenie odzyskiwania sesji pozwoli na odtwarzanie nieprawidłowo zakończonych sesji.
-sm.start.msg2=Błąd podczas szukania sesji startowej. Brak zapisanej sesji startowej.
-sm.restoreError.msg0=Błąd w pliku menedżera sesji!
-sm.restoreError.msg1=Usuń sesję, którą próbujesz odtworzyć.
-sm.disable.msg=Firefox posiada wbudowaną funkcję odtwarzania sesji.
-sm.disable.msg1=Włączyć wbudowaną funkcję odtwarzania sesji, a wyłączyć menedżera sesji Tab Mix Plusa?
-sm.disable.msg2=Włączyć menedżera sesji Tab Mix Plusa, a wyłączyć wbudowaną funkcję odtwarzania sesji?
-sm.tabview.hiddengroups=Więcej kart przywrócono do ukrytych grup.
-sm.tabview.hiddengroups.removed=Ukryte grupy kart zostały usunięte.
-sm.tabview.removed=Funkcja Grupy kart (Panorama) została usunięta z Firefoksa.
-sm.tabview.removed.learnMore.label=Więcej na ten temat
-sm.tabview.removed.learnMore.accesskey=E
-sm.tabview.install.label=Zainstaluj dodatek Tab Groups
-sm.tabview.install.accesskey=Z
-sm.tabview.backup.session=Historia sesji, kopia zapasowa z danymi grup
-sm.tabview.backup.crashed=Awarie sesji, kopia zapasowa z danymi grup
-sm.tabview.backup.msg=Menedżer sesji Tab Mix Plusa zapisał kopię zapasową twojej sesji.
-sm.bookmarks.historySession=Historia sesji
-sm.bookmarks.closedWindow=Zamknięte okna
-sm.bookmarks.sessionFolder=Sesje Tab Mix Plusa
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Okna %S
diff --git a/addon/chrome/locale/pl/tabmix.dtd b/addon/chrome/locale/pl/tabmix.dtd
index 4a4e026f2..7d7dd18fb 100644
--- a/addon/chrome/locale/pl/tabmix.dtd
+++ b/addon/chrome/locale/pl/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Usuń z listy">
 <!ENTITY deletelist.accesskey "U">
 <!ENTITY settings.label "Ustawienia">
-<!ENTITY saveWindow.label "Zapisz to okno">
-<!ENTITY saveAllWindows.label "Zapisz wszystkie okna">
 <!ENTITY sm.context.overwrite "Odtwórz, nadpisując istniejące okna">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Odtwórz w nowych oknach">
diff --git a/addon/chrome/locale/pt-BR/misc.dtd b/addon/chrome/locale/pt-BR/misc.dtd
index bf8ca28be..bdfe921a6 100644
--- a/addon/chrome/locale/pt-BR/misc.dtd
+++ b/addon/chrome/locale/pt-BR/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Selecione um tempo da lista ou especifique um outro valor">
 <!ENTITY specifyreload.label "Especificar tempo de atualização">
-<!ENTITY sanitizer.entry "Histórico do Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Tem certeza que deseja apagar TODAS as sessões salvas incluindo os &quot;backups&quot;?">
diff --git a/addon/chrome/locale/pt-BR/pref-tabmix.dtd b/addon/chrome/locale/pt-BR/pref-tabmix.dtd
index e634d79f3..a244c60f6 100644
--- a/addon/chrome/locale/pt-BR/pref-tabmix.dtd
+++ b/addon/chrome/locale/pt-BR/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Mostrar a sua página inicial">
 <!ENTITY startupBlankPage.label "Mostrar página em branco">
 <!ENTITY startupLastSession1.label "Mostrar suas janelas e abas pela última vez">
-<!ENTITY ss.enable.label "Usar Restaurador de Sessão nativo">
-<!ENTITY ss.enable.tooltip "Desmarque para permitir o uso com o Restaurador de Sessão do Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Configuração Avançada">
 <!ENTITY ss.advanced_setting.warning "Não modifique a não ser que saiba o que está fazendo...">
 <!ENTITY ss.interval "Intervalo mínimo de tempo entre salvar dois estados">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Todas as páginas">
 <!ENTITY ss.privacy_level.unencrypted "Somente páginas não criptografadas">
 <!ENTITY ss.privacy_level.nosites "Nenhuma página">
-<!ENTITY sessionManger.enable "Ativar Gerenciador de Sessões">
 <!ENTITY crashRecovery.enable "Ativar Recuperação de Falhas">
-<!ENTITY sm.StartExit "Iniciar/Sair">
-<!ENTITY sm.restore "Restaurar">
-<!ENTITY sm.preserve "Preservar">
 <!ENTITY sm.start "Ao iniciar o navegador:">
-<!ENTITY sm.start.restore "Restaurar">
-<!ENTITY sm.start.ask "Confirmar antes de restaurar">
-<!ENTITY sm.start.nothing "Não restaurar">
-<!ENTITY sm.exit "Ao sair do navegador:">
-<!ENTITY sm.exit.save "Salvar Sessão">
-<!ENTITY sm.exit.ask "Confirmar antes de salvar">
-<!ENTITY sm.exit.nothing "Não salvar">
-<!ENTITY sm.startup "Sessão inicial:">
-<!ENTITY sm.lastsession "Última sessão">
-<!ENTITY sm.previouslast "Anterior à última">
-<!ENTITY sm.chooseifempty "Escolher outra se não existir">
-<!ENTITY sm.restore.options "Ao restaurar sessões:">
-<!ENTITY sm.restore.overwrite "Substituir janelas existentes">
-<!ENTITY sm.restore.overwriteTabs "E abas">
-<!ENTITY sm.restore.closedWinList "Salvar janelas na lista de janelas fechadas">
-<!ENTITY sm.restore.merge "Unir múltiplas janelas em uma só">
-<!ENTITY sm.restore.bypassCache "Limpar o cache ao restaurar">
-<!ENTITY sm.notrestore.label "Se não restaurar ao iniciar">
-<!ENTITY sm.restorePinned1.label "Restaurar as abas fixadas pela última vez">
 <!ENTITY sm.preserve.options "Preservar abas:">
 <!ENTITY sm.preserve.history "Histórico">
 <!ENTITY sm.preserve.protect "Estado de proteção">
 <!ENTITY sm.preserve.locked "Estado de trancamento">
 <!ENTITY sm.preserve.permission "Permissões">
 <!ENTITY sm.preserve.scroll1 "Posição da barra de rolagem">
-<!ENTITY sm.restore.winOptions "Preservar janelas:">
-<!ENTITY sm.restore.selectedTab "Aba selecionada">
-<!ENTITY sm.restore.closedTabs "Lista de abas fechadas">
 <!ENTITY incompatible.extensions "Alguma das suas extensões são incompatíveis com a Tab Mix Plus, é recomendável que você desative ou desinstale essas extensões">
 <!ENTITY incompatible.button.label "Mostrar lista">
diff --git a/addon/chrome/locale/pt-BR/session-manager.properties b/addon/chrome/locale/pt-BR/session-manager.properties
deleted file mode 100644
index 0093a8d8b..000000000
--- a/addon/chrome/locale/pt-BR/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Salvar lista de abas fechadas com essa sessão
-sm.button.continue.label=Continuar
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Gerenciador de Sessões - Salvar Sessão
-sm.askBeforeSave.msg0=Gostaria de salvar sua sessão?
-sm.askBeforeSave.msg2=Apenas janelas não particulares serão salvas em disco
-sm.askBeforeSave.msg1=Caso não salve, a próxima vez que o navegador for iniciado terá a \"Última sessão\" vazia.
-sm.askBeforeSave.button0.label=Salvar Sessão
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Não Salvar
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Gerenciador de Sessões - Banco de Dados corrupto
-sm.corrupted.msg0=O Gerenciador de Sessões não pôde carregar seu banco de dados uma vez que o arquivo \"session.rdf\" está corrupto.
-sm.corrupted.msg1=O arquivo \"session.rdf\" será excluído. Uma cópia do arquivo, \"session.old\", pode ser encontrada em seu perfil.
-sm.areYouSure.msg=Tem certeza que quer continuar?
-sm.canChooseStartup.msg=Você pode selecionar uma sessão da lista como sua nova sessão inicial:
-sm.addtoStartup.title=Gerenciador de Sessões - Adicionar à Sessão Inicial
-sm.addtoStartup.msg.windows=Você está prestes a adicionar janela(s) à sua sessão inicial:
-sm.addtoStartup.msg.tabs=Você está prestes a adicionar aba(s) à sua sessão inicial:
-sm.addtoStartup.button0.label=Adicionar à Sessão
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Não Adicionar
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Gerenciador de Sessões - Substituir Sessão Inicial
-sm.replaceStartup.msg=Você está prestes a substituir sua sessão inicial:
-sm.replaceStartup.button0.label=Substituir Sessão
-sm.replaceStartup.button0.accesskey=S
-sm.replaceStartup.button1.label=Não Substituir
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Gerenciador de Sessões - Excluir Sessão Inicial
-sm.removeStartup.msg0=Você está prestes a excluir sua sessão inicial:
-sm.removeStartup.msg1=Selecione uma sessão da lista como sua nova sessão inicial:
-sm.removeStartup.button0.label=Excluir
-sm.removeStartup.button0.accesskey=E
-sm.removeStartup.button1.label=Não Excluir
-sm.removeStartup.button1.accesskey=N
-sm.title=Gerenciador de Sessões
-sm.dontSaveBlank.msg=O Gerenciador de Sessões não salva páginas em branco
-sm.sessionSave.error=Erro no Gerenciador de Sessões, a sessão não foi salva
-sm.sessionName.title.rename=Gerenciador de Sessões - Renomear Sessão
-sm.sessionName.title.saveprevious=Gerenciador de Sessões - Salvar Sessão
-sm.sessionName.title.savethiswindow=Gerenciador de Sessões - Salvar essa Janela
-sm.sessionName.title.saveallwindows=Gerenciador de Sessões - Salvar todas as Janelas
-sm.sessionName.msg0=Fornecer Nome da Sessão:
-sm.sessionName.msg1=Nome necessita conter no mínimo uma letra ou número.
-sm.sessionName.msg2=Esse nome já está em uso!
-sm.sessionName.msg3=Tem certeza que quer substituir a sessão?
-sm.sessionName.button0.label=Renomear Sessão
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Não Renomear
-sm.sessionName.button1.accesskey=N
-sm.session.empty=vazia
-sm.session.tabs=A
-sm.session.windows=J
-sm.removeAll.title.session=Gerenciador de Sessões - Excluir todas as Sessões Salvas
-sm.removeAll.title.closedwindow=Gerenciador de Sessões - Excluir todas as Janelas Fechadas
-sm.removeAll.msg0=Tem certeza que quer excluir todas as sessões salvas?
-sm.removeAll.msg1=Caso escolha \"Excluir\", sua sessão inicial será a \"Última Sessão\".
-sm.removeAll.msg2=Tem certeza que quer excluir todas as janelas fechadas?
-sm.sessionMenu.last=Última Sessão
-sm.sessionMenu.lastDefault=Última Sessão - Padrão
-sm.sessionMenu.lastgood=Última Sessão Válida
-sm.sessionMenu.previous=Anterior à última
-sm.sessionMenu.crashed=Sessão Travada
-sm.afterCrash.title=Gerenciador de Sessões - Restaurar após Falha
-sm.afterCrash.chkbox.label=Ativar Gerenciador de Sessões
-sm.afterCrash.msg0=Sua última sessão travou!
-sm.afterCrash.msg0.again=Sua última sessão travou novamente!
-sm.afterCrash.msg1=Selecione da lista sessão a ser restaurada:
-sm.afterCrash.msg2=Escolha como continuar
-sm.afterCrash.msg3=O Gerenciador de Sessões está desativado no momento, caso você o ative, você poderá restaurar sessões travadas, sessões fechadas, sessões salvas e janelas fechadas a partir do menu do Gerenciador de Sessões.
-sm.afterCrash.msg4=Você também poderá restaurar a sessão travada mais tarde, a partir do menu do Gerenciador de Sessões.
-sm.afterCrash.msg5=porém nada foi salvo.
-sm.afterCrash.msg6=porém não havia nenhuma janela aberta em sua sessão travada
-sm.afterCrash.msg7=Selecione janela a ser restaurada da lista de Janelas Fechadas
-sm.afterCrash.msg8=(você também poderá restaurar janelas fechadas mais tarde, a partir do menu das Janelas Fechadas)
-sm.afterCrash.msg9=Sua sessão travada está vazia!
-sm.afterCrash.msg10=O Gerenciador de Sessões não encontrou nenhuma sessão a ser restaurada.
-sm.afterCrash.button0.label=Restaurar Sessão
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaurar Sessão Travada
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Não Restaurar
-sm.afterCrash.button1.accesskey=D
-sm.start.title=Gerenciador de Sessões - Restaurar Sessão
-sm.start.chkbox.label=Ativar Gerenciador de Sessões
-sm.start.msg0=Sua sessão inicial está vazia!
-sm.start.msg1=A Recuperação de Falhas está desativada no momento, caso você a ative, você poderá restaurar sessões travadas.
-sm.start.msg2=Erro ao tentar localizar sua sessão inicial, sua sessão inicial não existe...
-sm.restoreError.msg0=Erro no arquivo do Gerenciador de Sessões!
-sm.restoreError.msg1=Exclua a sessão que você tentou restaurar
-sm.disable.msg=Firefox possui um restaurador de sessões nativo.
-sm.disable.msg1=Você gostaria de ativar o restaurador de sessões nativo e desativar o do Tab Mix Plus?
-sm.disable.msg2=Você gostaria de ativar o restaurador de sessões do Tab Mix Plus e desativar o nativo?
-sm.tabview.hiddengroups=Mais abas restauradas em grupos escondidos.
-sm.tabview.hiddengroups.removed=Grupo de abas oculto foi removido.
-sm.tabview.removed=O grupo de abas (Panorama)foi removido do Firefox.
-sm.tabview.removed.learnMore.label=Aprender mais
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Instalar extensão para grupo de abas
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Histórico de sessão, backup com grupo de dados
-sm.tabview.backup.crashed=Sessões em cache, backup com grupo de dados
-sm.tabview.backup.msg=O Gerenciador de Sessões do Tab Mix Plus salvou a backup de sua sessão.
-sm.bookmarks.historySession=Histórico de sessões
-sm.bookmarks.closedWindow=Janela fechada
-sm.bookmarks.sessionFolder=Sessões do Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=%S Janelas
diff --git a/addon/chrome/locale/pt-BR/tabmix.dtd b/addon/chrome/locale/pt-BR/tabmix.dtd
index ccf4dac5d..879db0c73 100644
--- a/addon/chrome/locale/pt-BR/tabmix.dtd
+++ b/addon/chrome/locale/pt-BR/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Excluir da lista">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "Configurações">
-<!ENTITY saveWindow.label "Salvar essa janela">
-<!ENTITY saveAllWindows.label "Salvar todas as janelas">
 <!ENTITY sm.context.overwrite "Restaurar, substituir janela(s) existente(s)">
 <!ENTITY sm.context.overwrite.key "S">
 <!ENTITY sm.context.restore.new "Restaurar em nova(s) janela(s)">
diff --git a/addon/chrome/locale/pt-PT/misc.dtd b/addon/chrome/locale/pt-PT/misc.dtd
index 18d9d617e..eb8ca90d7 100644
--- a/addon/chrome/locale/pt-PT/misc.dtd
+++ b/addon/chrome/locale/pt-PT/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Escolha a hora da lista ou escreva a sua própria hora">
 <!ENTITY specifyreload.label "Especificar Tempo de Actualização">
-<!ENTITY sanitizer.entry "Tab Mix Plus Sessões Guardadas">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Tem a certeza que deseja eliminar TODAS as suas sessões guardadas incluindo backups?">
diff --git a/addon/chrome/locale/pt-PT/pref-tabmix.dtd b/addon/chrome/locale/pt-PT/pref-tabmix.dtd
index 28176586d..61bed1fac 100644
--- a/addon/chrome/locale/pt-PT/pref-tabmix.dtd
+++ b/addon/chrome/locale/pt-PT/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Mostrar uma página em branco">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Usara funcionalidade de restauro de sessão do Firefox">
-<!ENTITY ss.enable.tooltip "De-seleccionar para permitir o uso do Gestor de sessões do Tabmix">
 <!ENTITY ss.advanced_setting "Definições avançadas">
 <!ENTITY ss.advanced_setting.warning "Não alterar, a menos que saiba o que está a fazer">
 <!ENTITY ss.interval "Intervalo de tempo para guardar dois estados">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Todos os sítios">
 <!ENTITY ss.privacy_level.unencrypted "Apenas sítios não cifrados">
 <!ENTITY ss.privacy_level.nosites "Nenhum sítio">
-<!ENTITY sessionManger.enable "Activar o gestor de sessões">
 <!ENTITY crashRecovery.enable "Activar recuperação">
-<!ENTITY sm.StartExit "Iniciar/Sair">
-<!ENTITY sm.restore "Restaurar">
-<!ENTITY sm.preserve "Preservar">
 <!ENTITY sm.start "Quando o navegador inicia:">
-<!ENTITY sm.start.restore "Restaurar">
-<!ENTITY sm.start.ask "Perguntar antes de restaurar">
-<!ENTITY sm.start.nothing "Não restaurar">
-<!ENTITY sm.exit "Quando o navegador sai:">
-<!ENTITY sm.exit.save "Guardar sessão">
-<!ENTITY sm.exit.ask "Perguntar antes de guardar">
-<!ENTITY sm.exit.nothing "Não guardar">
-<!ENTITY sm.startup "Sessão de abertura:">
-<!ENTITY sm.lastsession "Última sessão">
-<!ENTITY sm.previouslast "Anterior ao último">
-<!ENTITY sm.chooseifempty "Escolher outra se vazia">
-<!ENTITY sm.restore.options "Ao restaurar sessões:">
-<!ENTITY sm.restore.overwrite "Sobrescrever janelas">
-<!ENTITY sm.restore.overwriteTabs "E separadores">
-<!ENTITY sm.restore.closedWinList "Guardar janelas na lista de janelas encerradas">
-<!ENTITY sm.restore.merge "Juntar múltiplas janelas numa só">
-<!ENTITY sm.restore.bypassCache "Bypass cache ao restaurar">
-<!ENTITY sm.notrestore.label "Quando não restaurar ao iniciar">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Preservar separadores:">
 <!ENTITY sm.preserve.history "Histórico">
 <!ENTITY sm.preserve.protect "Estado da protecção">
 <!ENTITY sm.preserve.locked "Bloquear estado">
 <!ENTITY sm.preserve.permission "Permissões">
 <!ENTITY sm.preserve.scroll1 "Deslocar posição">
-<!ENTITY sm.restore.winOptions "Preservar janelas:">
-<!ENTITY sm.restore.selectedTab "Separador seleccionado">
-<!ENTITY sm.restore.closedTabs "Lista de separadores fechados">
 <!ENTITY incompatible.extensions "Algumas das suas extensões são incompatíveis com o Tab Mix Plus, é recomendado que desactive ou desinstale essas extensões.">
 <!ENTITY incompatible.button.label "Mostrar lista">
diff --git a/addon/chrome/locale/pt-PT/session-manager.properties b/addon/chrome/locale/pt-PT/session-manager.properties
deleted file mode 100644
index 03a324d9b..000000000
--- a/addon/chrome/locale/pt-PT/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Guardar a lista dos separadores fechados com esta sessão
-sm.button.continue.label=Continuar
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Gestor de sessão - Guardar sessão
-sm.askBeforeSave.msg0=Deseja guardar a sua sessão?
-sm.askBeforeSave.msg2=Apenas janelas não privadas serão guardadas no disco.
-sm.askBeforeSave.msg1=Se não guardar, da próxima vez que iniciar o navegador a \"Última Sessão\" estará vazia.
-sm.askBeforeSave.button0.label=Guardar sessão
-sm.askBeforeSave.button0.accesskey=s
-sm.askBeforeSave.button1.label=Não guardar
-sm.askBeforeSave.button1.accesskey=g
-sm.corrupted.title=Session Manager - Base de dados corrupta
-sm.corrupted.msg0=O Session Manager não pode carregar a partir de uma sua base de dados session.rdf corrupta.
-sm.corrupted.msg1=O ficheiro sesseion.rdf será eliminado, pode encontrar uma cópia em session.old no seu perfil. Os backups de sessão encontram-se em <profile>/sessionbackups
-sm.areYouSure.msg=Tem a certeza que deseja continuar?
-sm.canChooseStartup.msg=Pode escolher uma sessão da lista, para ser a sua nova sessão de arranque:
-sm.addtoStartup.title=Gestor de sessão - Adicionar ao início de sessão
-sm.addtoStartup.msg.windows=Está prestes a adicionar janela(s) à sua sessão de arranque:
-sm.addtoStartup.msg.tabs=Está prestes a adicionar separador(es) à sua sessão de inicialização:
-sm.addtoStartup.button0.label=Adicionar à sessão
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Não adicionar
-sm.addtoStartup.button1.accesskey=d
-sm.replaceStartup.title=Gestor de sessão - Sobrepor ao início de sessão
-sm.replaceStartup.msg=Está prestes a substituir a sua sessão de inicialização:
-sm.replaceStartup.button0.label=Substituir sessão
-sm.replaceStartup.button0.accesskey=r
-sm.replaceStartup.button1.label=Não substituir
-sm.replaceStartup.button1.accesskey=o
-sm.removeStartup.title=Session Manager - Apagar sessão de arranque
-sm.removeStartup.msg0=Está prestes a eliminar a sua sessão de arranque:
-sm.removeStartup.msg1=Escolha uma sessão da lista para ser a sua nova sessão de arranque:
-sm.removeStartup.button0.label=Eliminar
-sm.removeStartup.button0.accesskey=E
-sm.removeStartup.button1.label=Não eliminar
-sm.removeStartup.button1.accesskey=l
-sm.title=Gestor de sessão
-sm.dontSaveBlank.msg=O Session Manager não guarda janelas em branco
-sm.sessionSave.error=Erro no Session Manager, a sessão não foi guardada
-sm.sessionName.title.rename=Session Manager - Renomear sessão
-sm.sessionName.title.saveprevious=Session Manager - Guardar sessão
-sm.sessionName.title.savethiswindow=Session Manager - Guardar esta janela
-sm.sessionName.title.saveallwindows=Session Manager - Guardar todas as janelas
-sm.sessionName.msg0=Escreva o nome da sessão:
-sm.sessionName.msg1=O nome deve ter de pelo menos uma letra ou número.
-sm.sessionName.msg2=O nome já está em uso!
-sm.sessionName.msg3=Tem a certeza que quer substituir a sessão?
-sm.sessionName.button0.label=Renomear sessão
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Não renomear
-sm.sessionName.button1.accesskey=o
-sm.session.empty=empty
-sm.session.tabs=z
-sm.session.windows=W
-sm.removeAll.title.session=Gestor de sessão - Eliminar todas as sessões guardadas
-sm.removeAll.title.closedwindow=Gestor de sessão - Eliminar todas as janelas fechadas
-sm.removeAll.msg0=Tem certeza que quer apagar todas as sessões guardadas?
-sm.removeAll.msg1=Se escolher \"Eliminar\" a sua sessão de arranque será a \"Última Sessão\".
-sm.removeAll.msg2=Tem a certeza que quer apagar todas as janelas fechadas?
-sm.sessionMenu.last=Última Sessão
-sm.sessionMenu.lastDefault=Última Sessão - pré-definido
-sm.sessionMenu.lastgood=Última Sessão correcta
-sm.sessionMenu.previous=Anterior à última
-sm.sessionMenu.crashed=Sessão crashada
-sm.afterCrash.title=Session Manager - restaurar após crash
-sm.afterCrash.chkbox.label=Activar Session Manager
-sm.afterCrash.msg0=A sua última sessão crashou!
-sm.afterCrash.msg0.again=A sua última sessão crashada coltou a crashar!
-sm.afterCrash.msg1=Escolha a sessão a restaurar da lista:
-sm.afterCrash.msg2=Escolha como continuar
-sm.afterCrash.msg3=O Session Manager de momento está desactivado, se activar o Session Manager, será capaz de restaurar sessões crashadas, sessões fechadas, sessões guardadas e janelas fechadas a partir do menu Session Manager.
-sm.afterCrash.msg4=Também pode restaurar a sessão crashada mais tarde, no menu do Session Manager.
-sm.afterCrash.msg5=mas nada foi guardado.
-sm.afterCrash.msg6=mas não há qualquer janela aberta na sua sessão crashada
-sm.afterCrash.msg7=Escolha a janela a restaurar a partir de lista de janelas fechadas
-sm.afterCrash.msg8=(também pode restaurar as janelas fechadas, mais tarde, a partir do menu de janelas fechadas)
-sm.afterCrash.msg9=A sua sessão de erro está vazia!
-sm.afterCrash.msg10=O Session Manager não encontrou nenhuma sessão para restaurar.
-sm.afterCrash.button0.label=Restaurar sessão
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaurar sessão que crashou
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Não restaurar
-sm.afterCrash.button1.accesskey=R
-sm.start.title=Session Manager - Restauro da sessão
-sm.start.chkbox.label=Activar Crash Recovery
-sm.start.msg0=A sua sessão de início está vazia!
-sm.start.msg1=A recuperação de crashes está desactivada, se a activar, será capaz de restaurar sessões crashadas.
-sm.start.msg2=Erro ao procurar no seu arranque da sessão, a sua sessão de arranque guardada não existe.
-sm.restoreError.msg0=Erro no ficheiro do gestor de sessão!
-sm.restoreError.msg1=Eliminar a sessão que tentou restaurar
-sm.disable.msg=O Firefox possui um recurso de restauração da sessão.
-sm.disable.msg1=Gostaria de activar o restauro de sessão incluído e desactivar o Tab Mix Plus Session Manager?
-sm.disable.msg2=Gostaria de activar o Tab Mix Plus Session Manager e desactivar o restauro de sessão incluído?
-sm.tabview.hiddengroups=Mais separadores restaurados em grupos ocultos.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/pt-PT/tabmix.dtd b/addon/chrome/locale/pt-PT/tabmix.dtd
index bdb033c01..bcaaaa03d 100644
--- a/addon/chrome/locale/pt-PT/tabmix.dtd
+++ b/addon/chrome/locale/pt-PT/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Eliminar da lista">
 <!ENTITY deletelist.accesskey "i">
 <!ENTITY settings.label "Definições">
-<!ENTITY saveWindow.label "Guardar esta janela">
-<!ENTITY saveAllWindows.label "Guardar todas as janelas">
 <!ENTITY sm.context.overwrite "Restaurar, sobrescrever janela(s) existente(s)">
 <!ENTITY sm.context.overwrite.key "o">
 <!ENTITY sm.context.restore.new "Restaurar para nova(s) janela(s)">
diff --git a/addon/chrome/locale/ro/misc.dtd b/addon/chrome/locale/ro/misc.dtd
index 6b7a1e33d..37f5a0699 100644
--- a/addon/chrome/locale/ro/misc.dtd
+++ b/addon/chrome/locale/ro/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Alegeți intervalul din listă sau furnizați propria valoare">
 <!ENTITY specifyreload.label "Interval de reîncărcare">
-<!ENTITY sanitizer.entry "Sesiuni salvate de Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Confirmați ștergerea TUTUROR sesiunilor salvate, inclusiv a arhivelor?">
diff --git a/addon/chrome/locale/ro/pref-tabmix.dtd b/addon/chrome/locale/ro/pref-tabmix.dtd
index 4920dbeee..b06757958 100644
--- a/addon/chrome/locale/ro/pref-tabmix.dtd
+++ b/addon/chrome/locale/ro/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "se afișează pagina de start">
 <!ENTITY startupBlankPage.label "se afișează o pagină vidă">
 <!ENTITY startupLastSession1.label "se afișează ferestrele și filele deschise ultima dată">
-<!ENTITY ss.enable.label "Se folosește facilitatea internă a Firefox de restaurare a sesiunilor">
-<!ENTITY ss.enable.tooltip "Se demarchează pentru a permite utilizarea gestionarului de sesiuni al Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Opțiuni complexe">
 <!ENTITY ss.advanced_setting.warning "Nu modificați aceste opțiuni decât dacă știți sigur ce înseamnă!">
 <!ENTITY ss.interval "Intervalul minim dintre două salvări ale stării sesiunii">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "toate saiturile">
 <!ENTITY ss.privacy_level.unencrypted "numai saiturile necriptate">
 <!ENTITY ss.privacy_level.nosites "niciun sait">
-<!ENTITY sessionManger.enable "Se activează Gestionarul de sesiuni">
 <!ENTITY crashRecovery.enable "Se activează recuperarea după o eșuare">
-<!ENTITY sm.StartExit "Lansare/Închidere">
-<!ENTITY sm.restore "Restaurare">
-<!ENTITY sm.preserve "Conservare">
 <!ENTITY sm.start "La lansarea navigatorului:">
-<!ENTITY sm.start.restore "Se restaurează o sesiune de pornire">
-<!ENTITY sm.start.ask "Se solicită confirmare înaintea restaurării">
-<!ENTITY sm.start.nothing "Nu se restaurează nimic">
-<!ENTITY sm.exit "La închiderea navigatorului:">
-<!ENTITY sm.exit.save "Se salvează sesiunea curentă">
-<!ENTITY sm.exit.ask "Se solicită confirmare înaintea salvării">
-<!ENTITY sm.exit.nothing "Nu se salvează nimic">
-<!ENTITY sm.startup "Se alege ca sesiune de pornire:">
-<!ENTITY sm.lastsession "ultima sesiune">
-<!ENTITY sm.previouslast "penultima sesiune">
-<!ENTITY sm.chooseifempty "Se alege altă sesiune dacă cea de pornire este vidă">
-<!ENTITY sm.restore.options "La restaurarea sesiunilor:">
-<!ENTITY sm.restore.overwrite "Se înlocuiesc ferestrele">
-<!ENTITY sm.restore.overwriteTabs "și filele existente">
-<!ENTITY sm.restore.closedWinList "Se salvează ferestrele în lista ferestrelor închise">
-<!ENTITY sm.restore.merge "Se combină mai multe ferestre într-una singură">
-<!ENTITY sm.restore.bypassCache "Se ignoră memoria „cache”">
-<!ENTITY sm.notrestore.label "Dacă nicio sesiune nu se restaurează la pornire">
-<!ENTITY sm.restorePinned1.label "Restaurează filele fixate ultima dată">
 <!ENTITY sm.preserve.options "Se memorează din file:">
 <!ENTITY sm.preserve.history "Istoricul">
 <!ENTITY sm.preserve.protect "Starea de protecție">
 <!ENTITY sm.preserve.locked "Starea de blocare">
 <!ENTITY sm.preserve.permission "Permisiunile">
 <!ENTITY sm.preserve.scroll1 "Poziția în pagină">
-<!ENTITY sm.restore.winOptions "Se memorează din ferestre:">
-<!ENTITY sm.restore.selectedTab "Filele selectate">
-<!ENTITY sm.restore.closedTabs "Lista filelor închise">
 <!ENTITY incompatible.extensions "Unele extensii sunt incompatibile cu Tab Mix Plus. Este recomandat să dezactivați sau să dezinstalați aceste extensii.">
 <!ENTITY incompatible.button.label "Afișează lista">
diff --git a/addon/chrome/locale/ro/session-manager.properties b/addon/chrome/locale/ro/session-manager.properties
deleted file mode 100644
index 3adb0da4b..000000000
--- a/addon/chrome/locale/ro/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Se salvează lista filelor închise odată cu sesiunea
-sm.button.continue.label=Continuă
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Gestionar de sesiuni - Salvare sesiune
-sm.askBeforeSave.msg0=Doriți să salvați sesiunea curentă?
-sm.askBeforeSave.msg2=Se vor salva numai ferestrele în care NU s-a folosit navigarea fără urme
-sm.askBeforeSave.msg1=Dacă nu salvați sesiunea, la repornirea navigatorului "Ultima sesiune" va fi vidă.
-sm.askBeforeSave.button0.label=Salvează sesiunea
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Nu salva
-sm.askBeforeSave.button1.accesskey=N
-sm.corrupted.title=Gestionar de sesiuni - Bază de date invalidă
-sm.corrupted.msg0=Gestionarul de sesiuni nu poate încărca baza de date din fișierul invalid „session.rdf”.
-sm.corrupted.msg1=Fișierul „session.rdf” va fi șters, o copie fiind salvată în „session.old” din profilul curent. Arhivele sesiunilor se găsesc în „<profil>/sessionbackups”.
-sm.areYouSure.msg=Continuați?
-sm.canChooseStartup.msg=Alegeți o sesiune pentru a fi sesiune de pornire:
-sm.addtoStartup.title=Gestionar de sesiuni - Adăugare elemente la sesiunea de pornire
-sm.addtoStartup.msg.windows=Ați ales să adăugați una sau mai multe ferestre la sesiunea de pornire:
-sm.addtoStartup.msg.tabs=Ați ales să adăugați una sau mai multe file la sesiunea de pornire:
-sm.addtoStartup.button0.label=Adaugă la sesiune
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Nu adăuga
-sm.addtoStartup.button1.accesskey=N
-sm.replaceStartup.title=Gestionar de sesiuni - Înlocuire sesiune de pornire
-sm.replaceStartup.msg=Ați ales să înlocuiți sesiunea de pornire:
-sm.replaceStartup.button0.label=Înlocuiește sesiunea
-sm.replaceStartup.button0.accesskey=l
-sm.replaceStartup.button1.label=Nu înlocui
-sm.replaceStartup.button1.accesskey=N
-sm.removeStartup.title=Gestionar sesiuni - Ștergere sesiune de pornire
-sm.removeStartup.msg0=Ați ales să ștergeți sesiunea de pornire
-sm.removeStartup.msg1=Alegeți o altă sesiune pentru s deveni sesiune de pornire:
-sm.removeStartup.button0.label=Șterge sesiunea
-sm.removeStartup.button0.accesskey=t
-sm.removeStartup.button1.label=Nu șterge
-sm.removeStartup.button1.accesskey=N
-sm.title=Gestionar de sesiuni
-sm.dontSaveBlank.msg=Gestionarul de sesiuni nu salvează ferestre goale
-sm.sessionSave.error=Eroare în gestionarul de sesiuni. Sesiunea nu s-a salvat!
-sm.sessionName.title.rename=Gestionar de sesiuni - Redenumire sesiune
-sm.sessionName.title.saveprevious=Gestionar de sesiuni - Salvare sesiune
-sm.sessionName.title.savethiswindow=Gestionar de sesiuni - Salvare fereastră curentă
-sm.sessionName.title.saveallwindows=Gestionar de sesiuni - Salvare totală ferestre
-sm.sessionName.msg0=Furnizați denumirea sesiunii:
-sm.sessionName.msg1=Denumirea trebuie să aibă cel puțin o literă sau o cifră!
-sm.sessionName.msg2=Această denumire este deja folosită!
-sm.sessionName.msg3=Confirmați înlocuirea acestei sesiuni?
-sm.sessionName.button0.label=Redenumește sesiunea
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Nu redenumi
-sm.sessionName.button1.accesskey=N
-sm.session.empty=vidă
-sm.session.tabs=F
-sm.session.windows=e
-sm.removeAll.title.session=Gestionar de sesiuni - Ștergere totală sesiuni salvate
-sm.removeAll.title.closedwindow=Gestionar de sesiuni - Ștergere totală ferestre închise
-sm.removeAll.msg0=Confirmați ștergerea tuturor sesiunilor salvate?
-sm.removeAll.msg1=Dacă ștergeți, sesiunea de pornire va fi "Ultima sesiune".
-sm.removeAll.msg2=Confirmați ștergerea tuturor ferestrelor închise?
-sm.sessionMenu.last=Ultima sesiune
-sm.sessionMenu.lastDefault=Ultima sesiune - Inițializare
-sm.sessionMenu.lastgood=Ultima sesiune validă
-sm.sessionMenu.previous=Penultima sesiune
-sm.sessionMenu.crashed=Sesiune eșuată
-sm.afterCrash.title=Gestionar de sesiuni - Recuperare după o eșuare
-sm.afterCrash.chkbox.label=Activează gestionarul de sesiuni
-sm.afterCrash.msg0=Ultima sesiune a eșuat!
-sm.afterCrash.msg0.again=Ultima sesiune eșuată a eșuat din nou!
-sm.afterCrash.msg1=Alegeți o sesiune de restaurat:
-sm.afterCrash.msg2=Alegeți o opțiune
-sm.afterCrash.msg3=Gestionarul de sesiuni este dezactivat. Dacă îl activați, veți putea recupera din meniul aferent sesiunile închise normal sau eșuate și ferestrele închise.
-sm.afterCrash.msg4=De asemenea, puteți recupera mai târziu sesiunile eșuate.
-sm.afterCrash.msg5=însă nu s-a salvat nimic.
-sm.afterCrash.msg6=însă nu s-au detectat ferestre în sesiunea eșuată.
-sm.afterCrash.msg7=Alege o fereastră pentru restaurare
-sm.afterCrash.msg8=(puteți, de asemenea, restaura mai târziu ferestre din meniul "Ferestre închise")
-sm.afterCrash.msg9=Lista sesiunilor eșuate este vidă!
-sm.afterCrash.msg10=Gestionarul de sesiuni nu a găsit nicio sesiune de restaurat.
-sm.afterCrash.button0.label=Restaurează sesiunea
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Restaurează sesiunea eșuată
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Nu restaura
-sm.afterCrash.button1.accesskey=N
-sm.start.title=Gestionar de sesiuni - Restaurare sesiune
-sm.start.chkbox.label=Activează recuperarea sesiunilor eșuate
-sm.start.msg0=Sesiunea de pornire este vidă!
-sm.start.msg1=Recuperarea sesiunilor eșuate este dezactivată. Dacă activați această facilitate veți putea restaura sesiunile eșuate.
-sm.start.msg2=Eroare în timpul căutării sesiunii de pornire, această sesiune nu există.
-sm.restoreError.msg0=Eroare în fișierul Gestionarului de sesiuni!
-sm.restoreError.msg1=Ștergeți sesiunea pe care încercați să o restaurați
-sm.disable.msg=Firefox are o facilitate internă de restaurare a sesiunilor.
-sm.disable.msg1=Doriți să activați facilitatea internă de restaurare a sesiunilor și să dezactivați gestionarul de sesiuni al Tab Mix Plus?
-sm.disable.msg2=Doriți să activați gestionarul de sesiuni al Tab Mix Plus și să dezactivați facilitatea internă de restaurare a sesiunilor?
-sm.tabview.hiddengroups=Mai multe file s-au restaurat într-un grup ascuns.
-sm.tabview.hiddengroups.removed=Grupurile de file ascunse a fost eliminat.
-sm.tabview.removed=Caracteristica „Grupuri de file” (Panorama) a fost eliminată din Firefox.
-sm.tabview.removed.learnMore.label=Aflați mai mult
-sm.tabview.removed.learnMore.accesskey=f
-sm.tabview.install.label=Instalează extensia „Grupuri de file”
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Sesiune istoric, se arhivează cu datele grupurilor
-sm.tabview.backup.crashed=Sesiune eșuată, se arhivează cu datele grupurilor
-sm.tabview.backup.msg=Gestionarul de sesiuni al Tab Mix Plus a salvat o copie de rezervă a sesiuni dvs.
-sm.bookmarks.historySession=Sesiune istoric
-sm.bookmarks.closedWindow=Fereastră închisă
-sm.bookmarks.sessionFolder=Sesiuni Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Fereastra %S
diff --git a/addon/chrome/locale/ro/tabmix.dtd b/addon/chrome/locale/ro/tabmix.dtd
index fa49adc48..70fbf2390 100644
--- a/addon/chrome/locale/ro/tabmix.dtd
+++ b/addon/chrome/locale/ro/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Șterge din listă">
 <!ENTITY deletelist.accesskey "t">
 <!ENTITY settings.label "Configurație">
-<!ENTITY saveWindow.label "Salvează această fereastră">
-<!ENTITY saveAllWindows.label "Salvează toate ferestrele">
 <!ENTITY sm.context.overwrite "Restaurează suprascriind fereastra existentă">
 <!ENTITY sm.context.overwrite.key "s">
 <!ENTITY sm.context.restore.new "Restaurează într-o fereastră nouă">
diff --git a/addon/chrome/locale/ru-RU/misc.dtd b/addon/chrome/locale/ru-RU/misc.dtd
index 4225cfe8f..0f9b072b4 100644
--- a/addon/chrome/locale/ru-RU/misc.dtd
+++ b/addon/chrome/locale/ru-RU/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Выберите время из списка или введите собственное">
 <!ENTITY specifyreload.label "Определение времени обновления">
-<!ENTITY sanitizer.entry "Журнал Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "у">
-<!ENTITY sanitizer.entry.confirm "Вы уверены, что хотите удалить ВСЕ сохранённые сессии, включая резервные копии?">
diff --git a/addon/chrome/locale/ru-RU/pref-tabmix.dtd b/addon/chrome/locale/ru-RU/pref-tabmix.dtd
index fa0ac1f62..b297d3645 100644
--- a/addon/chrome/locale/ru-RU/pref-tabmix.dtd
+++ b/addon/chrome/locale/ru-RU/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Показывать пустую страницу">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Использовать встроенную функцию восстановления сессий">
-<!ENTITY ss.enable.tooltip "Уберите галочку, чтобы использовать менеджер сессий Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Расширенные настройки">
 <!ENTITY ss.advanced_setting.warning "Не изменяйте эти параметры, если Вы не знаете, что делаете">
 <!ENTITY ss.interval "Минимальный интервал между сохранениями сессий">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Все сайты">
 <!ENTITY ss.privacy_level.unencrypted "Только незашифрованные сайты">
 <!ENTITY ss.privacy_level.nosites "Ни для каких сайтов">
-<!ENTITY sessionManger.enable "Включить менеджер сессий">
 <!ENTITY crashRecovery.enable "Включить защиту от вылетов">
-<!ENTITY sm.StartExit "Запуск/Выход">
-<!ENTITY sm.restore "Восстановление">
-<!ENTITY sm.preserve "Сохранение">
 <!ENTITY sm.start "При запуске браузера:">
-<!ENTITY sm.start.restore "Восстанавливать сессию">
-<!ENTITY sm.start.ask "Запрос на восстановление">
-<!ENTITY sm.start.nothing "Не восстанавливать сессию">
-<!ENTITY sm.exit "При выходе из браузера:">
-<!ENTITY sm.exit.save "Сохранять сессию">
-<!ENTITY sm.exit.ask "Запрос на сохранение">
-<!ENTITY sm.exit.nothing "Не сохранять сессию">
-<!ENTITY sm.startup "При запуске браузера открывать:">
-<!ENTITY sm.lastsession "Последнюю сессию">
-<!ENTITY sm.previouslast "Сессию, предшествующую последней">
-<!ENTITY sm.chooseifempty "Другую, если выбранная сессия пуста">
-<!ENTITY sm.restore.options "При восстановлении сессий:">
-<!ENTITY sm.restore.overwrite "Заменять существующие окна">
-<!ENTITY sm.restore.overwriteTabs "... и вкладки">
-<!ENTITY sm.restore.closedWinList "Сохранять окна в списке закрытых">
-<!ENTITY sm.restore.merge "Объединять несколько окон в одно">
-<!ENTITY sm.restore.bypassCache "Игнорировать кэш при восстановлении">
-<!ENTITY sm.notrestore.label "Когда не восстанавливается при старте">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Сохранять следующие параметры вкладок:">
 <!ENTITY sm.preserve.history "Журнал">
 <!ENTITY sm.preserve.protect "Статус защиты">
 <!ENTITY sm.preserve.locked "Статус блокировки">
 <!ENTITY sm.preserve.permission "Разрешения">
 <!ENTITY sm.preserve.scroll1 "Позиция прокрутки">
-<!ENTITY sm.restore.winOptions "Сохранять следующие параметры окон:">
-<!ENTITY sm.restore.selectedTab "Активная вкладка">
-<!ENTITY sm.restore.closedTabs "Список закрытых вкладок">
 <!ENTITY incompatible.extensions "Некоторые из ваших расширений не совместимы с Tab Mix Plus. Рекомендуется отключить или удалить эти расширения.">
 <!ENTITY incompatible.button.label "Показать список">
diff --git a/addon/chrome/locale/ru-RU/session-manager.properties b/addon/chrome/locale/ru-RU/session-manager.properties
deleted file mode 100644
index 723a1a487..000000000
--- a/addon/chrome/locale/ru-RU/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Сохранить список закрытых вкладок данной сессии
-sm.button.continue.label=Продолжить
-sm.button.continue.accesskey=П
-sm.askBeforeSave.title=Менеджер сессий — сохранение
-sm.askBeforeSave.msg0=Желаете сохранить сессию?
-sm.askBeforeSave.msg2=На диск будут сохранены только неприватные окна
-sm.askBeforeSave.msg1=Если сессию не сохранить, при следующем запуске браузера \'\'Последняя сессия\'\' будет пустой.
-sm.askBeforeSave.button0.label=Сохранить сессию
-sm.askBeforeSave.button0.accesskey=С
-sm.askBeforeSave.button1.label=Не сохранять
-sm.askBeforeSave.button1.accesskey=Н
-sm.corrupted.title=Менеджер сессий — база данных повреждена
-sm.corrupted.msg0=Менеджер сессий не может загрузить базу данных из повреждённого файла session.rdf.
-sm.corrupted.msg1=Файл session.rdf будет удалён, копия с именем session.old находится в папке вашего профиля.
-sm.areYouSure.msg=Вы действительно желаете продолжить?
-sm.canChooseStartup.msg=Вы можете выбрать стартовую сессию из списка:
-sm.addtoStartup.title=Менеджер сессий — добавить в список стартовых
-sm.addtoStartup.msg.windows=Вы собираетесь добавить окно в стартовую сессию:
-sm.addtoStartup.msg.tabs=Вы собираетесь добавить вкладки в стартовую сессию:
-sm.addtoStartup.button0.label=Добавить в сессию
-sm.addtoStartup.button0.accesskey=Д
-sm.addtoStartup.button1.label=Не добавлять
-sm.addtoStartup.button1.accesskey=Н
-sm.replaceStartup.title=Менеджер сессий — перезапись стартовой сессии
-sm.replaceStartup.msg=Вы собираетесь заменить стартовую сессию:
-sm.replaceStartup.button0.label=Заменить сессию
-sm.replaceStartup.button0.accesskey=З
-sm.replaceStartup.button1.label=Не заменять
-sm.replaceStartup.button1.accesskey=Н
-sm.removeStartup.title=Менеджер сессий — удаление стартовой сессии
-sm.removeStartup.msg0=Вы собираетесь удалить стартовую сессию:
-sm.removeStartup.msg1=Выберите из списка сессию, которую желаете сделать стартовой:
-sm.removeStartup.button0.label=Удалить
-sm.removeStartup.button0.accesskey=У
-sm.removeStartup.button1.label=Не удалять
-sm.removeStartup.button1.accesskey=Н
-sm.title=Менеджер сессий
-sm.dontSaveBlank.msg=Менеджер сессий не сохраняет пустые окна
-sm.sessionSave.error=Ошибка менеджера сессий — данная сессия не сохранена
-sm.sessionName.title.rename=Менеджер сессий — переименование сессии
-sm.sessionName.title.saveprevious=Менеджер сессий — сохранение сессии
-sm.sessionName.title.savethiswindow=Менеджер сессий — сохранение текущего окна
-sm.sessionName.title.saveallwindows=Менеджер сессий — сохранение всех окон
-sm.sessionName.msg0=Введите имя сессии:
-sm.sessionName.msg1=Имя должно состоять, по крайней мере, из одной буквы или цифры.
-sm.sessionName.msg2=Это имя уже используется!
-sm.sessionName.msg3=Вы действительно желаете заменить сессию?
-sm.sessionName.button0.label=Переименовать сессию
-sm.sessionName.button0.accesskey=П
-sm.sessionName.button1.label=Не переименовывать
-sm.sessionName.button1.accesskey=Н
-sm.session.empty=пусто
-sm.session.tabs=В
-sm.session.windows=О
-sm.removeAll.title.session=Менеджер сессий — удаление всех сохранённых сессий
-sm.removeAll.title.closedwindow=Менеджер сессий — удаление всех закрытых окон
-sm.removeAll.msg0=Вы действительно желаете удалить все сохранённые сессии?
-sm.removeAll.msg1=При выборе \'\'Удалить\'\' стартовая сессия преобразуется в \'\'Последнюю сессию\'\'.
-sm.removeAll.msg2=Вы действительно желаете удалить все закрытые окна?
-sm.sessionMenu.last=Последняя сессия
-sm.sessionMenu.lastDefault=Последняя сессия — по умолчанию
-sm.sessionMenu.lastgood=Последняя корректная сессия
-sm.sessionMenu.previous=Предшествующая последней
-sm.sessionMenu.crashed=Повреждённая сессия
-sm.afterCrash.title=Менеджер сессий — восстановление после краха
-sm.afterCrash.chkbox.label=Включить менеджер сессий
-sm.afterCrash.msg0=Последняя сессия потерпела крах!
-sm.afterCrash.msg0.again=При работе с вашей последней сессией снова произошла ошибка!
-sm.afterCrash.msg1=Выберите из списка сессию для восстановления:
-sm.afterCrash.msg2=Выберите способ продолжения
-sm.afterCrash.msg3=Менеджер сессий сейчас заблокирован. Включив его, вы сможете из меню восстанавливать повреждённые, закрытые и сохранённые сессии, а также закрытые окна.
-sm.afterCrash.msg4=Также повреждённую сессию можно восстановить позже из меню менеджера сессий.
-sm.afterCrash.msg5=но ничего не сохранено.
-sm.afterCrash.msg6=но нет никаких открытых окон в повреждённой сессии
-sm.afterCrash.msg7=Из списка закрытых окон выберите окно для восстановления
-sm.afterCrash.msg8=(также можно восстановить закрытые окна позже, из меню закрытых окон)
-sm.afterCrash.msg9=Повреждённая сессия пуста!
-sm.afterCrash.msg10=Менеджер сессий не нашёл сессий для восстановления.
-sm.afterCrash.button0.label=Восстановить сессию
-sm.afterCrash.button0.accesskey=В
-sm.afterCrash.button0.crashed.label=Восстановить повреждённую сессию
-sm.afterCrash.button0.crashed.accesskey=п
-sm.afterCrash.button1.label=Не восстанавливать
-sm.afterCrash.button1.accesskey=Н
-sm.start.title=Менеджер сессий - восстановление сессии
-sm.start.chkbox.label=Включить менеджер сессий
-sm.start.msg0=Стартовая сессия пуста!
-sm.start.msg1=Восстановление после краха сейчас заблокировано. Включив его, вы сможете восстанавливать повреждённые сессии.
-sm.start.msg2=Ошибка поиска стартовой сессии. Не существует сохранённой стартовой сессии.
-sm.restoreError.msg0=Ошибка в файле менеджера сессий!
-sm.restoreError.msg1=Удалить сессию, которую вы пытались восстановить
-sm.disable.msg=Firefox имеет встроенную функцию восстановления сессий.
-sm.disable.msg1=Вы хотите использовать встроенную функцию восстановления сессий и отключить менеджер сессий Tab Mix Plus?
-sm.disable.msg2=Вы хотите использовать менеджер сессий Tab Mix Plus и отключить встроенную функцию восстановления сессий?
-sm.tabview.hiddengroups=Больше вкладок восстановлено в скрытых группах.
-sm.tabview.hiddengroups.removed=Группы скрытых вкладок были удалены.
-sm.tabview.removed=Функция групп вкладок (Panorama) была удалена из Firefox.
-sm.tabview.removed.learnMore.label=Узнать больше
-sm.tabview.removed.learnMore.accesskey=з
-sm.tabview.install.label=Установить расширение Tab Groups
-sm.tabview.install.accesskey=У
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Менеджер сессий Tab Mix Plus сохранил резервную копию вашей сессии.
-sm.bookmarks.historySession=История сессий
-sm.bookmarks.closedWindow=Закрытое окно
-sm.bookmarks.sessionFolder=Сессии Tab Mix Plus
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Окно %S
diff --git a/addon/chrome/locale/ru-RU/tabmix.dtd b/addon/chrome/locale/ru-RU/tabmix.dtd
index 6afef7c61..2bfb8e0fa 100644
--- a/addon/chrome/locale/ru-RU/tabmix.dtd
+++ b/addon/chrome/locale/ru-RU/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Удалить из списка">
 <!ENTITY deletelist.accesskey "У">
 <!ENTITY settings.label "Настройки">
-<!ENTITY saveWindow.label "Сохранить данное окно">
-<!ENTITY saveAllWindows.label "Сохранить все окна">
 <!ENTITY sm.context.overwrite "Восстановить с заменой существующих окон">
 <!ENTITY sm.context.overwrite.key "з">
 <!ENTITY sm.context.restore.new "Восстановить в новые окна">
diff --git a/addon/chrome/locale/sk-SK/misc.dtd b/addon/chrome/locale/sk-SK/misc.dtd
index 7f32fd2a0..ebd598582 100644
--- a/addon/chrome/locale/sk-SK/misc.dtd
+++ b/addon/chrome/locale/sk-SK/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Vybrať čas zo zoznamu alebo použiť vlastný">
 <!ENTITY specifyreload.label "Určiť čas znovunačítania">
-<!ENTITY sanitizer.entry "História Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Ste si istý, že chcete vymazať VŠETKY vaše uložené údaje relácií vrátane záloh?">
diff --git a/addon/chrome/locale/sk-SK/pref-tabmix.dtd b/addon/chrome/locale/sk-SK/pref-tabmix.dtd
index 9d2c278cd..843a04d0c 100644
--- a/addon/chrome/locale/sk-SK/pref-tabmix.dtd
+++ b/addon/chrome/locale/sk-SK/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Zobraziť domovskú stránku">
 <!ENTITY startupBlankPage.label "Zobraziť prázdnu stránku">
 <!ENTITY startupLastSession1.label "Ukázať okná a karty z poslednej doby">
-<!ENTITY ss.enable.label "Použiť zabudovanú obnovu relácie">
-<!ENTITY ss.enable.tooltip "Odznačiť pre použitie s Tabmix Manažér relácie">
 <!ENTITY ss.advanced_setting "Pokročilé nastavenia">
 <!ENTITY ss.advanced_setting.warning "Nemeniť, len ak viete, čo robíte">
 <!ENTITY ss.interval "Minimálny časový interval medzi dvoma stavmi uložený">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Všetky stránky">
 <!ENTITY ss.privacy_level.unencrypted "Len nezabezpečené stránky">
 <!ENTITY ss.privacy_level.nosites "Vôbec žiadne stránky">
-<!ENTITY sessionManger.enable "Zapnúť Manažér relácie">
 <!ENTITY crashRecovery.enable "Zapnúť Zotavenie po páde">
-<!ENTITY sm.StartExit "Štart/Zatvoriť">
-<!ENTITY sm.restore "Obnoviť">
-<!ENTITY sm.preserve "Zachovať">
 <!ENTITY sm.start "Pri spustení prehliadača:">
-<!ENTITY sm.start.restore "Obnoviť">
-<!ENTITY sm.start.ask "Opýtať sa pred obnovením">
-<!ENTITY sm.start.nothing "Neobnovovať">
-<!ENTITY sm.exit "Pri zatvorení prehliadača:">
-<!ENTITY sm.exit.save "Uložiť reláciu">
-<!ENTITY sm.exit.ask "Opýtať sa pred uložením">
-<!ENTITY sm.exit.nothing "Neukladať">
-<!ENTITY sm.startup "Začiatok relácie:">
-<!ENTITY sm.lastsession "Posledná relácia">
-<!ENTITY sm.previouslast "Predchádzajúca">
-<!ENTITY sm.chooseifempty "Vybrať inú ak nie je">
-<!ENTITY sm.restore.options "Pri obnovení relácie:">
-<!ENTITY sm.restore.overwrite "Nahradiť stávajúce okno">
-<!ENTITY sm.restore.overwriteTabs "a karty">
-<!ENTITY sm.restore.closedWinList "Uložiť okno do zoznamu zatvorených okien">
-<!ENTITY sm.restore.merge "Zlúčiť všetky okná do jedného">
-<!ENTITY sm.restore.bypassCache "Obísť vyrovnávaciu pamäť pri obnove">
-<!ENTITY sm.notrestore.label "Keď sa neobnoví pri spustení">
-<!ENTITY sm.restorePinned1.label "Obnoviť pripnuté karty z poslednej doby">
 <!ENTITY sm.preserve.options "Zachovať karty:">
 <!ENTITY sm.preserve.history "História">
 <!ENTITY sm.preserve.protect "Chrániť stav">
 <!ENTITY sm.preserve.locked "Zamknúť stav">
 <!ENTITY sm.preserve.permission "Povolenia">
 <!ENTITY sm.preserve.scroll1 "Poloha skrolovania">
-<!ENTITY sm.restore.winOptions "Zachovať okná:">
-<!ENTITY sm.restore.selectedTab "Zvolené karty">
-<!ENTITY sm.restore.closedTabs "Zoznam zatvorených kariet">
 <!ENTITY incompatible.extensions "Niektoré vaše rozšírenia sú nekompatibilné s Tab Mix Plus, odporúčame ich zakázať alebo odinštalovať.">
 <!ENTITY incompatible.button.label "Zobraziť zoznam">
diff --git a/addon/chrome/locale/sk-SK/session-manager.properties b/addon/chrome/locale/sk-SK/session-manager.properties
deleted file mode 100644
index 1d1ec0d48..000000000
--- a/addon/chrome/locale/sk-SK/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Uložiť zoznam zatvorených kariet s touto reláciou
-sm.button.continue.label=Pokračovať
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Manažér relácií - uložiť reláciu
-sm.askBeforeSave.msg0=Prajete si uložiť vašu reláciu?
-sm.askBeforeSave.msg2=Na disk budú uložené iba nie-súkromné ​​okná
-sm.askBeforeSave.msg1=Ak ju neuložíte, pri ďalšom spustení prehliadača bude \'Posledná relácia\' prázdna.
-sm.askBeforeSave.button0.label=Uložiť reláciu
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Neukladať
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=Manažér relácií - chybná databáza
-sm.corrupted.msg0=Manažér relácií nemôže načítať databázu z chybného session.rdf.
-sm.corrupted.msg1=Súbor session.rdf bude zmazaný, kópiu môžete nájsť v session.old vo svojom profile.
-sm.areYouSure.msg=Ste si istý, že chcete pokračovať?
-sm.canChooseStartup.msg=Môžete vybrať reláciu, ktorá má byť vašou novou Spúšťacou reláciou zo zoznamu:
-sm.addtoStartup.title=Manažér relácií - pridať do Spúšťacia relácia
-sm.addtoStartup.msg.windows=Chystáte sa pridať okno(á) do spúšťacej relácie:
-sm.addtoStartup.msg.tabs=Chystáte sa pridať kartu(y) do spúšťacej relácie:
-sm.addtoStartup.button0.label=Pridať do relácie
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Nepridávať
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=Manažér relácií - zrušiť Spúšťaciu reláciu
-sm.replaceStartup.msg=Chystáte sa nahradiť vašu spúšťaciu reláciu:
-sm.replaceStartup.button0.label=Nahradiť reláciu
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=Nenahradzovať
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=Manažér relácií - zmazať Spúšťaciu reláciu
-sm.removeStartup.msg0=Chystáte sa zmazať vašu spúšťaciu reláciu:
-sm.removeStartup.msg1=Môžete vybrať reláciu, ktorá má byť vašou novou Spúšťacou reláciou zo zoznamu:
-sm.removeStartup.button0.label=Zmazať
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=Nezmazať
-sm.removeStartup.button1.accesskey=T
-sm.title=Manažér relácií
-sm.dontSaveBlank.msg=Manažér relácií neukladá prázdne okno
-sm.sessionSave.error=Chyba, relácia nebola uložená
-sm.sessionName.title.rename=Manažér relácií - premenovať reláciu
-sm.sessionName.title.saveprevious=Manažér relácií - uložiť reláciu
-sm.sessionName.title.savethiswindow=Manažér relácií - uložiť toto okno
-sm.sessionName.title.saveallwindows=Manažér relácií - uložiť všetky okná
-sm.sessionName.msg0=Vložiť názov relácie:
-sm.sessionName.msg1=Názov musí obsahovať najmenej jedno písmeno alebo číslo.
-sm.sessionName.msg2=Tento názov sa už používa!
-sm.sessionName.msg3=Ste si istý, že chcete nahradiť reláciu?
-sm.sessionName.button0.label=Premenovať reláciu
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Nepremenovať
-sm.sessionName.button1.accesskey=D
-sm.session.empty=prázdny
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Manažér relácií - zmazať všetky uložené relácie
-sm.removeAll.title.closedwindow=Manažér relácií - zmazať všetky zatvorené okná
-sm.removeAll.msg0=Ste si istý, že chcete zmazať všetky uložené relácie?
-sm.removeAll.msg1=Ak vyberiete \'Zmazať\' vaša Spúšťacia relácia bude \'Posledná relácia\'.
-sm.removeAll.msg2=Ste si istý, že chcete zmazať všetky uložené okná?
-sm.sessionMenu.last=Posledná relácia
-sm.sessionMenu.lastDefault=Posledná relácia - Pôvodná
-sm.sessionMenu.lastgood=Posledná známa relácia
-sm.sessionMenu.previous=Predchádzajúca
-sm.sessionMenu.crashed=Zlyhané relácie
-sm.afterCrash.title=Manažér relácií - Obnoviť po páde
-sm.afterCrash.chkbox.label=Zapnúť Manažér relácií
-sm.afterCrash.msg0=Vaša posledná relácia zlyhala!
-sm.afterCrash.msg0.again=Vaša posledná zlyhaná relácia zlyhala znova!
-sm.afterCrash.msg1=Vybrať reláciu pre obnovenie zo zoznamu:
-sm.afterCrash.msg2=Vybrať ako pokračovať
-sm.afterCrash.msg3=Manažér relácií je momentálne vypnutý, ak zapnete Manažér relácií, budete môcť obnoviť zlyhané relácie, zatvorené relácie, uložené relácie a zatvorené okná z ponuky Manažér relácií.
-sm.afterCrash.msg4=Môžete tiež obnoviť zlyhanú reláciu neskôr, z ponuky Manažér relácií.
-sm.afterCrash.msg5=ale nebolo nič uložené.
-sm.afterCrash.msg6=ale nie sú otvorené žiadne okná v Zlyhané relácie
-sm.afterCrash.msg7=Vybrať okno na obnovenie zo zoznamu Zatvorené okná
-sm.afterCrash.msg8=(tiež môžete obnoviť zatvorené okná neskôr z ponuky Zatvorené okná)
-sm.afterCrash.msg9=Priečinok Zlyhané relácie je prázdny!
-sm.afterCrash.msg10=Manažér relácií nenašiel žiadnu relácie pre obnovenie.
-sm.afterCrash.button0.label=Obnoviť reláciu
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Obnoviť zlyhanú reláciu
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Neobnovovať
-sm.afterCrash.button1.accesskey=D
-sm.start.title=Manažér relácií - Obnoviť reláciu
-sm.start.chkbox.label=Zapnúť Manažér relácií
-sm.start.msg0=Priečinok Spúšťacia relácia je prázdny!
-sm.start.msg1=Obnovenie je momentálne vypnuté, ak zapnete Obnovenie, budete môcť obnoviť zlyhané relácie.
-sm.start.msg2=Chyba pri hľadaní Spúšťacej relácie, uložená Spúšťacia relácia neexistuje..
-sm.restoreError.msg0=Chyba v súbore Manažér relácií!
-sm.restoreError.msg1=Zmazať reláciu, ktorú ste pokúsili obnoviť
-sm.disable.msg=Firefox má zabudovanú obnovu relácie.
-sm.disable.msg1=Prajete si zapnúť zabudovanú obnovu relácie a vypnúť TabMix Manažér relácie?
-sm.disable.msg2=Prajete si zapnúť TabMix Manažér relácie a vypnúť zabudovanú obnovu relácie?
-sm.tabview.hiddengroups=Ďalšie záložky obnovené do skrytých skupín.
-sm.tabview.hiddengroups.removed=Skryté karty skupiny boli odstránené.
-sm.tabview.removed=Funkcia Karta skupín (Panorama) bola odstránená z Firefoxu.
-sm.tabview.removed.learnMore.label=Získať viac
-sm.tabview.removed.learnMore.accesskey=Z
-sm.tabview.install.label=Inštalovať rozšírenie Karta skupín
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=História relácií, zálohovanie dát so skupinami
-sm.tabview.backup.crashed=Zlyhané relácie, zálohovanie dát so skupinami
-sm.tabview.backup.msg=Manažér relácií Tab Mix plus uložil zálohu relácie.
-sm.bookmarks.historySession=História relácií
-sm.bookmarks.closedWindow=Zatvorené okná
-sm.bookmarks.sessionFolder=Tab Mix Plus relácie
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Okno %S
diff --git a/addon/chrome/locale/sk-SK/tabmix.dtd b/addon/chrome/locale/sk-SK/tabmix.dtd
index f2c9f5b79..7176af190 100644
--- a/addon/chrome/locale/sk-SK/tabmix.dtd
+++ b/addon/chrome/locale/sk-SK/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Zmazať zo zoznamu">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "Nastavenia">
-<!ENTITY saveWindow.label "Uložiť toto okno">
-<!ENTITY saveAllWindows.label "Uložiť všetky okná">
 <!ENTITY sm.context.overwrite "Obnoviť, prepísať existujúce okno(á)">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Obnoviť do nového okna(okien)">
diff --git a/addon/chrome/locale/sr/misc.dtd b/addon/chrome/locale/sr/misc.dtd
index 7b865e8f2..8869adad4 100644
--- a/addon/chrome/locale/sr/misc.dtd
+++ b/addon/chrome/locale/sr/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Изаберите време са списка или упишите своје време ---">
 <!ENTITY specifyreload.label "Унесите време поновног учитавања">
-<!ENTITY sanitizer.entry "Сачуване сесије Tab Mix Plus-а">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Желите ли да избришете СВЕ сачуване сесије, укључујући резервне копије?">
diff --git a/addon/chrome/locale/sr/pref-tabmix.dtd b/addon/chrome/locale/sr/pref-tabmix.dtd
index 16a6d6543..29c65ef09 100644
--- a/addon/chrome/locale/sr/pref-tabmix.dtd
+++ b/addon/chrome/locale/sr/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Прикажи празну страницу">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Користи Фајерфоксову уграђену могућност обнављања сесија">
-<!ENTITY ss.enable.tooltip "Одштиклирајте да бисте омогућили употребу са Tab Mix Plus управљачем сесија">
 <!ENTITY ss.advanced_setting "Напредна подешавања">
 <!ENTITY ss.advanced_setting.warning "Немојте да мењате ова подешавања, уколико нисте сигурни шта радите">
 <!ENTITY ss.interval "Најмањи временски интервал између чувања два стања">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Све сајтове">
 <!ENTITY ss.privacy_level.unencrypted "Само нешифрованe сајтовe">
 <!ENTITY ss.privacy_level.nosites "Ниједан сајт">
-<!ENTITY sessionManger.enable "Омогући управљача сесијама">
 <!ENTITY crashRecovery.enable "Омогући опоравак од грешке">
-<!ENTITY sm.StartExit "Покрени/изађи">
-<!ENTITY sm.restore "Обнови">
-<!ENTITY sm.preserve "Очувај">
 <!ENTITY sm.start "При покретању прегледача:">
-<!ENTITY sm.start.restore "Обнови сесију">
-<!ENTITY sm.start.ask "Питај пре него што обновиш">
-<!ENTITY sm.start.nothing "Не обнављај сесију">
-<!ENTITY sm.exit "При затварању прегледача:">
-<!ENTITY sm.exit.save "Сачувај сесију">
-<!ENTITY sm.exit.ask "Питај пре него што сачуваш">
-<!ENTITY sm.exit.nothing "Не чувај сесију">
-<!ENTITY sm.startup "Почетна сесија:">
-<!ENTITY sm.lastsession "Последња сесија">
-<!ENTITY sm.previouslast "Претпоследња">
-<!ENTITY sm.chooseifempty "Изабери неку другу сесију ако је празно">
-<!ENTITY sm.restore.options "При обнављању сесија:">
-<!ENTITY sm.restore.overwrite "Пиши преко постојећих прозора">
-<!ENTITY sm.restore.overwriteTabs "и картицa">
-<!ENTITY sm.restore.closedWinList "Сачувај прозоре у списку затворених прозора">
-<!ENTITY sm.restore.merge "Споји више прозора у један">
-<!ENTITY sm.restore.bypassCache "Прескочи кеш приликом враћања">
-<!ENTITY sm.notrestore.label "Када се не враћају картице при покретању">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "За картице очувај:">
 <!ENTITY sm.preserve.history "Историјат">
 <!ENTITY sm.preserve.protect "Заштићени статус">
 <!ENTITY sm.preserve.locked "Закључани статус">
 <!ENTITY sm.preserve.permission "Дозволе">
 <!ENTITY sm.preserve.scroll1 "Позиција клизача">
-<!ENTITY sm.restore.winOptions "За прозоре очувај:">
-<!ENTITY sm.restore.selectedTab "Означену картицу">
-<!ENTITY sm.restore.closedTabs "Листу затворених картица">
 <!ENTITY incompatible.extensions "Неки од ваших додатака нису компатибилни са Tab Mix Plus-ом, па је препоручљиво да их деинсталирате или онемогућите.">
 <!ENTITY incompatible.button.label "Прикажи списак">
diff --git a/addon/chrome/locale/sr/session-manager.properties b/addon/chrome/locale/sr/session-manager.properties
deleted file mode 100644
index 23a7c6ab4..000000000
--- a/addon/chrome/locale/sr/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Сачувај листу затворених картица са овом сесијом
-sm.button.continue.label=Настави
-sm.button.continue.accesskey=Н
-sm.askBeforeSave.title=Управљач сесијама - Сачувај сесију
-sm.askBeforeSave.msg0=Да ли желите да сачувате сесију?
-sm.askBeforeSave.msg2=Биће сачувани само прозори који нису приватни
-sm.askBeforeSave.msg1=Ако је не сачувате, следећи пут када покренете прегледач, „Последња сесија“ ће бити празна
-sm.askBeforeSave.button0.label=Сачувај сесију
-sm.askBeforeSave.button0.accesskey=С
-sm.askBeforeSave.button1.label=Немој да чуваш
-sm.askBeforeSave.button1.accesskey=м
-sm.corrupted.title=Управљач сесијама - Неисправна база
-sm.corrupted.msg0=Управљач сесијама не може да учита базу података из оштећене датотеке session.rdf.
-sm.corrupted.msg1=Датотека session.rdf.  ће бити избрисана, копију можете пронаћи у session.old у вашем профилу. Резервне копије се налазе у <profile>/sessionbackups
-sm.areYouSure.msg=Да ли сте сигурни да желите да наставите?
-sm.canChooseStartup.msg=Можете да изаберете из листе сесију која ће бити нова стартна сесија:
-sm.addtoStartup.title=Управљач сесијама - Додај у стартну сесију
-sm.addtoStartup.msg.windows=Желите да додате прозор(е) у стартну сесију:
-sm.addtoStartup.msg.tabs=Желите да додате картицу(е) у стартну сесију:
-sm.addtoStartup.button0.label=Додај у сесију
-sm.addtoStartup.button0.accesskey=Д
-sm.addtoStartup.button1.label=Не додај ---
-sm.addtoStartup.button1.accesskey=е
-sm.replaceStartup.title=Управљач сесијама - Пиши преко стартне сесије
-sm.replaceStartup.msg=Желите да замените стартну сесију:
-sm.replaceStartup.button0.label=Замени сесију
-sm.replaceStartup.button0.accesskey=З
-sm.replaceStartup.button1.label=Не мењај
-sm.replaceStartup.button1.accesskey=Н
-sm.removeStartup.title=Управљач сесијама - Избриши стартну сесију
-sm.removeStartup.msg0=Желите да избришете своју стартну сесију:
-sm.removeStartup.msg1=Изаберите сесију из листе која ће бити нова стартна сесија:
-sm.removeStartup.button0.label=Избриши
-sm.removeStartup.button0.accesskey=И
-sm.removeStartup.button1.label=Не бриши
-sm.removeStartup.button1.accesskey=Н
-sm.title=Управљач сесијама
-sm.dontSaveBlank.msg=Управљач сесијама не чува празне прозоре
-sm.sessionSave.error=Грешка у управљачу сесијама, сесија није сачувана
-sm.sessionName.title.rename=Управљач сесијама - Преименуј сесију
-sm.sessionName.title.saveprevious=Управљач сесијама - Сачувај сесију
-sm.sessionName.title.savethiswindow=Управљач сесијама - Сачувај овај прозор
-sm.sessionName.title.saveallwindows=Управљач сесијама - Сачувај све прозоре
-sm.sessionName.msg0=Унесите назив сесије:
-sm.sessionName.msg1=Назив мора да садржи бар једно слово или цифру.
-sm.sessionName.msg2=Овај назив је већ искоришћен!
-sm.sessionName.msg3=Да ли сте сигурни да желите да замените сесију?
-sm.sessionName.button0.label=Преименуј сесију
-sm.sessionName.button0.accesskey=П
-sm.sessionName.button1.label=Немој да преименујеш
-sm.sessionName.button1.accesskey=Н
-sm.session.empty=празно
-sm.session.tabs=К
-sm.session.windows=П
-sm.removeAll.title.session=Управљач сесијама - Избриши све сачуване сесије
-sm.removeAll.title.closedwindow=Управљач сесијама - Избриши све затворене прозоре
-sm.removeAll.msg0=Да ли сте сигурни да желите да избришете све сачуване сесије?
-sm.removeAll.msg1=Ако изаберете „Избриши“, за стартну сесију ће бити постављена „Последња сесија“
-sm.removeAll.msg2=Да ли сте сигурни да желите да избришете све затворене прозоре?
-sm.sessionMenu.last=Последња сесија
-sm.sessionMenu.lastDefault=Последња сесија - Подразумевано
-sm.sessionMenu.lastgood=Последња исправна сесија
-sm.sessionMenu.previous=Претпоследња
-sm.sessionMenu.crashed=Срушена сесија
-sm.afterCrash.title=Управљач сесијама - Обнови након рушења сесије
-sm.afterCrash.chkbox.label=Омогући управљача сесијама
-sm.afterCrash.msg0=Ваша последња сесија се срушила! ---
-sm.afterCrash.msg0.again=Последња сесија која се срушила се опет срушила!
-sm.afterCrash.msg1=Изаберите сесију из листе коју желите да обновите:
-sm.afterCrash.msg2=Изаберите како желите да наставите
-sm.afterCrash.msg3=Управљач сесијама је тренутно онемогућен, ако га омогућите, моћи ћете да обновите сесије које су се срушиле, затворенеи сачуване сесије, као и затворене прозоре из менија управљача сесијама.
-sm.afterCrash.msg4=Сесију која се срушила можете обновити и касније из менија Управљач сесијама..
-sm.afterCrash.msg5=али ништа није сачувано.
-sm.afterCrash.msg6=али не постоји ниједан отворен прозор у сесији која се срушила
-sm.afterCrash.msg7=Изаберите прозор који желите да обновите из листе затворених прозора
-sm.afterCrash.msg8=(затворене прозоре можете обновити и касније из менија Затворени прозори)
-sm.afterCrash.msg9=Сесија која се срушила је празна!
-sm.afterCrash.msg10=Управљач сесијама није пронашао сесију коју може да обнови. ---
-sm.afterCrash.button0.label=Обнови сесију
-sm.afterCrash.button0.accesskey=О
-sm.afterCrash.button0.crashed.label=Обнови сесију која се срушила ---
-sm.afterCrash.button0.crashed.accesskey=О
-sm.afterCrash.button1.label=Немој да обнављаш
-sm.afterCrash.button1.accesskey=Н
-sm.start.title=Управљач сесијама - Обнови сесију
-sm.start.chkbox.label=Омогући опоравак од грешке
-sm.start.msg0=Ваша стартна сесија је празна!
-sm.start.msg1=Тренутно је онемогућен опоравак од грешке, ако га омогућите, моћи ћете да обновите сесије које се сруше. ---
-sm.start.msg2=Грешка приликом тражења стартне сесије, не постоји сачувана стартна сесија.
-sm.restoreError.msg0=Грешка у датотеци управљача сесијама.
-sm.restoreError.msg1=Избриши сесију коју сте покушали да обновите ---
-sm.disable.msg=Firefox има уграђену могућност обнављања сесија.
-sm.disable.msg1=Да ли желите да омогућите уграђен систем за обнављање сесија и онемогућите TabMix управљача сесијама?
-sm.disable.msg2=Да ли желите да омогућите TabMix управљача сесијама и онемогућите уграђени систем за обнављање сесија?
-sm.tabview.hiddengroups=Више језичака враћених у скривене групе.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/sr/tabmix.dtd b/addon/chrome/locale/sr/tabmix.dtd
index 6ba580c23..2cdd9fbd4 100644
--- a/addon/chrome/locale/sr/tabmix.dtd
+++ b/addon/chrome/locale/sr/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Избриши из листе">
 <!ENTITY deletelist.accesskey "И">
 <!ENTITY settings.label "Подешавања">
-<!ENTITY saveWindow.label "Сачувај овај прозор">
-<!ENTITY saveAllWindows.label "Сачувај све прозоре">
 <!ENTITY sm.context.overwrite "Обнови, пиши преко текућег/-их прозора">
 <!ENTITY sm.context.overwrite.key "г">
 <!ENTITY sm.context.restore.new "Обнови у новом/-им прозору/-има">
diff --git a/addon/chrome/locale/sv-SE/misc.dtd b/addon/chrome/locale/sv-SE/misc.dtd
index 2df7339c4..2bee7d685 100644
--- a/addon/chrome/locale/sv-SE/misc.dtd
+++ b/addon/chrome/locale/sv-SE/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Välj tid från listan eller ange egen tid">
 <!ENTITY specifyreload.label "Ange tid mellan varje uppdatering">
-<!ENTITY sanitizer.entry "Tab Mix Plus sparade historiker">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Vill du verkligen radera ALLA dina sparade sessioner, inklusive säkerhetskopior?">
diff --git a/addon/chrome/locale/sv-SE/pref-tabmix.dtd b/addon/chrome/locale/sv-SE/pref-tabmix.dtd
index 8756c7739..7d095c1f5 100644
--- a/addon/chrome/locale/sv-SE/pref-tabmix.dtd
+++ b/addon/chrome/locale/sv-SE/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Visa startsidan">
 <!ENTITY startupBlankPage.label "Visa en tom sida">
 <!ENTITY startupLastSession1.label "Visa fönstren och flikarna från senaste gången">
-<!ENTITY ss.enable.label "Använd Firefoxs inbyggda sessionsåterställare">
-<!ENTITY ss.enable.tooltip "Avmarkera för att använda Tab Mix Plus egen sessionshanterare">
 <!ENTITY ss.advanced_setting "Avancerade inställningar">
 <!ENTITY ss.advanced_setting.warning "Ändra inte dessa om du inte vet vad du gör">
 <!ENTITY ss.interval "Min. tidsintervall mellan sparande av två sessioner">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Alla webbplatser">
 <!ENTITY ss.privacy_level.unencrypted "Endast okrypterade webbplatser">
 <!ENTITY ss.privacy_level.nosites "Inga webbplatser alls">
-<!ENTITY sessionManger.enable "Aktivera aktivitetshanteraren">
 <!ENTITY crashRecovery.enable "Aktivera återställning vid krasch">
-<!ENTITY sm.StartExit "Uppstart/Nedstängning">
-<!ENTITY sm.restore "Återställ">
-<!ENTITY sm.preserve "Behåll">
 <!ENTITY sm.start "När webbläsaren startar:">
-<!ENTITY sm.start.restore "Återställ">
-<!ENTITY sm.start.ask "Fråga innan återställning">
-<!ENTITY sm.start.nothing "Återställ inte">
-<!ENTITY sm.exit "När webbläsaren stängs:">
-<!ENTITY sm.exit.save "Spara session">
-<!ENTITY sm.exit.ask "Fråga innan sparning">
-<!ENTITY sm.exit.nothing "Spara inte">
-<!ENTITY sm.startup "Session vid uppstart:">
-<!ENTITY sm.lastsession "Senaste session">
-<!ENTITY sm.previouslast "Föregående till sista">
-<!ENTITY sm.chooseifempty "Välj en annan om den är tom">
-<!ENTITY sm.restore.options "Vid återställning av session:">
-<!ENTITY sm.restore.overwrite "Skriv över befintligt fönster">
-<!ENTITY sm.restore.overwriteTabs "och flikar">
-<!ENTITY sm.restore.closedWinList "Spara fönster i listan över stängda fönster">
-<!ENTITY sm.restore.merge "Slå ihop flera fönster till ett">
-<!ENTITY sm.restore.bypassCache "Kringgå cache vid återställning">
-<!ENTITY sm.notrestore.label "När ingen återställning görs vid start">
-<!ENTITY sm.restorePinned1.label "Återställ fastnålade flikar från senaste gången">
 <!ENTITY sm.preserve.options "Behåll flikar:">
 <!ENTITY sm.preserve.history "Historik">
 <!ENTITY sm.preserve.protect "Status för skydd">
 <!ENTITY sm.preserve.locked "Status för lås">
 <!ENTITY sm.preserve.permission "Behörigheter">
 <!ENTITY sm.preserve.scroll1 "Rullposition">
-<!ENTITY sm.restore.winOptions "Behåll fönster:">
-<!ENTITY sm.restore.selectedTab "Vald flik">
-<!ENTITY sm.restore.closedTabs "Listan över stängda fönster">
 <!ENTITY incompatible.extensions "Några installerade tillägg är inte kompatibla med Tab Mix Plus och det rekommenderas att du inaktiverar eller avinstallerar dem.">
 <!ENTITY incompatible.button.label "Visa lista">
diff --git a/addon/chrome/locale/sv-SE/session-manager.properties b/addon/chrome/locale/sv-SE/session-manager.properties
deleted file mode 100644
index cdb068334..000000000
--- a/addon/chrome/locale/sv-SE/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Spara listan över stängda flikar med denna session
-sm.button.continue.label=Fortsätt
-sm.button.continue.accesskey=F
-sm.askBeforeSave.title=Sessionshanterare - Spara session
-sm.askBeforeSave.msg0=Vill du spara sessionen?
-sm.askBeforeSave.msg2=Endast icke-privata fönster sparas på hårddisken
-sm.askBeforeSave.msg1=Om du inte sparar kommer listan \'Senaste sessioner\' att vara tom.
-sm.askBeforeSave.button0.label=Spara session
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Spara inte
-sm.askBeforeSave.button1.accesskey=i
-sm.corrupted.title=Sessionshanterare - Trasig databas
-sm.corrupted.msg0=Sessionshanteraren kan inte ladda sin databas från den trasiga filen session.rdf.
-sm.corrupted.msg1=Filen session.rdf kommer att raderas och en kopia kan återfinnas i session.old i din profil. Säkerhetskopior finns i <profil>/sessionbackups
-sm.areYouSure.msg=Är du säker på att du vill fortstätta?
-sm.canChooseStartup.msg=Du kan välja en session som din nya uppstartssession från listan:
-sm.addtoStartup.title=Sessionshanterare - Lägg till i uppstartssession
-sm.addtoStartup.msg.windows=Du håller på att lägga till fönster i din uppstartssession:
-sm.addtoStartup.msg.tabs=Flik att lägga till i uppstartssession:
-sm.addtoStartup.button0.label=Lägg till i session
-sm.addtoStartup.button0.accesskey=L
-sm.addtoStartup.button1.label=Lägg inte till
-sm.addtoStartup.button1.accesskey=i
-sm.replaceStartup.title=Sessionshanterare - Åsidosätt uppstartssession
-sm.replaceStartup.msg=Du håller på att ersätta din uppstartssession:
-sm.replaceStartup.button0.label=Ersätt session
-sm.replaceStartup.button0.accesskey=E
-sm.replaceStartup.button1.label=Ersätt inte
-sm.replaceStartup.button1.accesskey=i
-sm.removeStartup.title=Sessionshanterare - Radera uppstartssession
-sm.removeStartup.msg0=Du håller på att radera din uppstartssession:
-sm.removeStartup.msg1=Välj en session som din nya uppstartssession från listan:
-sm.removeStartup.button0.label=Radera
-sm.removeStartup.button0.accesskey=R
-sm.removeStartup.button1.label=Radera inte
-sm.removeStartup.button1.accesskey=i
-sm.title=Sessionshanterare
-sm.dontSaveBlank.msg=Tomma fönster sparas ej i sessionshanteraren
-sm.sessionSave.error=Fel i sessionshanteraren, sessionen sparades inte
-sm.sessionName.title.rename=Sessionshanterare - Byt namn på session
-sm.sessionName.title.saveprevious=Sessionshanterare - Spara session
-sm.sessionName.title.savethiswindow=Sessionshanterare - Spara detta fönster
-sm.sessionName.title.saveallwindows=Sessionshanterare - Spara alla fönster
-sm.sessionName.msg0=Ange sessionsnamn:
-sm.sessionName.msg1=Namnet måste vara minst en bokstav eller siffra.
-sm.sessionName.msg2=Detta namn används redan!
-sm.sessionName.msg3=Är du säker på att du vill ersätta sessionen?
-sm.sessionName.button0.label=Byt namn på session
-sm.sessionName.button0.accesskey=B
-sm.sessionName.button1.label=Byt inte namn
-sm.sessionName.button1.accesskey=i
-sm.session.empty=tom
-sm.session.tabs=T
-sm.session.windows=F
-sm.removeAll.title.session=Sessionshanterare - Radera alla sparade sessioner
-sm.removeAll.title.closedwindow=Sessionshanterare - Radera alla stängda fönster
-sm.removeAll.msg0=Är du säker på att du vill radera alla sparade sessioner?
-sm.removeAll.msg1=Om du väljer \'Radera\' kommer uppstartssessionen att bli den \'Senaste sessionen\'
-sm.removeAll.msg2=Är du säker på att du vill radera alla stängda fönster?
-sm.sessionMenu.last=Senaste session
-sm.sessionMenu.lastDefault=Senaste session - Standard
-sm.sessionMenu.lastgood=Senaste godkända session
-sm.sessionMenu.previous=Näst senaste session
-sm.sessionMenu.crashed=Kraschad session
-sm.afterCrash.title=Sessionshanterare - Återställ efter krasch
-sm.afterCrash.chkbox.label=Aktivera sessionshanterare
-sm.afterCrash.msg0=Din senaste session kraschade!
-sm.afterCrash.msg0.again=Din senaste kraschade session kraschade igen!
-sm.afterCrash.msg1=Välj session att återställa från listan:
-sm.afterCrash.msg2=Välj fortsättning
-sm.afterCrash.msg3=Sessionshanteraren är f.n. inaktiverad. Om du aktiverar den kommer du att kunna återställa kraschade sessioner, stängda sessioner och fönster från sessionshanterarens meny.
-sm.afterCrash.msg4=Du kan också återställa kraschade sessioner senare från sessionshanterarens meny.
-sm.afterCrash.msg5=men ingenting sparades.
-sm.afterCrash.msg6=men det finns inget öppet fönster i din kraschade session
-sm.afterCrash.msg7=Välj fönster att återställa från listan 'Stängda fönster'
-sm.afterCrash.msg8=(du kan också återställa fönster senare från menyn 'Stängda fönster')
-sm.afterCrash.msg9=Din kraschade session är tom!
-sm.afterCrash.msg10=Sessionshanteraren hittade ingen session att återställa.
-sm.afterCrash.button0.label=Återställ session
-sm.afterCrash.button0.accesskey=Å
-sm.afterCrash.button0.crashed.label=Återställ kraschad session
-sm.afterCrash.button0.crashed.accesskey=k
-sm.afterCrash.button1.label=Återställ inte
-sm.afterCrash.button1.accesskey=i
-sm.start.title=Sessionshanterare - Återställ session
-sm.start.chkbox.label=Aktivera sessionshanterare
-sm.start.msg0=Din uppstartssession är tom!
-sm.start.msg1=Återställning efter krasch är f.n. inaktiverad. Om du aktiverar återställning efter krasch, kan du återställa kraschade sessioner.
-sm.start.msg2=Fel uppstod när din uppstartssession skulle hittas. Din sparade uppstartssessionen finns inte.
-sm.restoreError.msg0=Fel i sessionshanterarens fil!
-sm.restoreError.msg1=Radera sessionen du försökte återställa
-sm.disable.msg=Firefox har en inbyggd funktion för att återställa sessioner.
-sm.disable.msg1=Vill du använda Firefox inbyggda sessionshanterare och inaktivera den i Tab Mix Plus?
-sm.disable.msg2=Vill du använda Tab Mix Plus sessionshanterare och inaktivera den inbyggda sessionsåterställaren?
-sm.tabview.hiddengroups=Flera flikar återställdes i dolda grupper.
-sm.tabview.hiddengroups.removed=Dolda flikgrupper togs bort.
-sm.tabview.removed=Flikgruppsfunktionen (Panorama) togs bort från Firefox.
-sm.tabview.removed.learnMore.label=Läs mer
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Installera tillägget Tab Groups
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=Historiksession, säkerhetskopia med gruppdata
-sm.tabview.backup.crashed=Kraschad session, säkerhetskopia med gruppdata
-sm.tabview.backup.msg=Tab Mix Plus sessionshanterare har sparat en säkerhetskopia av din session.
-sm.bookmarks.historySession=Historiksession
-sm.bookmarks.closedWindow=Stängt fönster
-sm.bookmarks.sessionFolder=Tab Mix Plus-sessioner
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Fönster %S
diff --git a/addon/chrome/locale/sv-SE/tabmix.dtd b/addon/chrome/locale/sv-SE/tabmix.dtd
index a9a6fa70b..d3768cb35 100644
--- a/addon/chrome/locale/sv-SE/tabmix.dtd
+++ b/addon/chrome/locale/sv-SE/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Radera från listan">
 <!ENTITY deletelist.accesskey "b">
 <!ENTITY settings.label "Inställningar">
-<!ENTITY saveWindow.label "Spara detta fönster">
-<!ENTITY saveAllWindows.label "Spara alla fönster">
 <!ENTITY sm.context.overwrite "Återställ och skriv över befintliga fönster">
 <!ENTITY sm.context.overwrite.key "Å">
 <!ENTITY sm.context.restore.new "Återställ till nya fönster">
diff --git a/addon/chrome/locale/tr/misc.dtd b/addon/chrome/locale/tr/misc.dtd
index 0060d9aca..18bd4db41 100644
--- a/addon/chrome/locale/tr/misc.dtd
+++ b/addon/chrome/locale/tr/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Listeden bir süre seçin ya da istediğiniz süreyi girin">
 <!ENTITY specifyreload.label "Tazeleme Süresi Belirle">
-<!ENTITY sanitizer.entry "Tab Mix Plus kayıtlı oturumlar">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Yedekler de dahil TÜM kayıtlı oturumları silmek istediğinize emin misiniz?">
diff --git a/addon/chrome/locale/tr/pref-tabmix.dtd b/addon/chrome/locale/tr/pref-tabmix.dtd
index fcdb8a0dd..d52f6ab04 100644
--- a/addon/chrome/locale/tr/pref-tabmix.dtd
+++ b/addon/chrome/locale/tr/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Başlangıç sayfasını göster">
 <!ENTITY startupBlankPage.label "Boş sayfa göster">
 <!ENTITY startupLastSession1.label "Son seferdeki pencere ve sekmeleri göster">
-<!ENTITY ss.enable.label "Firefox'un dahili Oturum Geri Yükleme özelliğini kullan">
-<!ENTITY ss.enable.tooltip "Tab Mix Oturum Yöneticisini kullanmak için işareti kaldırın">
 <!ENTITY ss.advanced_setting "Gelişmiş Ayarlar">
 <!ENTITY ss.advanced_setting.warning "Ne yaptığınızı bilmiyorsanız, bunları değiştirmeyin">
 <!ENTITY ss.interval "İki durum kaydı arasındaki en az süre">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Tüm sitelerde">
 <!ENTITY ss.privacy_level.unencrypted "Şifrelenmemiş sitelerde">
 <!ENTITY ss.privacy_level.nosites "Hiçbir sitede">
-<!ENTITY sessionManger.enable "Oturum Yöneticisi etkin">
 <!ENTITY crashRecovery.enable "Çökme Kurtarma etkin">
-<!ENTITY sm.StartExit "Başlatma/Kapatma">
-<!ENTITY sm.restore "Geri Yükleme">
-<!ENTITY sm.preserve "Muhafaza Etme">
 <!ENTITY sm.start "Tarayıcı başladığında:">
-<!ENTITY sm.start.restore "Geri yükle">
-<!ENTITY sm.start.ask "Geri yüklemeden önce sor">
-<!ENTITY sm.start.nothing "Geri yükleme">
-<!ENTITY sm.exit "Tarayıcı kapatıldığında:">
-<!ENTITY sm.exit.save "Oturumu kaydet">
-<!ENTITY sm.exit.ask "Kaydetmeden önce sor">
-<!ENTITY sm.exit.nothing "Kaydetme">
-<!ENTITY sm.startup "Başlangıç oturumu:">
-<!ENTITY sm.lastsession "Son oturum">
-<!ENTITY sm.previouslast "Sondan bir önceki">
-<!ENTITY sm.chooseifempty "Boşsa başka birini seç">
-<!ENTITY sm.restore.options "Oturumlar geri yüklenirken:">
-<!ENTITY sm.restore.overwrite "Geçerli pencerelerin üzerine yaz">
-<!ENTITY sm.restore.overwriteTabs "Sekmelerin de">
-<!ENTITY sm.restore.closedWinList "Pencereleri kapatılan pencereler listesine kaydet">
-<!ENTITY sm.restore.merge "Pencereleri tek pencerede birleştir">
-<!ENTITY sm.restore.bypassCache "Geri yüklerken önbelleği atla">
-<!ENTITY sm.notrestore.label "Başlangıçta geri yüklenmediğinde">
-<!ENTITY sm.restorePinned1.label "Son seferdeki sabitlenmiş sekmeleri geri yükle">
 <!ENTITY sm.preserve.options "Sekmelerde muhafaza et:">
 <!ENTITY sm.preserve.history "Geçmişi">
 <!ENTITY sm.preserve.protect "Korunma durumunu">
 <!ENTITY sm.preserve.locked "Kilit durumunu">
 <!ENTITY sm.preserve.permission "İzinleri">
 <!ENTITY sm.preserve.scroll1 "Kaydırma pozisyonunu">
-<!ENTITY sm.restore.winOptions "Pencerelerde muhafaza et:">
-<!ENTITY sm.restore.selectedTab "Seçili sekmeyi">
-<!ENTITY sm.restore.closedTabs "Kapanan sekmeler listesini">
 <!ENTITY incompatible.extensions "Eklentilerinizden bazıları Tab Mix Plus ile uyumsuz, bu eklentileri etkisizleştirmeniz ya da kaldırmanız önerilir.">
 <!ENTITY incompatible.button.label "Listeyi göster">
diff --git a/addon/chrome/locale/tr/session-manager.properties b/addon/chrome/locale/tr/session-manager.properties
deleted file mode 100644
index 564bc9c09..000000000
--- a/addon/chrome/locale/tr/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Bu oturumda kapatılan sekmeler listesini de kaydet
-sm.button.continue.label=Devam et
-sm.button.continue.accesskey=D
-sm.askBeforeSave.title=Oturum Yöneticisi - Oturumu Kaydet
-sm.askBeforeSave.msg0=Oturumunuzu kaydetmek istiyor musunuz?
-sm.askBeforeSave.msg2=Yalnızca gizli olmayan pencereler diske kaydedilecek
-sm.askBeforeSave.msg1=Kaydetmezseniz, tarayıcınızı sonraki açışınızda \'Son oturum\' boş olacaktır.
-sm.askBeforeSave.button0.label=Oturumu kaydet
-sm.askBeforeSave.button0.accesskey=K
-sm.askBeforeSave.button1.label=Kaydetme
-sm.askBeforeSave.button1.accesskey=A
-sm.corrupted.title=Oturum Yöneticisi - Bozuk Veri
-sm.corrupted.msg0=Oturum Yöneticisi bozulmuş \'session.rdf\' dosyasındaki bilgileri alamıyor.
-sm.corrupted.msg1=\'session.rdf\' dosyası silinecek, bir kopyası profilinize \'session.old\' adıyla kaydedilecek.
-sm.areYouSure.msg=Devam etmek istediğinize emin misiniz?
-sm.canChooseStartup.msg=Yeni başlangıç oturumunuz olarak, listedeki oturumlardan birisini seçebilirsiniz:
-sm.addtoStartup.title=Oturum Yöneticisi - Başlangıç Oturumuna Ekle
-sm.addtoStartup.msg.windows=Aşağıdaki pencere(leri) başlangıç oturumunuza ekleyebilirsiniz:
-sm.addtoStartup.msg.tabs=Aşağıdaki sekme(leri) başlangıç oturumunuza ekleyebilirsiniz:
-sm.addtoStartup.button0.label=Oturuma ekle
-sm.addtoStartup.button0.accesskey=E
-sm.addtoStartup.button1.label=Ekleme
-sm.addtoStartup.button1.accesskey=M
-sm.replaceStartup.title=Oturum Yöneticisi - Başlangıç Oturumunu Değiştirme
-sm.replaceStartup.msg=Başlangıç oturumunuzu aşağıdakilerden biriyle değiştirebilirsiniz:
-sm.replaceStartup.button0.label=Oturumu değiştir
-sm.replaceStartup.button0.accesskey=D
-sm.replaceStartup.button1.label=Değiştirme
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=Oturum Yöneticisi - Başlangıç Oturumunu Silme
-sm.removeStartup.msg0=Aşagıdakileri başlangıç oturumunuzdan silebilirsiniz:
-sm.removeStartup.msg1=Listedekilerden birini yeni başlangıç oturumunuz olarak seçin:
-sm.removeStartup.button0.label=Sil
-sm.removeStartup.button0.accesskey=S
-sm.removeStartup.button1.label=Silme
-sm.removeStartup.button1.accesskey=M
-sm.title=Oturum Yöneticisi
-sm.dontSaveBlank.msg=Oturum Yöneticisi boş pencereleri kaydetmez
-sm.sessionSave.error=Oturum Yöneticisinde hata, oturum kaydedilmedi
-sm.sessionName.title.rename=Oturum Yöneticisi - Oturumu Yeniden Adlandır
-sm.sessionName.title.saveprevious=Oturum Yöneticisi - Oturumu Kaydet
-sm.sessionName.title.savethiswindow=Oturum Yöneticisi - Bu Pencereyi Kaydet
-sm.sessionName.title.saveallwindows=Oturum Yöneticisi - Tüm Pencereleri Kaydet
-sm.sessionName.msg0=Oturum ismini girin:
-sm.sessionName.msg1=İsim en az bir harften veya rakamdan oluşmalıdır.
-sm.sessionName.msg2=Bu isim zaten kullanımda!
-sm.sessionName.msg3=Oturumu değiştirmek istediğinizden emin misiniz?
-sm.sessionName.button0.label=Oturumu yeniden adlandır
-sm.sessionName.button0.accesskey=Y
-sm.sessionName.button1.label=Yeniden adlandırma
-sm.sessionName.button1.accesskey=M
-sm.session.empty=boş
-sm.session.tabs=S
-sm.session.windows=P
-sm.removeAll.title.session=Oturum Yöneticisi - Kayıtlı Tüm Oturumları Sil
-sm.removeAll.title.closedwindow=Oturum Yöneticisi - Kapatılmış Tüm Pencereleri Sil
-sm.removeAll.msg0=Kayıtlı tüm oturumlarınızı silmek istediğinize emin misiniz?
-sm.removeAll.msg1=Eğer \'Sil\'i seçerseniz, başlangıç oturumunuz \'Son oturum\' olacak.
-sm.removeAll.msg2=Kapatılmış tüm pencerelerinizi silmek istediğinize emin misiniz?
-sm.sessionMenu.last=Son oturum
-sm.sessionMenu.lastDefault=Son oturum - Varsayılan
-sm.sessionMenu.lastgood=Son iyi oturum
-sm.sessionMenu.previous=Sondan bir önceki
-sm.sessionMenu.crashed=Çöken oturum
-sm.afterCrash.title=Oturum Yöneticisi - Çökmeden Sonra Geri Yükle
-sm.afterCrash.chkbox.label=Oturum Yöneticisini etkinleştir
-sm.afterCrash.msg0=Son oturumunuz çöktü!
-sm.afterCrash.msg0.again=Son çöken oturumunuz tekrar çöktü!
-sm.afterCrash.msg1=Geri yüklemek için listeden bir oturum seçin:
-sm.afterCrash.msg2=Nasıl devam edileceğini seçin
-sm.afterCrash.msg3=Oturum Yöneticisi şu anda etkisiz. Oturum Yöneticisini etkinleştirirseniz, çöken, kapattığınız ve kaydettiğiniz oturumlar ile kapatığınız pencereleri Oturum Yöneticisi menüsü aracılığıyla geri yükleyebilirsiniz.
-sm.afterCrash.msg4=Çöken oturumu daha sonra Oturum Yöneticisi menüsünden geri yükleyebilirsiniz.
-sm.afterCrash.msg5=fakat hiçbir şey kaydedilmeyecek.
-sm.afterCrash.msg6=fakat çöken oturumunuzda açık bir pencere yoktu
-sm.afterCrash.msg7=Kapatılan Pencereler listesinden geri yüklenecek pencereyi seçin
-sm.afterCrash.msg8=(kapatılan pencereleri daha sonra Kapatılan Pencereler menüsünden geri yükleyebilirsiniz)
-sm.afterCrash.msg9=Çöken oturumunuz boş!
-sm.afterCrash.msg10=Oturum Yöneticisi geri yüklenebilecek bir oturum bulamadı.
-sm.afterCrash.button0.label=Oturumu geri yükle
-sm.afterCrash.button0.accesskey=g
-sm.afterCrash.button0.crashed.label=Çöken oturumu geri yükle
-sm.afterCrash.button0.crashed.accesskey=Ç
-sm.afterCrash.button1.label=Geri yükleme
-sm.afterCrash.button1.accesskey=G
-sm.start.title=Oturum Yöneticisi - Oturumu Geri Yükle
-sm.start.chkbox.label=Çökme Kurtarmayı etkinleştir
-sm.start.msg0=Başlangıç oturmunuz boş!
-sm.start.msg1=Çökme Kurtarma şu anda etkisiz, eğer etkinleştirirseniz, çöken oturumları geri yükleyebileceksiniz.
-sm.start.msg2=Başlangıç oturumunuza göz atarken hata oluştu, başlangıç oturumuz mevcut değil.
-sm.restoreError.msg0=Oturum Yöneticisi dosyasında hata!
-sm.restoreError.msg1=Geri yüklemek istediğiniz oturumu sil
-sm.disable.msg=Firefox dahili oturum geri yükleme özelliğine sahiptir.
-sm.disable.msg1=Dahili oturum geri yükleme özelliğini etkinleştirip, Tab Mix Oturum Yöneticisi\'ni etkisizleştirmek istiyor musunuz?
-sm.disable.msg2=Tab Mix Oturum Yöneticisini etkinleştirip, dahili oturum geri yükleme özelliğini  etkisizleştirmek istiyor musunuz?
-sm.tabview.hiddengroups=Daha fazla sekme gizli gruplara geri döndü.
-sm.tabview.hiddengroups.removed=Gizli sekme grupları kalsırıldı.
-sm.tabview.removed=Sekme Grupları (Panorama) özelliği Firefox'dan kaldırıldı.
-sm.tabview.removed.learnMore.label=Daha Fazlasını Öğrenin
-sm.tabview.removed.learnMore.accesskey=D
-sm.tabview.install.label=Sekme Grupları uzantısını yükle
-sm.tabview.install.accesskey=S
-sm.tabview.backup.session=Geçmiş Oturumu, gruplarla yedekleme verileri
-sm.tabview.backup.crashed=Geçmiş Oturumu, gruplarla yedekleme verileri
-sm.tabview.backup.msg=Tab Mix Plus Oturum Yöneticisi oturumunuzu yedekledi.
-sm.bookmarks.historySession=Geçmiş Oturum
-sm.bookmarks.closedWindow=Kapatılmış Pencere
-sm.bookmarks.sessionFolder=Tab Mix Plus Oturumları
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=Pencere %S
diff --git a/addon/chrome/locale/tr/tabmix.dtd b/addon/chrome/locale/tr/tabmix.dtd
index 3e4895cd3..aea714cef 100644
--- a/addon/chrome/locale/tr/tabmix.dtd
+++ b/addon/chrome/locale/tr/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Listeden sil">
 <!ENTITY deletelist.accesskey "S">
 <!ENTITY settings.label "Ayarlar">
-<!ENTITY saveWindow.label "Bu pencereyi kaydet">
-<!ENTITY saveAllWindows.label "Tüm pencereleri kaydet">
 <!ENTITY sm.context.overwrite "Geçerli pencere(lere) geri yükle">
 <!ENTITY sm.context.overwrite.key "M">
 <!ENTITY sm.context.restore.new "Yeni pencere(lere) geri yükle">
diff --git a/addon/chrome/locale/uk-UA/misc.dtd b/addon/chrome/locale/uk-UA/misc.dtd
index 0322bcd3b..5bd58c186 100644
--- a/addon/chrome/locale/uk-UA/misc.dtd
+++ b/addon/chrome/locale/uk-UA/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Виберіть час зі списку чи введіть власний">
 <!ENTITY specifyreload.label "Визначення часу оновлення">
-<!ENTITY sanitizer.entry "Журнал Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Ви впевнені, що хочете знищити ВСІ збережені сесії, включаючи резервні копії?">
diff --git a/addon/chrome/locale/uk-UA/pref-tabmix.dtd b/addon/chrome/locale/uk-UA/pref-tabmix.dtd
index 290d0bcae..1510a9266 100644
--- a/addon/chrome/locale/uk-UA/pref-tabmix.dtd
+++ b/addon/chrome/locale/uk-UA/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Показувати порожню сторінку">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Використовувати вбудовану функцію відновлення сесій">
-<!ENTITY ss.enable.tooltip "Приберіть галочку, щоб використовувати менеджер сесій Tab Mix Plus">
 <!ENTITY ss.advanced_setting "Розширені налаштування">
 <!ENTITY ss.advanced_setting.warning "Не змінюйте ці параметри, якщо Ви не знаєте, що робите">
 <!ENTITY ss.interval "Мінімальний інтервал між збереженнями сесій">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Всі сайти">
 <!ENTITY ss.privacy_level.unencrypted "Тільки незашифровані сайти">
 <!ENTITY ss.privacy_level.nosites "Ні для яких сайтів">
-<!ENTITY sessionManger.enable "Включити менеджер сесій">
 <!ENTITY crashRecovery.enable "Включити захист від вильотів">
-<!ENTITY sm.StartExit "Запуск/Вихід">
-<!ENTITY sm.restore "Відновлення">
-<!ENTITY sm.preserve "Збереження">
 <!ENTITY sm.start "При запуску браузера:">
-<!ENTITY sm.start.restore "Відновлювати сесію">
-<!ENTITY sm.start.ask "Запит на відновлення">
-<!ENTITY sm.start.nothing "Не відновлювати сесію">
-<!ENTITY sm.exit "При виході з браузера:">
-<!ENTITY sm.exit.save "Зберігати сесію">
-<!ENTITY sm.exit.ask "Запит на збереження">
-<!ENTITY sm.exit.nothing "Не зберігати сесію">
-<!ENTITY sm.startup "При запуску браузера відкривати:">
-<!ENTITY sm.lastsession "Останню сесію">
-<!ENTITY sm.previouslast "Попередню сесію">
-<!ENTITY sm.chooseifempty "Іншу, якщо вибрана сесія порожня">
-<!ENTITY sm.restore.options "При відновленні сесій:">
-<!ENTITY sm.restore.overwrite "Замінювати існуючі вікна">
-<!ENTITY sm.restore.overwriteTabs "... і вкладки">
-<!ENTITY sm.restore.closedWinList "Зберігати вікна в списку закритих">
-<!ENTITY sm.restore.merge "Об&apos;єднувати декілька вікон в одне">
-<!ENTITY sm.restore.bypassCache "Не використовувати кеш під час відновлення">
-<!ENTITY sm.notrestore.label "Не відновлюючи під час старту">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Зберігати наступні параметри вкладок:">
 <!ENTITY sm.preserve.history "Журнал">
 <!ENTITY sm.preserve.protect "Статус захисту">
 <!ENTITY sm.preserve.locked "Статус блокування">
 <!ENTITY sm.preserve.permission "Дозволи">
 <!ENTITY sm.preserve.scroll1 "Позиція Прокрутки">
-<!ENTITY sm.restore.winOptions "Зберігати наступні параметри вікон:">
-<!ENTITY sm.restore.selectedTab "Активна вкладка">
-<!ENTITY sm.restore.closedTabs "Список закритих вкладок">
 <!ENTITY incompatible.extensions "Деякі з ваших додатків не сумісні з Tab Mix Plus. Рекомендується відключити або видалити ці додатки.">
 <!ENTITY incompatible.button.label "Показати список">
diff --git a/addon/chrome/locale/uk-UA/session-manager.properties b/addon/chrome/locale/uk-UA/session-manager.properties
deleted file mode 100644
index ff7bfdd0f..000000000
--- a/addon/chrome/locale/uk-UA/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Зберегти список закритих вкладок даної сесії
-sm.button.continue.label=Продовжити
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=Менеджер сесій — збереження
-sm.askBeforeSave.msg0=Бажаєте зберегти сесію?
-sm.askBeforeSave.msg2=Лише не потайливі вікна будуть збережені
-sm.askBeforeSave.msg1=Якщо сесію не зберегти, при наступному запуску браузера \'Остання сесія\' буде порожньою.
-sm.askBeforeSave.button0.label=Зберегти сесію
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=Не зберігати
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=Менеджер сесій — база даних пошкоджена
-sm.corrupted.msg0=Менеджер сесій не може завантажити базу даних з ушкодженого файлу session.rdf.
-sm.corrupted.msg1=Файл session.rdf буде видалений, копія з іменем session.old знаходиться в папці вашого профілю.
-sm.areYouSure.msg=Ви дійсно бажаєте продовжити?
-sm.canChooseStartup.msg=Ви можете вибрати стартову сесію зі списку:
-sm.addtoStartup.title=Менеджер сесій — додати в список стартових
-sm.addtoStartup.msg.windows=Ви збираєтеся додати вікно в стартову сесію:
-sm.addtoStartup.msg.tabs=Ви збираєтеся додати вкладки в стартову сесію:
-sm.addtoStartup.button0.label=Додати в сесію
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=Не додавати
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=Менеджер сесій — перезапис стартової сесії
-sm.replaceStartup.msg=Ви збираєтеся замінити стартову сесію:
-sm.replaceStartup.button0.label=Замінити сесію
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=Не заміняти
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=Менеджер сесій — видалення стартової сесії
-sm.removeStartup.msg0=Ви збираєтеся видалити стартову сесію:
-sm.removeStartup.msg1=Виберіть зі списку сесію, яку бажаєте зробити стартовою:
-sm.removeStartup.button0.label=Видалити
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=Не видаляти
-sm.removeStartup.button1.accesskey=T
-sm.title=Менеджер сесій
-sm.dontSaveBlank.msg=Менеджер сесій не зберігає пусті вікна
-sm.sessionSave.error=Помилка менеджера сесій — дана сесія не збережена
-sm.sessionName.title.rename=Менеджер сесій — перейменування сесії
-sm.sessionName.title.saveprevious=Менеджер сесій — збереження сесії
-sm.sessionName.title.savethiswindow=Менеджер сесій — збереження поточного вікна
-sm.sessionName.title.saveallwindows=Менеджер сессий — збереження всіх вікон
-sm.sessionName.msg0=Введіть ім\'я сесії:
-sm.sessionName.msg1=Ім\'я повинне складатися, принаймні , з однієї букви або цифри.
-sm.sessionName.msg2=Це ім\'я вже використовується!
-sm.sessionName.msg3=Ви дійсно бажаєте замінити сесію?
-sm.sessionName.button0.label=Перейменувати сесію
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=Не перейменовувати
-sm.sessionName.button1.accesskey=D
-sm.session.empty=порожньо
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Менеджер сесій — видалення всіх збережених сесій
-sm.removeAll.title.closedwindow=Менеджер сесій — видалення всіх закритих вікон
-sm.removeAll.msg0=Ви дійсно бажаєте видалити всі збережені сесії?
-sm.removeAll.msg1=При виборі \'Видалити\' стартова сесія перетвориться в \'Останню сесію\'.
-sm.removeAll.msg2=Ви дійсно бажаєте видалити всі закриті вікна?
-sm.sessionMenu.last=Остання сесія
-sm.sessionMenu.lastDefault=Остання сесія — за замовчуванням
-sm.sessionMenu.lastgood=Остання коректна сесія
-sm.sessionMenu.previous=Попередня
-sm.sessionMenu.crashed=Пошкоджена сесія
-sm.afterCrash.title=Менеджер сесій — відновлення після краху
-sm.afterCrash.chkbox.label=Включити менеджер сесій
-sm.afterCrash.msg0=Остання сесія зазнала краху!
-sm.afterCrash.msg0.again=При роботі з вашою останньою сесією знову відбулася помилка!
-sm.afterCrash.msg1=Виберіть зі списку сесію для відновлення:
-sm.afterCrash.msg2=Виберіть спосіб продовження
-sm.afterCrash.msg3=Менеджер сесій зараз заблокований. Увімкнувши його, ви зможете з меню відновлювати ушкоджені, закриті й збережені сесії, а також закриті вікна.
-sm.afterCrash.msg4=Також ушкоджену сесію можна відновити пізніше з меню менеджера сесій.
-sm.afterCrash.msg5=але нічого не збережено.
-sm.afterCrash.msg6=але немає ніяких відкритих вікон в ушкодженій сесії
-sm.afterCrash.msg7=Зі списку закритих вікон виберіть вікно для відновлення
-sm.afterCrash.msg8=(також можна відновити закриті вікна пізніше, з меню закритих вікон)
-sm.afterCrash.msg9=Ушкоджена сесія порожня!
-sm.afterCrash.msg10=Менеджер сесій не знайшов сесій для відновлення.
-sm.afterCrash.button0.label=Відновити сесію
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=Відновити ушкоджену сесію
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=Не відновлювати
-sm.afterCrash.button1.accesskey=D
-sm.start.title=Менеджер сесій - відновлення сесії
-sm.start.chkbox.label=Увімкнути менеджер сесій
-sm.start.msg0=Стартова сесія порожня!
-sm.start.msg1=Відновлення після краху зараз заблоковане. Увімкнувши його, ви зможете відновлювати ушкоджені сесії.
-sm.start.msg2=Помилка пошуку стартової сесії. Не існує збереженої стартової сесії.
-sm.restoreError.msg0=Помилка у файлі менеджера сесій!
-sm.restoreError.msg1=Видалити сесію, яку ви намагалися відновити
-sm.disable.msg=Firefox має вбудовану функцію відновлення сесій.
-sm.disable.msg1=Ви прагнете використовувати вбудовану функцію відновлення сесій і відключити менеджер сесій Tab Mix Plus?
-sm.disable.msg2=Ви прагнете використовувати менеджер сесій Tab Mix Plus і відключити вбудовану функцію відновлення сесій?
-sm.tabview.hiddengroups=Більше вкладок відновлено в приховані групи.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/uk-UA/tabmix.dtd b/addon/chrome/locale/uk-UA/tabmix.dtd
index fafb5af9d..ad23b0438 100644
--- a/addon/chrome/locale/uk-UA/tabmix.dtd
+++ b/addon/chrome/locale/uk-UA/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Знищити зі списку">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "Налаштування">
-<!ENTITY saveWindow.label "Зберегти дане вікно">
-<!ENTITY saveAllWindows.label "Зберегти всі вікна">
 <!ENTITY sm.context.overwrite "Відновити з заміною існуючих вікон">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Відновити в нових вікнах">
diff --git a/addon/chrome/locale/vi/misc.dtd b/addon/chrome/locale/vi/misc.dtd
index b63d26047..e842dbcfc 100644
--- a/addon/chrome/locale/vi/misc.dtd
+++ b/addon/chrome/locale/vi/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "Chọn thời gian từ danh sách hoặc tự nhập thời gian">
 <!ENTITY specifyreload.label "Chỉ định Thời gian Tải lại">
-<!ENTITY sanitizer.entry "“Phiên làm việc Đã lưu” Tab Mix Plus">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "Bạn có chắc rằng mình muốn xóa TẤT CẢ dữ liệu (bao gồm cả sao lưu) của các phiên làm việc đã lưu?">
diff --git a/addon/chrome/locale/vi/pref-tabmix.dtd b/addon/chrome/locale/vi/pref-tabmix.dtd
index 59d0a2db5..e06393180 100644
--- a/addon/chrome/locale/vi/pref-tabmix.dtd
+++ b/addon/chrome/locale/vi/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "Show your home page">
 <!ENTITY startupBlankPage.label "Hiện một trang trống">
 <!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
-<!ENTITY ss.enable.label "Sử dụng tính năng “Khôi phục Phiên” có sẵn trong Firefox">
-<!ENTITY ss.enable.tooltip "Không chọn để cho phép sử dụng với Quản lí Phiên của Tabmix">
 <!ENTITY ss.advanced_setting "Thiết lập Nâng cao">
 <!ENTITY ss.advanced_setting.warning "Đừng thay đổi những mục này, trừ khi bạn biết mình đang làm gì">
 <!ENTITY ss.interval "Khoảng thời gian tối thiểu giữa hai lần lưu trạng thái">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "Tất cả các trang">
 <!ENTITY ss.privacy_level.unencrypted "Chỉ các trang không được mã hóa">
 <!ENTITY ss.privacy_level.nosites "Không trang nào cả">
-<!ENTITY sessionManger.enable "Bật “Quản lí Phiên”">
 <!ENTITY crashRecovery.enable "Bật “Khôi phục Đổ vỡ”">
-<!ENTITY sm.StartExit "Khởi động/Thoát">
-<!ENTITY sm.restore "Khôi phục">
-<!ENTITY sm.preserve "Bảo toàn">
 <!ENTITY sm.start "Khi Trình Duyệt Khởi Động:">
-<!ENTITY sm.start.restore "Khôi phục">
-<!ENTITY sm.start.ask "Hỏi trước khi Khôi phục">
-<!ENTITY sm.start.nothing "Không khôi phục">
-<!ENTITY sm.exit "Khi Trình Duyệt Thoát:">
-<!ENTITY sm.exit.save "Lưu phiên">
-<!ENTITY sm.exit.ask "Hỏi trước khi Lưu">
-<!ENTITY sm.exit.nothing "Không lưu">
-<!ENTITY sm.startup "Phiên khởi động:">
-<!ENTITY sm.lastsession "Phiên cuối">
-<!ENTITY sm.previouslast "Trước tới Cuối">
-<!ENTITY sm.chooseifempty "Chọn cái khác nếu trống">
-<!ENTITY sm.restore.options "Khi Khôi Phục Phiên:">
-<!ENTITY sm.restore.overwrite "Ghi đè các cửa sổ hiện tại">
-<!ENTITY sm.restore.overwriteTabs "Và thẻ">
-<!ENTITY sm.restore.closedWinList "Lưu cửa sổ trong danh sách cửa sổ đã đóng">
-<!ENTITY sm.restore.merge "Trộn nhiều cửa sổ lại thành một">
-<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
-<!ENTITY sm.notrestore.label "Khi không khôi phục lúc khởi động">
-<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
 <!ENTITY sm.preserve.options "Bảo toàn các Thẻ:">
 <!ENTITY sm.preserve.history "Lược sử">
 <!ENTITY sm.preserve.protect "Bảo vệ Trạng thái">
 <!ENTITY sm.preserve.locked "Khóa trạng thái">
 <!ENTITY sm.preserve.permission "Quyền hạn">
 <!ENTITY sm.preserve.scroll1 "Vị trí Cuộn">
-<!ENTITY sm.restore.winOptions "Bảo toàn Cửa sổ:">
-<!ENTITY sm.restore.selectedTab "Thẻ được chọn">
-<!ENTITY sm.restore.closedTabs "Danh sách các thẻ đã đóng">
 <!ENTITY incompatible.extensions "Một số phần mở rộng của bạn không tương thích với Tab Mix Plus, bạn nên vô hiệu hóa hoặc gỡ bỏ các phần mở rộng đó.">
 <!ENTITY incompatible.button.label "Hiện danh sách">
diff --git a/addon/chrome/locale/vi/session-manager.properties b/addon/chrome/locale/vi/session-manager.properties
deleted file mode 100644
index d68672a69..000000000
--- a/addon/chrome/locale/vi/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=Lưu danh sách thẻ đã đóng với phiên làm việc này
-sm.button.continue.label=Tiếp tục
-sm.button.continue.accesskey=T
-sm.askBeforeSave.title=Quản lí Phiên - Lưu phiên
-sm.askBeforeSave.msg0=Bạn có muốn lưu phiên làm việc?
-sm.askBeforeSave.msg2=Only non-private windows will be save to disk
-sm.askBeforeSave.msg1=Nếu không lưu, lần sau khi bạn khởi động trình duyệt thì \'Phiên cuối\' sẽ trống rỗng.
-sm.askBeforeSave.button0.label=Lưu phiên
-sm.askBeforeSave.button0.accesskey=L
-sm.askBeforeSave.button1.label=Không lưu
-sm.askBeforeSave.button1.accesskey=K
-sm.corrupted.title=Quản lí Phiên - Dữ liệu Bị hỏng
-sm.corrupted.msg0=Quản lí Phiên không thể tải cơ sở dữ liệu từ session.rdf đã hỏng.
-sm.corrupted.msg1=Tập tin session.rdf sẽ bị xóa, một bản sao có thể được tìm thấy tại session.old trong hồ sơ của bạn. Các sao lưu phiên nằm trong <hồ sơ>/sessionbackups
-sm.areYouSure.msg=Bạn có chắc rằng mình muốn tiếp tục?
-sm.canChooseStartup.msg=Bạn có thể chọn một phiên làm việc trong danh sách để cho thành phiên khởi động mới của bạn.
-sm.addtoStartup.title=Quản lí Phiên - Thêm vào thành Phiên Khởi Động
-sm.addtoStartup.msg.windows=Bạn sắp sửa thêm (nhiều) cửa sổ vào phiên khởi động của bạn:
-sm.addtoStartup.msg.tabs=Bạn sắp sửa thêm (nhiều) thẻ vào phiên khởi động của bạn:
-sm.addtoStartup.button0.label=Thêm vào Phiên
-sm.addtoStartup.button0.accesskey=T
-sm.addtoStartup.button1.label=Không thêm
-sm.addtoStartup.button1.accesskey=K
-sm.replaceStartup.title=Quản lí Phiên - Ghi đè Phiên Khởi Động
-sm.replaceStartup.msg=Bạn sắp sửa thay thế phiên khởi động của bạn:
-sm.replaceStartup.button0.label=Thay thế Phiên
-sm.replaceStartup.button0.accesskey=T
-sm.replaceStartup.button1.label=Không thay thế
-sm.replaceStartup.button1.accesskey=K
-sm.removeStartup.title=Quản lí Phiên - Xóa Phiên Khởi Động
-sm.removeStartup.msg0=Bạn sắp sửa xóa phiên khởi động của bạn:
-sm.removeStartup.msg1=Chọn một phiên làm việc để trở thành phiên khởi động từ danh sách:
-sm.removeStartup.button0.label=Xóa
-sm.removeStartup.button0.accesskey=X
-sm.removeStartup.button1.label=Không xóa
-sm.removeStartup.button1.accesskey=K
-sm.title=Quản lí Phiên
-sm.dontSaveBlank.msg=Quản lí Phiên không lưu các cửa sổ trống
-sm.sessionSave.error=Lỗi trong Quản lí Phiên, phiên làm việc không được lưu
-sm.sessionName.title.rename=Quản lí Phiên - Đổi tên Phiên
-sm.sessionName.title.saveprevious=Quản lí Phiên - Lưu Phiên
-sm.sessionName.title.savethiswindow=Quản lí Phiên - Lưu Cửa sổ Này
-sm.sessionName.title.saveallwindows=Quản lí Phiên - Lưu Tất cả Cửa sổ
-sm.sessionName.msg0=Nhập Tên Phiên:
-sm.sessionName.msg1=Tên phải có ít nhất một kí tự hoặc số.
-sm.sessionName.msg2=Tên này đã được dùng!
-sm.sessionName.msg3=Bạn có chắc rằng bạn muốn thay thế phiên?
-sm.sessionName.button0.label=Đổi tên Phiên
-sm.sessionName.button0.accesskey=i
-sm.sessionName.button1.label=Không đổi tên
-sm.sessionName.button1.accesskey=K
-sm.session.empty=trống
-sm.session.tabs=T
-sm.session.windows=W
-sm.removeAll.title.session=Quản lí Phiên - Xóa Tất cả Các phiên Đã lưu
-sm.removeAll.title.closedwindow=Quản lí Phiên - Xóa Tất cả Các cửa sổ Đã đóng
-sm.removeAll.msg0=Bạn có chắc rằng mình muốn xóa tất cả các phiên đã lưu?
-sm.removeAll.msg1=Nếu chọn \'Xóa\', phiên khởi động của bạn sẽ là \'Phiên cuối\'.
-sm.removeAll.msg2=Bạn có chắc rằng mình muốn xóa tất cả các cửa sổ đã đóng?
-sm.sessionMenu.last=Phiên Cuối
-sm.sessionMenu.lastDefault=Phiên Cuối - Mặc định
-sm.sessionMenu.lastgood=Phiên ổn định Cuối
-sm.sessionMenu.previous=Trước đến Cuối
-sm.sessionMenu.crashed=Phiên đổ vỡ
-sm.afterCrash.title=Quản lí Phiên - Khôi phục sau khi Đổ vỡ
-sm.afterCrash.chkbox.label=Bật Quản lí Phiên
-sm.afterCrash.msg0=Phiên cuối của bạn đã bị Đổ vỡ!
-sm.afterCrash.msg0.again=Phiên cuối Đổ vỡ của bạn lại bị Đổ vỡ lần nữa!
-sm.afterCrash.msg1=Chọn phiên để khôi phục từ danh sách:
-sm.afterCrash.msg2=Chọn cách tiếp tục
-sm.afterCrash.msg3=Quản lí Phiên hiện đang bị vô hiệu hóa, nếu kích hoạt Quản lí Phiên, bạn có thể khôi phục các phiên bị hỏng, đã đóng, đã lưu và các cửa sổ đã đóng trong trình đơn Quản lí Phiên.
-sm.afterCrash.msg4=Sau này bạn cũng có thể khôi phục phiên bị hỏng bằng trình đơn Quản lí Phiên.
-sm.afterCrash.msg5=nhưng không có cái gì đã được lưu cả.
-sm.afterCrash.msg6=nhưng không có cửa sổ đang mở nào trong phiên Đổ vỡ của bạn
-sm.afterCrash.msg7=Chọn cửa sổ để khôi phục từ danh sách Cửa sổ Đã đóng
-sm.afterCrash.msg8=(sau này bạn cũng có thể khôi phục phiên đổ vỡ bằng trình đơn Cửa sổ Đã đóng)
-sm.afterCrash.msg9=Phiên Đổ Vỡ của bạn trống rỗng!
-sm.afterCrash.msg10=Quản lí Phiên không tìm thấy phiên nào để khôi phục.
-sm.afterCrash.button0.label=Khôi phục Phiên
-sm.afterCrash.button0.accesskey=K
-sm.afterCrash.button0.crashed.label=Khôi phục Phiên Đổ Vỡ
-sm.afterCrash.button0.crashed.accesskey=K
-sm.afterCrash.button1.label=Không khôi phục
-sm.afterCrash.button1.accesskey=g
-sm.start.title=Quản lí Phiên - Khôi phục Phiên
-sm.start.chkbox.label=Bật Phục hồi Đổ vỡ
-sm.start.msg0=Phiên Khởi Động của bạn trống rỗng!
-sm.start.msg1=Phục hồi Đổ vỡ hiện đang bị vô hiệu hóa, nếu kích hoạt Phục hồi Đổ vỡ, bạn sẽ có thể khôi phục các phiên đổ vỡ.
-sm.start.msg2=Lỗi trong khi đang tìm phiên khởi động của bạn, phiên khởi động đã lưu không tồn tại.
-sm.restoreError.msg0=Lỗi trong tập tin quản lí phiên làm việc!
-sm.restoreError.msg1=Xóa phiên làm việc bạn định khôi phục
-sm.disable.msg=Firefox có sẵn chức năng khôi phục phiên làm việc.
-sm.disable.msg1=Bạn có muốn kích hoạt chức năng sẵn có của Firefox và vô hiệu hóa Quản lí Phiên của TabMix không?
-sm.disable.msg2=Bạn có muốn kích hoạt Quản lí Phiên của TabMix và vô hiệu hóa chức năng sẵn có của Firefox không?
-sm.tabview.hiddengroups=More tabs restored into hidden groups.
-sm.tabview.hiddengroups.removed=Hidden tab groups was removed.
-sm.tabview.removed=The Tab Groups (Panorama) feature was removed from Firefox.
-sm.tabview.removed.learnMore.label=Learn More
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=Install Tab Groups extension
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=History Session, backup with groups data
-sm.tabview.backup.crashed=Crashed Session, backup with groups data
-sm.tabview.backup.msg=Tab mix plus Session Manager has saved a backup of your session.
-sm.bookmarks.historySession= History Session
-sm.bookmarks.closedWindow= Closed Window
-sm.bookmarks.sessionFolder=Tab Mix Plus Sessions
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID= Window %S
diff --git a/addon/chrome/locale/vi/tabmix.dtd b/addon/chrome/locale/vi/tabmix.dtd
index a270cad30..5f677a6c7 100644
--- a/addon/chrome/locale/vi/tabmix.dtd
+++ b/addon/chrome/locale/vi/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "Xóa khỏi danh sách">
 <!ENTITY deletelist.accesskey "X">
 <!ENTITY settings.label "Thiết lập">
-<!ENTITY saveWindow.label "Lưu Cửa Sổ Này">
-<!ENTITY saveAllWindows.label "Lưu Tất cả Cửa sổ">
 <!ENTITY sm.context.overwrite "Khôi phục, Ghi đè Cửa sổ Đang mở">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "Khôi Phục sang Cửa Sổ Mới">
diff --git a/addon/chrome/locale/zh-CN/misc.dtd b/addon/chrome/locale/zh-CN/misc.dtd
index 9b266dd91..3b8abab62 100644
--- a/addon/chrome/locale/zh-CN/misc.dtd
+++ b/addon/chrome/locale/zh-CN/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "标签式浏览">
 <!ENTITY reloadtime.label1 "从列表中选择时间或输入您自定义的时间">
 <!ENTITY specifyreload.label "指定重新载入时间">
-<!ENTITY sanitizer.entry "Tab Mix Plus 历史">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "您是否确定要清除包括备份在内的所有已保存的浏览进程数据？">
diff --git a/addon/chrome/locale/zh-CN/pref-tabmix.dtd b/addon/chrome/locale/zh-CN/pref-tabmix.dtd
index e74ca5d99..99bcf7958 100644
--- a/addon/chrome/locale/zh-CN/pref-tabmix.dtd
+++ b/addon/chrome/locale/zh-CN/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "显示您的首页">
 <!ENTITY startupBlankPage.label "显示空白页">
 <!ENTITY startupLastSession1.label "显示您上次的窗口和标签页">
-<!ENTITY ss.enable.label "使用内建的浏览进程恢复特性">
-<!ENTITY ss.enable.tooltip "不勾选此项则允许使用 Tabmix 浏览进程管理器">
 <!ENTITY ss.advanced_setting "高级设置">
 <!ENTITY ss.advanced_setting.warning "除非您知道您在做什么，否则不要更改这些设置">
 <!ENTITY ss.interval "两次状态保存的最小时间间隔">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "所有站点">
 <!ENTITY ss.privacy_level.unencrypted "仅非加密的站点">
 <!ENTITY ss.privacy_level.nosites "无任何站点">
-<!ENTITY sessionManger.enable "启用浏览进程管理器">
 <!ENTITY crashRecovery.enable "启用崩溃进程恢复">
-<!ENTITY sm.StartExit "启动/退出">
-<!ENTITY sm.restore "恢复">
-<!ENTITY sm.preserve "网页保持">
 <!ENTITY sm.start "启动浏览器时:">
-<!ENTITY sm.start.restore "恢复原浏览进程">
-<!ENTITY sm.start.ask "在恢复前询问">
-<!ENTITY sm.start.nothing "不恢复">
-<!ENTITY sm.exit "退出浏览器时:">
-<!ENTITY sm.exit.save "保存当前浏览进程">
-<!ENTITY sm.exit.ask "在保存前询问">
-<!ENTITY sm.exit.nothing "不保存">
-<!ENTITY sm.startup "起始浏览进程:">
-<!ENTITY sm.lastsession "上一次的浏览进程">
-<!ENTITY sm.previouslast "再上一次的浏览进程">
-<!ENTITY sm.chooseifempty "如果浏览进程为空允许选择另一个进程">
-<!ENTITY sm.restore.options "恢复浏览进程时:">
-<!ENTITY sm.restore.overwrite "覆盖现有的窗口">
-<!ENTITY sm.restore.overwriteTabs "和标签页">
-<!ENTITY sm.restore.closedWinList "把关闭的窗口保存在已关闭的窗口列表中">
-<!ENTITY sm.restore.merge "合并多个窗口为一个窗口">
-<!ENTITY sm.restore.bypassCache "还原时跳过缓存">
-<!ENTITY sm.notrestore.label "当启动不恢复浏览进程时">
-<!ENTITY sm.restorePinned1.label "恢复您上次的已固定标签页">
 <!ENTITY sm.preserve.options "保持标签页的：">
 <!ENTITY sm.preserve.history "历史">
 <!ENTITY sm.preserve.protect "保护原状态">
 <!ENTITY sm.preserve.locked "锁定原状态">
 <!ENTITY sm.preserve.permission "网页许可">
 <!ENTITY sm.preserve.scroll1 "滚动条的位置">
-<!ENTITY sm.restore.winOptions "保持窗口的：">
-<!ENTITY sm.restore.selectedTab "选中的标签页">
-<!ENTITY sm.restore.closedTabs "已关闭的标签页列表">
 <!ENTITY incompatible.extensions "您的某些扩展与 Tab Mix Plus 不兼容，建议您禁用或卸载这些扩展。">
 <!ENTITY incompatible.button.label "显示不兼容扩展列表">
diff --git a/addon/chrome/locale/zh-CN/session-manager.properties b/addon/chrome/locale/zh-CN/session-manager.properties
deleted file mode 100644
index c2d5f4b4f..000000000
--- a/addon/chrome/locale/zh-CN/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=同时保存该进程所记录的已关闭标签页列表
-sm.button.continue.label=继续
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=浏览进程管理器 - 保存浏览进程
-sm.askBeforeSave.msg0=是否要保存当前浏览进程?
-sm.askBeforeSave.msg2=仅保存非隐私窗口到磁盘
-sm.askBeforeSave.msg1=如果选择不保存下次启动 Firefox 时‘上一次浏览进程’将清空。
-sm.askBeforeSave.button0.label=保存
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=取消
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=浏览进程管理器 - 数据库已被破坏
-sm.corrupted.msg0=浏览进程管理器无法从已损坏的 session.rdf 中载入数据库。
-sm.corrupted.msg1=session.rdf 将被删除且已经备份到 session.old 中
-sm.areYouSure.msg=确定是否要继续?
-sm.canChooseStartup.msg=您可以从列表中选择一个作为新的起始浏览进程:
-sm.addtoStartup.title=浏览进程管理器 - 添加到起始浏览进程
-sm.addtoStartup.msg.windows=您将要添加窗口到您的起始浏览进程:
-sm.addtoStartup.msg.tabs=您将要添加标签页到您的起始浏览进程:
-sm.addtoStartup.button0.label=添加
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=取消
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=浏览进程管理器 - 替换起始浏览进程
-sm.replaceStartup.msg=您将要替换您的起始浏览进程:
-sm.replaceStartup.button0.label=替换
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=取消
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=浏览进程管理器 - 删除起始浏览进程
-sm.removeStartup.msg0=您将要删除您的起始浏览进程
-sm.removeStartup.msg1=请从列表中选择一个作为新的起始浏览进程：
-sm.removeStartup.button0.label=删除
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=取消
-sm.removeStartup.button1.accesskey=T
-sm.title=浏览进程管理器
-sm.dontSaveBlank.msg=浏览进程管理器无法保存空白窗口
-sm.sessionSave.error=浏览进程管理器发生错误,无法保存浏览进程
-sm.sessionName.title.rename=浏览进程管理器 - 重命名浏览进程
-sm.sessionName.title.saveprevious=浏览进程管理器 - 保存浏览进程
-sm.sessionName.title.savethiswindow=浏览进程管理器 - 保存当前窗口
-sm.sessionName.title.saveallwindows=浏览进程管理器 - 保存所有窗口
-sm.sessionName.msg0=请输入浏览进程名:
-sm.sessionName.msg1=浏览进程名必须至少包括一个字母或数字。
-sm.sessionName.msg2=该进程名已被使用了!
-sm.sessionName.msg3=确定是否要替换当前浏览进程?
-sm.sessionName.button0.label=重命名
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=取消
-sm.sessionName.button1.accesskey=D
-sm.session.empty=空白
-sm.session.tabs=页
-sm.session.windows=个窗口
-sm.removeAll.title.session=浏览进程管理器 - 删除所有已保存的浏览进程
-sm.removeAll.title.closedwindow=浏览进程管理器 - 删除所有已关闭的窗口
-sm.removeAll.msg0=确定删除所有已保存的浏览进程?
-sm.removeAll.msg1=如果选择\'删除\'您的起始浏览进程将变为‘上一次的浏览进程’。
-sm.removeAll.msg2=确定删除所有已关闭的窗口?
-sm.sessionMenu.last=上一次的浏览进程
-sm.sessionMenu.lastDefault=上一次的浏览进程 - 默认
-sm.sessionMenu.lastgood=上一次正常的浏览进程
-sm.sessionMenu.previous=再上一次的浏览进程
-sm.sessionMenu.crashed=已崩溃的浏览进程
-sm.afterCrash.title=浏览进程管理器 - 崩溃后恢复原浏览进程
-sm.afterCrash.chkbox.label=启用浏览进程管理器
-sm.afterCrash.msg0=您上一次的浏览进程已崩溃!
-sm.afterCrash.msg0.again=您上次崩溃的进程再一次崩溃了!
-sm.afterCrash.msg1=请在列表中选择一个要恢复的进程：
-sm.afterCrash.msg2=请选择下一步操作
-sm.afterCrash.msg3=浏览进程管理器当前处于禁用状态,如果启用浏览进程管理器,您将可以从浏览进程管理器菜单中恢复已崩溃,已关闭,已保存的进程和已关闭的窗口。
-sm.afterCrash.msg4=稍候您可以从浏览进程管理器菜单中恢复已崩溃的进程。
-sm.afterCrash.msg5=但是没有任何信息保存。
-sm.afterCrash.msg6=但是其中没有任何已打开的窗口
-sm.afterCrash.msg7=请从已关闭的窗口列表中选择一个窗口以恢复
-sm.afterCrash.msg8=(稍候您也可以从已关闭的窗口菜单中恢复窗口)
-sm.afterCrash.msg9=没有任何已崩溃进程!
-sm.afterCrash.msg10=浏览进程管理器找不到任何可恢复的进程。
-sm.afterCrash.button0.label=恢复
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=恢复
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=取消
-sm.afterCrash.button1.accesskey=D
-sm.start.title=浏览进程管理器 - 恢复浏览进程
-sm.start.chkbox.label=启用崩溃后进程恢复功能
-sm.start.msg0=没有任何起始浏览进程!
-sm.start.msg1=崩溃后进程恢复功能当前处于禁用状态,如果启用该功能您将可以恢复已崩溃的浏览进程。
-sm.start.msg2=查找您的起始浏览进程时发生错误, 您已保存的起始浏览进程不存在。
-sm.restoreError.msg0=浏览进程管理器菜单发生错误!
-sm.restoreError.msg1=请删除您要恢复的浏览进程
-sm.disable.msg=Firefox 内建浏览进程恢复特性。
-sm.disable.msg1=您是否要启用内建的浏览进程恢复特性同时禁用 TabMix 浏览进程管理器？
-sm.disable.msg2=您是否要启用 TabMix 浏览进程管理器同时禁用内建的浏览进程恢复特性？
-sm.tabview.hiddengroups=更多标签页已还原到隐藏群组。
-sm.tabview.hiddengroups.removed=隐藏已移出的标签页组
-sm.tabview.removed=Firefox不再内置标签页组(Panorama)功能
-sm.tabview.removed.learnMore.label=知道更多
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=安装Tab Groups扩展
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=会话历史，与群组数据备份
-sm.tabview.backup.crashed=崩溃的会话，与群组数据备份
-sm.tabview.backup.msg=Tab mix plus会话管理器已备份你的会话
-sm.bookmarks.historySession=会话历史
-sm.bookmarks.closedWindow=已关闭窗口
-sm.bookmarks.sessionFolder=Tab Mix Plus会话
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=窗口
diff --git a/addon/chrome/locale/zh-CN/tabmix.dtd b/addon/chrome/locale/zh-CN/tabmix.dtd
index 9967b1af7..8336affee 100644
--- a/addon/chrome/locale/zh-CN/tabmix.dtd
+++ b/addon/chrome/locale/zh-CN/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "从列表中删除">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "设置">
-<!ENTITY saveWindow.label "保存当前窗口">
-<!ENTITY saveAllWindows.label "保存所有窗口">
 <!ENTITY sm.context.overwrite "替换并覆盖现有的窗口">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "在新窗口中恢复">
diff --git a/addon/chrome/locale/zh-TW/misc.dtd b/addon/chrome/locale/zh-TW/misc.dtd
index d1eb4d333..4da25bb5e 100644
--- a/addon/chrome/locale/zh-TW/misc.dtd
+++ b/addon/chrome/locale/zh-TW/misc.dtd
@@ -12,6 +12,3 @@
 <!ENTITY tabmix.label "Tab Mix Plus">
 <!ENTITY reloadtime.label1 "由清單選擇時間或是輸入自訂的時間">
 <!ENTITY specifyreload.label "自訂頁面自動更新頻率">
-<!ENTITY sanitizer.entry "Tab Mix Plus 瀏覽狀態記錄">
-<!ENTITY sanitizer.entry.accesskey "T">
-<!ENTITY sanitizer.entry.confirm "確定要刪除所有儲存的分頁資料（包含備份）嗎？">
diff --git a/addon/chrome/locale/zh-TW/pref-tabmix.dtd b/addon/chrome/locale/zh-TW/pref-tabmix.dtd
index 7d36897d3..3ed2d5aba 100644
--- a/addon/chrome/locale/zh-TW/pref-tabmix.dtd
+++ b/addon/chrome/locale/zh-TW/pref-tabmix.dtd
@@ -259,8 +259,6 @@
 <!ENTITY startupHomePage1.label "顯示首頁">
 <!ENTITY startupBlankPage.label "顯示空白頁">
 <!ENTITY startupLastSession1.label "顯示上次瀏覽的視窗和分頁">
-<!ENTITY ss.enable.label "使用 Firefox 內建的瀏覽狀態回復功能">
-<!ENTITY ss.enable.tooltip "取消勾選，可啟用 Tab Mix Plus 瀏覽狀態管理">
 <!ENTITY ss.advanced_setting "進階設定">
 <!ENTITY ss.advanced_setting.warning "請勿隨意調整以下設定值，除非您非常清楚您正在做什麼">
 <!ENTITY ss.interval "瀏覽狀態自動儲存的最小時間間隔：">
@@ -269,39 +267,13 @@
 <!ENTITY ss.privacy_level.allsites "儲存所有網站的隱私資料">
 <!ENTITY ss.privacy_level.unencrypted "僅儲存未加密站台的隱私資料">
 <!ENTITY ss.privacy_level.nosites "不儲存任何站台的隱私資料">
-<!ENTITY sessionManger.enable "啟用瀏覽狀態管理">
 <!ENTITY crashRecovery.enable "啟用異常終止狀態回復">
-<!ENTITY sm.StartExit "啟動/關閉">
-<!ENTITY sm.restore "還原設定">
-<!ENTITY sm.preserve "保存項目">
 <!ENTITY sm.start "啟動瀏覽器時：">
-<!ENTITY sm.start.restore "自動還原狀態">
-<!ENTITY sm.start.ask "詢問是否還原">
-<!ENTITY sm.start.nothing "不還原狀態">
-<!ENTITY sm.exit "關閉瀏覽器時：">
-<!ENTITY sm.exit.save "自動儲存狀態">
-<!ENTITY sm.exit.ask "詢問是否儲存">
-<!ENTITY sm.exit.nothing "不儲存狀態">
-<!ENTITY sm.startup "啟動時預設載入：">
-<!ENTITY sm.lastsession "最後的瀏覽狀態">
-<!ENTITY sm.previouslast "前次的瀏覽狀態">
-<!ENTITY sm.chooseifempty "該記錄不存在時，顯示列表讓我自行挑選">
-<!ENTITY sm.restore.options "還原瀏覽狀態時：">
-<!ENTITY sm.restore.overwrite "還原到目前的視窗">
-<!ENTITY sm.restore.overwriteTabs "及分頁">
-<!ENTITY sm.restore.closedWinList "先備份目前的瀏覽狀態至「已關閉視窗列表」">
-<!ENTITY sm.restore.merge "自動合併所有視窗">
-<!ENTITY sm.restore.bypassCache "還原時不使用快取的資料">
-<!ENTITY sm.notrestore.label "當關閉「啟動時還原」功能">
-<!ENTITY sm.restorePinned1.label "還原上次釘選的分頁">
 <!ENTITY sm.preserve.options "保存分頁：">
 <!ENTITY sm.preserve.history "瀏覽記錄">
 <!ENTITY sm.preserve.protect "保護狀態">
 <!ENTITY sm.preserve.locked "鎖定狀態">
 <!ENTITY sm.preserve.permission "內容允許狀態">
 <!ENTITY sm.preserve.scroll1 "頁面捲動位置">
-<!ENTITY sm.restore.winOptions "保存視窗：">
-<!ENTITY sm.restore.selectedTab "選取的分頁">
-<!ENTITY sm.restore.closedTabs "已關閉分頁列表">
 <!ENTITY incompatible.extensions "您所安裝的某些擴充套件不相容於 Tab Mix Plus，建議您可以停用或是移除這些擴充套件。">
 <!ENTITY incompatible.button.label "顯示列表">
diff --git a/addon/chrome/locale/zh-TW/session-manager.properties b/addon/chrome/locale/zh-TW/session-manager.properties
deleted file mode 100644
index 78c73df13..000000000
--- a/addon/chrome/locale/zh-TW/session-manager.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-sm.saveClosedTab.chkbox.label=同時保存「已關閉分頁列表」
-sm.button.continue.label=繼續
-sm.button.continue.accesskey=C
-sm.askBeforeSave.title=瀏覽狀態管理 - 儲存瀏覽狀態
-sm.askBeforeSave.msg0=是否要儲存目前的瀏覽狀態？
-sm.askBeforeSave.msg2=只有非隱私的視窗會儲存下來
-sm.askBeforeSave.msg1=若不儲存則「最後的瀏覽狀態」將被清除！
-sm.askBeforeSave.button0.label=儲存
-sm.askBeforeSave.button0.accesskey=S
-sm.askBeforeSave.button1.label=不儲存
-sm.askBeforeSave.button1.accesskey=D
-sm.corrupted.title=瀏覽狀態管理 - 毀損的記錄檔
-sm.corrupted.msg0=無法載入已毀損的 session.rdf 記錄檔。
-sm.corrupted.msg1=檔案 session.rdf 將被刪除，您可以在 profile 中找到名為 session.old 的備份檔。
-sm.areYouSure.msg=確定要繼續嗎？
-sm.canChooseStartup.msg=請選擇一個作為新的起始瀏覽狀態：
-sm.addtoStartup.title=瀏覽狀態管理 - 加入至起始瀏覽狀態
-sm.addtoStartup.msg.windows=加入視窗至起始瀏覽狀態：
-sm.addtoStartup.msg.tabs=加入分頁至起始瀏覽狀態：
-sm.addtoStartup.button0.label=加入
-sm.addtoStartup.button0.accesskey=A
-sm.addtoStartup.button1.label=不加入
-sm.addtoStartup.button1.accesskey=D
-sm.replaceStartup.title=瀏覽狀態管理 - 取代起始瀏覽狀態
-sm.replaceStartup.msg=取代起始瀏覽狀態：
-sm.replaceStartup.button0.label=取代
-sm.replaceStartup.button0.accesskey=R
-sm.replaceStartup.button1.label=不取代
-sm.replaceStartup.button1.accesskey=D
-sm.removeStartup.title=瀏覽狀態管理 - 刪除起始瀏覽狀態
-sm.removeStartup.msg0=刪除起始瀏覽狀態：
-sm.removeStartup.msg1=請選擇一個作為新的起始瀏覽狀態：
-sm.removeStartup.button0.label=刪除
-sm.removeStartup.button0.accesskey=D
-sm.removeStartup.button1.label=不刪除
-sm.removeStartup.button1.accesskey=T
-sm.title=瀏覽狀態管理
-sm.dontSaveBlank.msg=空白視窗沒有瀏覽狀態可儲存
-sm.sessionSave.error=發生錯誤，瀏覽狀態未被儲存
-sm.sessionName.title.rename=瀏覽狀態管理 - 重新命名瀏覽狀態
-sm.sessionName.title.saveprevious=瀏覽狀態管理 - 儲存瀏覽狀態
-sm.sessionName.title.savethiswindow=瀏覽狀態管理 - 儲存這個視窗
-sm.sessionName.title.saveallwindows=瀏覽狀態管理 - 儲存所有視窗
-sm.sessionName.msg0=請輸入瀏覽狀態名稱：
-sm.sessionName.msg1=名稱必須至少包含一個字元或數字。
-sm.sessionName.msg2=這個名稱已存在！
-sm.sessionName.msg3=確定要取代這個瀏覽狀態嗎？
-sm.sessionName.button0.label=重新命名
-sm.sessionName.button0.accesskey=R
-sm.sessionName.button1.label=不重新命名
-sm.sessionName.button1.accesskey=D
-sm.session.empty=空的
-sm.session.tabs=頁
-sm.session.windows=窗
-sm.removeAll.title.session=瀏覽狀態管理 - 刪除所有儲存的瀏覽狀態
-sm.removeAll.title.closedwindow=瀏覽狀態管理 - 刪除所有關閉的視窗
-sm.removeAll.msg0=確定要刪除所有儲存的瀏覽狀態嗎？
-sm.removeAll.msg1=若選擇刪除，您的起始瀏覽狀態將重設為「最後的瀏覽狀態」
-sm.removeAll.msg2=確定要刪除所有關閉的視窗嗎？
-sm.sessionMenu.last=最後的瀏覽狀態
-sm.sessionMenu.lastDefault=最後的瀏覽狀態（預設）
-sm.sessionMenu.lastgood=最後完好的瀏覽狀態
-sm.sessionMenu.previous=前次的瀏覽狀態
-sm.sessionMenu.crashed=異常終止前的瀏覽狀態
-sm.afterCrash.title=瀏覽狀態管理 - 回復異常終止前的瀏覽狀態
-sm.afterCrash.chkbox.label=啟用瀏覽狀態管理
-sm.afterCrash.msg0=發現程式異常終止前的瀏覽狀態
-sm.afterCrash.msg0.again=您的異常終止前瀏覽狀態載入後仍然造成瀏覽器異常終止！
-sm.afterCrash.msg1=請從列表中選擇要還原的瀏覽狀態：
-sm.afterCrash.msg2=選擇要如何繼續
-sm.afterCrash.msg3=瀏覽狀態管理目前是停用狀態。啟用此功能，您將能還原已存的瀏覽狀態與已關閉的視窗。
-sm.afterCrash.msg4=您也可以稍後從瀏覽狀態管理選單中回復異常終止前的瀏覽狀態。
-sm.afterCrash.msg5=但並未儲存任何記錄。
-sm.afterCrash.msg6=但並無任何已開啟的視窗在您異常終止前的瀏覽狀態中
-sm.afterCrash.msg7=從關閉視窗列表中選擇要還原的視窗
-sm.afterCrash.msg8=（您也可以稍後從關閉視窗列表中還原關閉的視窗）
-sm.afterCrash.msg9=您的異常終止前瀏覽狀態是空的！
-sm.afterCrash.msg10=目前瀏覽狀態記錄檔裡沒有任何可供還原的記錄。
-sm.afterCrash.button0.label=還原
-sm.afterCrash.button0.accesskey=R
-sm.afterCrash.button0.crashed.label=回復異常終止前的瀏覽狀態
-sm.afterCrash.button0.crashed.accesskey=R
-sm.afterCrash.button1.label=不還原
-sm.afterCrash.button1.accesskey=D
-sm.start.title=瀏覽狀態管理 - 還原瀏覽狀態
-sm.start.chkbox.label=啟用瀏覽狀態管理
-sm.start.msg0=您預設的起始瀏覽狀態內容是空的！
-sm.start.msg1=異常終止狀態回復功能目前是停用狀態。啟用此功能，您將能回復程式異常終止前的瀏覽狀態。
-sm.start.msg2=載入起始瀏覽狀態時發生錯誤，該瀏覽狀態並不存在。
-sm.restoreError.msg0=瀏覽狀態記錄檔中有錯誤！
-sm.restoreError.msg1=記錄檔中錯誤的瀏覽狀態已刪除。
-sm.disable.msg=目前 Firefox 已經內建瀏覽狀態回復功能。
-sm.disable.msg1=您是否要使用 Firefox 內建的瀏覽狀態回復功能，並停用 Tab Mix Plus 的瀏覽狀態管理？
-sm.disable.msg2=您是否要使用 Tab Mix Plus 的瀏覽狀態管理，並停用 Firefox 內建的瀏覽狀態回復功能？
-sm.tabview.hiddengroups=有更多的分頁還原到隱藏的群組。
-sm.tabview.hiddengroups.removed=已移除隱藏的分頁群組。
-sm.tabview.removed=Firefox 不支援分頁群組（全景）功能。
-sm.tabview.removed.learnMore.label=更多資訊
-sm.tabview.removed.learnMore.accesskey=L
-sm.tabview.install.label=安裝分頁群組擴充套件
-sm.tabview.install.accesskey=I
-sm.tabview.backup.session=瀏覽記錄，備份群組資料
-sm.tabview.backup.crashed=異常終止，備份群組資料
-sm.tabview.backup.msg=Tab mix plus 瀏覽狀態管理已儲存您的備份。
-sm.bookmarks.historySession=瀏覽記錄
-sm.bookmarks.closedWindow=關閉的視窗
-sm.bookmarks.sessionFolder=Tab Mix Plus 瀏覽狀態
-# LOCALIZATION NOTE (sm.bookmarks.migration.windowID):
-# %S is the window number in the session
-sm.bookmarks.migration.windowID=視窗 %S
diff --git a/addon/chrome/locale/zh-TW/tabmix.dtd b/addon/chrome/locale/zh-TW/tabmix.dtd
index d0257fc67..1335fd838 100644
--- a/addon/chrome/locale/zh-TW/tabmix.dtd
+++ b/addon/chrome/locale/zh-TW/tabmix.dtd
@@ -81,8 +81,6 @@
 <!ENTITY deletelist.label "從列表中移除">
 <!ENTITY deletelist.accesskey "D">
 <!ENTITY settings.label "設定值">
-<!ENTITY saveWindow.label "儲存目前視窗的瀏覽狀態">
-<!ENTITY saveAllWindows.label "儲存全部視窗的瀏覽狀態">
 <!ENTITY sm.context.overwrite "還原至目前視窗">
 <!ENTITY sm.context.overwrite.key "O">
 <!ENTITY sm.context.restore.new "還原至新的視窗">
diff --git a/addon/chrome/skin/app_version/all/preferences-proton.css b/addon/chrome/skin/app_version/all/preferences-proton.css
index 5c2aba0be..0668fa98b 100644
--- a/addon/chrome/skin/app_version/all/preferences-proton.css
+++ b/addon/chrome/skin/app_version/all/preferences-proton.css
@@ -203,10 +203,6 @@ prefpane > .content-box > tabbox {
   padding-inline: 0.75em;
 }
 
-#sessionsPanel > .sessionManager {
- margin: 2px;
-}
-
 /*  tabclicking options tabbox  */
 .mouseclick-panel {
   --mouseclick-border: 1px solid color-mix(in srgb, var(--in-content-accent-color) 41%, transparent);
diff --git a/addon/chrome/skin/tabmix-preferences.css b/addon/chrome/skin/tabmix-preferences.css
index e701a8b0d..96c4ed6c2 100644
--- a/addon/chrome/skin/tabmix-preferences.css
+++ b/addon/chrome/skin/tabmix-preferences.css
@@ -28,6 +28,8 @@ radio[pane=paneSession] {
 
 radio[pane=paneIncompatible] {
   list-style-image: url("chrome://global/skin/icons/error.svg") !important;
+  -moz-context-properties: fill;
+  fill: var(--in-content-danger-button-background, #e22850);
   visibility: collapse;
 }
 
@@ -278,18 +280,6 @@ tabbox > tabpanels:last-child {
   padding-bottom: 6px;
 }
 
-/* for Linux */
-#sessionManager-panels[linux] {
-  border-left: none !important;
-  border-right: none !important;
-  border-bottom: none !important;
-}
-
-#sessionManager-panels[linux] groupbox {
-  margin: 2px 5px;
-  padding: 0 5px;
-}
-
 /* for Mac */
 #TabMIxPreferences[mac] prefpane > .content-box > tabbox {
   height: var(--content-box-max-pane-height, 468px);
@@ -311,13 +301,6 @@ tabbox > tabpanels:last-child {
   margin-bottom: 2px;
 }
 
-/* session panel */
-#sessionsPanel:not([manager]),
-#sessionsPanel[manager=tabmix] .firefox,
-#sessionsPanel[manager=firefox] .tabmix {
-  display: none;
-}
-
 #sessionsPanel > groupbox > vbox {
   height: 55px;
 }
diff --git a/addon/defaults/preferences/tabmix.js b/addon/defaults/preferences/tabmix.js
index 300cfa9e5..bb3e6d448 100644
--- a/addon/defaults/preferences/tabmix.js
+++ b/addon/defaults/preferences/tabmix.js
@@ -186,7 +186,6 @@ pref("extensions.tabmix.undoClose.keepMenuOpen", false);
 pref("extensions.tabmix.undoClosePosition", true);
 pref("extensions.tabmix.undoCloseButton.menuonly", false);
 
-pref("extensions.tabmix.moveToGroup", true); // from 2010-08-13 , for Firefox 4.0+ only
 pref("extensions.tabmix.newTabMenu", true);
 pref("extensions.tabmix.duplicateMenu", true); // 2008-04-12: changed from false to true
 pref("extensions.tabmix.duplicateinWinMenu", false);
@@ -239,6 +238,7 @@ pref("extensions.tabmix.mergeWindowContent", false);
 pref("extensions.tabmix.middleclickDelete", true);
 
 pref("extensions.tabmix.optionsToolMenu", true);
+pref("extensions.tabmix.closedWinToolsMenu", false);
 
 pref("extensions.tabmix.enablefiletype", true);
 // noinspection SpellCheckingInspection
@@ -249,43 +249,11 @@ pref("extensions.{dc572301-7619-498c-a57d-39143191b318}.description", "chrome://
 pref("extensions.tabmix.hideIcons", false);
 pref("extensions.tabmix.reloadEvery.onReloadButton", false);
 
-// session manager pref
-pref("extensions.tabmix.sessionToolsMenu", true);
-pref("extensions.tabmix.closedWinToolsMenu", false);
-
-pref("extensions.tabmix.sessions.crashRecovery", false);
-pref("extensions.tabmix.sessions.manager", false);
-pref("extensions.tabmix.sessions.restore.concatenate", false);
-pref("extensions.tabmix.sessions.restore.overwritetabs", true);
-pref("extensions.tabmix.sessions.restore.overwritewindows", true);
-pref("extensions.tabmix.sessions.restore.reloadall", false);
-pref("extensions.tabmix.sessions.restore.saveoverwrite", true);
-pref("extensions.tabmix.sessions.save.closedtabs", false);
-pref("extensions.tabmix.sessions.save.history", true);
-pref("extensions.tabmix.sessions.save.permissions", true);
-pref("extensions.tabmix.sessions.save.selectedtab", true);
-pref("extensions.tabmix.sessions.save.scrollposition", true);
-pref("extensions.tabmix.sessions.save.locked", true);
-pref("extensions.tabmix.sessions.save.protected", true);
-pref("extensions.tabmix.sessions.menu.showext", true);
-pref("extensions.tabmix.sessions.onClose", 0);
-pref("extensions.tabmix.sessions.onStart", 2);
-pref("extensions.tabmix.sessions.onStart.askifempty", true);
-pref("extensions.tabmix.sessions.onStart.loadsession", -1);
-pref("extensions.tabmix.sessions.onStart.sessionpath", "");
-pref("extensions.tabmix.sessions.onStart.restorePinned", true);
-// pref("extensions.tabmix.sessions.version", ""); removed on 2013-02-05 - not in use
-
 pref("extensions.tabmix.autoReloadContent", true);
 pref("extensions.tabmix.autoReloadMenu", false);
 pref("extensions.tabmix.custom_reload_list", "");
 pref("extensions.tabmix.reload_time", 60);
 pref("extensions.tabmix.reload_match_address", false);
-// The maximum number of daily sessions backups to
-// keep in <profile>/sessionbackups. Special values:
-// -1: unlimited
-//  0: no backups created (and deletes all existing backups)
-pref("extensions.tabmix.sessions.max_backups", 7);
 
 // removed from Firefox 4.0+, some other extensions may use this pref
 pref("browser.tabs.tabMinWidth", 100);
diff --git a/addon/modules/AutoReload.sys.mjs b/addon/modules/AutoReload.sys.mjs
index 3df89320e..9e2ecd50e 100644
--- a/addon/modules/AutoReload.sys.mjs
+++ b/addon/modules/AutoReload.sys.mjs
@@ -238,9 +238,7 @@ export const AutoReload = {
 
   _update(aTab, aValue) {
     _setItem(aTab, "reload-data", aValue);
-    let win = aTab.ownerGlobal;
     TabmixSvc.setCustomTabValue(aTab, "reload-data", aValue);
-    win.TabmixSessionManager.updateTabProp(aTab);
   },
 
   /**
diff --git a/addon/modules/Decode.sys.mjs b/addon/modules/Decode.sys.mjs
deleted file mode 100644
index 6357c3a4e..000000000
--- a/addon/modules/Decode.sys.mjs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    The escape and unescape functions are deprecated we use encodeURI and decodeURI instead.
-    we use this code only for the case that old escape string was left unused after
-    unescape was removed.
-
-    use unescape if exist, if removed from firefox we use our own function
-*/
-export const Decode = {
-  escape(str) {
-    // we always use encodeURI
-    return encodeURI(str);
-    // let self = this;
-    // return str.replace(/[^\w @\*\-\+\.\/]/g, function(aChar) {return self._(aChar);});
-    // return str.replace(/[^\w @\*\-\+\.\/]/g, getReturnValue);
-  },
-  unescape(str) {
-    if (typeof unescape == "function")
-      return unescape(str);
-
-    //    let self = this;
-    //    return str.replace(/%(u[\da-f]{4}|[\da-f]{2})/gi, function(seq) {return self._(seq);});
-    return str.replace(/%(u[\da-f]{4}|[\da-f]{2})/gi, getReturnValue);
-  }
-};
-
-var escapeHash = {};
-
-function getReturnValue(input) {
-  var ret = escapeHash[input];
-  if (!ret) {
-    if (input.length - 1) {
-      let code = parseInt(input.substring(input.length - 3 ? 2 : 1), 16);
-      ret = fixedFromCharCode(code);
-    } else {
-      let code = input.charCodeAt(0);
-      ret = code < 256 ?
-        "%" + ("0" + code.toString(16)).slice(-2).toUpperCase() :
-        "%u" + ("000" + code.toString(16)).slice(-4).toUpperCase();
-    }
-    escapeHash[ret] = input;
-    escapeHash[input] = ret;
-  }
-  return ret;
-}
-
-/* from https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/fromCharCode
-* String.fromCharCode() alone cannot get the character at such a high code point
-* The following, on the other hand, can return a 4-byte character as well as the
-*   usual 2-byte ones (i.e., it can return a single character which actually has
-*   a string length of 2 instead of 1!)
-*/
-function fixedFromCharCode(codePt) {
-  if (codePt > 0xFFFF) {
-    codePt -= 0x10000;
-    return String.fromCharCode(0xD800 + (codePt >> 10), 0xDC00 + (codePt & 0x3FF));
-  }
-  return String.fromCharCode(codePt);
-}
diff --git a/addon/modules/RenameTab.sys.mjs b/addon/modules/RenameTab.sys.mjs
index 9550c2aeb..dd9c5d23d 100644
--- a/addon/modules/RenameTab.sys.mjs
+++ b/addon/modules/RenameTab.sys.mjs
@@ -143,7 +143,6 @@ export const RenameTab = {
     win.Tabmix.setItem(tab, "label-uri", url);
     TabmixSvc.setCustomTabValue(tab, "fixed-label", resetDefault ? null : label);
     TabmixSvc.setCustomTabValue(tab, "label-uri", url);
-    win.TabmixSessionManager.updateTabProp(tab);
 
     if (tab.label != label) {
       delete tab._labelIsInitialTitle;
diff --git a/addon/modules/Shortcuts.sys.mjs b/addon/modules/Shortcuts.sys.mjs
index 248c11940..caf218cb9 100644
--- a/addon/modules/Shortcuts.sys.mjs
+++ b/addon/modules/Shortcuts.sys.mjs
@@ -1,12 +1,6 @@
 import {TabmixSvc} from "chrome://tabmix-resource/content/TabmixSvc.sys.mjs";
 import {AppConstants} from "resource://gre/modules/AppConstants.sys.mjs";
 
-const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  //
-  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-});
-
 const NS_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 var KeyConfig;
@@ -47,20 +41,6 @@ export const Shortcuts = {
       }
     },
     ucatab: {command: 13},
-    saveWindow: {
-      id: "key_tm_sm_saveone",
-      useInMenu: true,
-      default: "VK_F1 accel",
-      sessionKey: true,
-      command: "TabmixSessionUtils:SaveThisWindow"
-    },
-    saveSession: {
-      id: "key_tm_sm_saveone",
-      useInMenu: true,
-      default: "VK_F9 accel",
-      sessionKey: true,
-      command: "TabmixSessionUtils:SaveAllWindow"
-    },
     switchToLast: {command: 32},
     slideShow: {
       id: "key_tm_slideShow",
@@ -133,8 +113,6 @@ export const Shortcuts = {
         removeleft="&clicktab.removetoLeft;"
         removeright="&clicktab.removetoRight;"
         ucatab="&clicktab.ucatab;"
-        saveWindow="&saveWindow.label;"
-        saveSession="&saveAllWindows.label;"
         switchToLast="&shortcuts.switchToLast;"
         slideShow="&shortcuts.slideshow;"
         toggleFLST="&shortcuts.toggleFLST;"
@@ -215,7 +193,6 @@ export const Shortcuts = {
     }
 
     this.prefs.addObserver("shortcuts", this);
-    this.prefs.addObserver("sessions.manager", this);
     Services.obs.addObserver(this, "quit-application");
   },
 
@@ -226,7 +203,6 @@ export const Shortcuts = {
         break;
       case "quit-application":
         this.prefs.removeObserver("shortcuts", this);
-        this.prefs.removeObserver("sessions.manager", this);
         Services.obs.removeObserver(this, "quit-application");
         if (this.keyConfigInstalled)
           KeyConfig.deinit();
@@ -236,9 +212,9 @@ export const Shortcuts = {
 
   onPrefChange: function TMP_SC_onPrefChange(aData) {
     try {
-      if (this.updatingShortcuts ||
-          aData != "shortcuts" && aData != "sessions.manager")
+      if (this.updatingShortcuts || aData != "shortcuts") {
         return;
+      }
       this.updatingShortcuts = true;
       // instead of locking the preference just revert any changes user made
       if (aData == "shortcuts" && !this.prefsChangedByTabmix) {
@@ -350,8 +326,6 @@ export const Shortcuts = {
     let document = aWindow.document;
     let keyset = document.getElementById("mainKeyset");
     let keyAtt = this.keyParse(aKeyData.value || "d&");
-    if (aKeyData.sessionKey && aKeyData.blocked)
-      keyAtt.disabled = true;
     let disabled = keyAtt.disabled;
     let id = aKeyData.id || "key_tm_" + aKey;
     let keyItem = document.getElementById(id);
@@ -413,24 +387,17 @@ export const Shortcuts = {
 
   _getChangedKeys: function TMP_SC__getChangedKeys(aOptions) {
     let shortcuts = !aOptions.onChange && this.prefBackup || this._getShortcutsPref();
-    let disableSessionKeys = lazy.PrivateBrowsingUtils.permanentPrivateBrowsing ||
-        !this.prefs.getBoolPref("sessions.manager");
     let changedKeys = {}, onOpen = aOptions.onOpen;
     for (let key of Object.keys(this.keys)) {
       let keyData = this.keys[key];
       let _default = keyData.default || "";
       let currentValue = onOpen ? _default : keyData.value;
       let newValue = shortcuts[key] || _default;
-      let updateBlockState = keyData.sessionKey && !/^d&/.test(newValue) &&
-          (onOpen ? disableSessionKeys :
-            disableSessionKeys != keyData.blocked);
-      if (keyData.sessionKey)
-        keyData.blocked = disableSessionKeys;
       // on start report all tabmix keys and disabled by default shortcut as
       // changed so _updateKey can move these shortcuts to removedShortcuts
       if (!keyData.reserved &&
           (onOpen && keyData.id?.startsWith("key_tm") || currentValue != newValue ||
-          updateBlockState || onOpen && /^d&/.test(_default))) {
+          onOpen && /^d&/.test(_default))) {
         keyData.value = newValue;
         changedKeys[key] = keyData;
       }
diff --git a/addon/modules/TabmixSvc.sys.mjs b/addon/modules/TabmixSvc.sys.mjs
index f829431e3..19485233b 100644
--- a/addon/modules/TabmixSvc.sys.mjs
+++ b/addon/modules/TabmixSvc.sys.mjs
@@ -41,25 +41,10 @@ export const TabmixSvc = {
     }
   },
 
-  getSMString(aStringKey) {
-    try {
-      return this.SMstrings.GetStringFromName(aStringKey);
-    } catch (e) {
-      dump("*** Failed to get string " + aStringKey + " in bundle: session-manager.properties\n");
-      throw e;
-    }
-  },
-
   setLabel(property) {
-    var label, key;
-    if (property.startsWith("sm.")) {
-      label = this.getSMString(property + ".label");
-      key = this.getSMString(property + ".accesskey");
-    } else {
-      label = this.getString(property + ".label");
-      key = this.getString(property + ".accesskey");
-    }
-    var accessKeyIndex = label.toLowerCase().indexOf(key.toLowerCase());
+    let label = this.getString(property + ".label");
+    const key = this.getString(property + ".accesskey");
+    const accessKeyIndex = label.toLowerCase().indexOf(key.toLowerCase());
     if (accessKeyIndex > -1)
       label = label.substr(0, accessKeyIndex) + "&" + label.substr(accessKeyIndex);
     return label;
@@ -217,14 +202,6 @@ export const TabmixSvc = {
     lastSessionPath: null,
     status: "",
     crashed: false,
-    get sanitized() {
-      delete this.sanitized;
-      return (this.sanitized = TabmixSvc.prefBranch.prefHasUserValue("sessions.sanitized"));
-    },
-    set sanitized(val) {
-      delete this.sanitized;
-      this.sanitized = val;
-    },
     private: true,
     settingPreference: false,
     statesToRestore: {},
@@ -264,10 +241,6 @@ ChromeUtils.defineLazyGetter(TabmixSvc, "_strings", () => {
   let properties = "chrome://tabmixplus/locale/tabmix.properties";
   return Services.strings.createBundle(properties);
 });
-ChromeUtils.defineLazyGetter(TabmixSvc, "SMstrings", () => {
-  let properties = "chrome://tabmixplus/locale/session-manager.properties";
-  return Services.strings.createBundle(properties);
-});
 
 ChromeUtils.defineLazyGetter(lazy, "Platform", () => {
   return AppConstants.platform;
diff --git a/addon/modules/Utils.sys.mjs b/addon/modules/Utils.sys.mjs
index be01dcb15..e282ce7f7 100644
--- a/addon/modules/Utils.sys.mjs
+++ b/addon/modules/Utils.sys.mjs
@@ -2,7 +2,6 @@
 // Messages that will be received via the Frame Message Manager.
 const FMM_MESSAGES = [
   "Tabmix:restorePermissionsComplete",
-  "Tabmix:updateScrollPosition",
   "Tabmix:reloadTab",
   "Tabmix:getOpener",
   "Tabmix:contentDrop",
@@ -41,11 +40,6 @@ export const TabmixUtils = {
       case "Tabmix:restorePermissionsComplete":
         lazy.DocShellCapabilities.update(browser, message.data);
         break;
-      case "Tabmix:updateScrollPosition":
-        win = browser.ownerGlobal;
-        tab = win.gBrowser.getTabForBrowser(browser);
-        win.TabmixSessionManager.updateScrollPosition(tab, message.data.scroll);
-        break;
       case "Tabmix:reloadTab": {
         let postData = message.data.postData;
         if (postData)
diff --git a/addon/modules/bootstrap/ScriptsLoader.sys.mjs b/addon/modules/bootstrap/ScriptsLoader.sys.mjs
index b049780a2..0c9a6da48 100644
--- a/addon/modules/bootstrap/ScriptsLoader.sys.mjs
+++ b/addon/modules/bootstrap/ScriptsLoader.sys.mjs
@@ -47,7 +47,6 @@ const SCRIPTS = [
   "chrome://tabmixplus/content/flst/lasttab.js",
   "chrome://tabmixplus/content/click/click.js",
   "chrome://tabmixplus/content/places/places.js",
-  "chrome://tabmixplus/content/session/session.js",
   "chrome://tabmixplus/content/session/sessionStore.js",
   "chrome://tabmixplus/content/extensions/extensions.js",
   "chrome://tabmixplus/content/tab/tabsBindings.js",
diff --git a/addon/modules/extensions/AddonManager.sys.mjs b/addon/modules/extensions/AddonManager.sys.mjs
index 45bd90a18..00c8ffae4 100644
--- a/addon/modules/extensions/AddonManager.sys.mjs
+++ b/addon/modules/extensions/AddonManager.sys.mjs
@@ -9,31 +9,6 @@ const GOOGLE_REGEXP = /http(s)?:\/\/((www|encrypted|news|images)\.)?google\.(.*?
 const GOOGLE_IMGRES_REGEXP = /http(s)?:\/\/(.*?\.)?google\.(.*?)\/imgres\?/;
 const GOOGLE_PLUS_REGEXP = /http(s)?:\/\/plus.url.google.com\/url\?/;
 
-// https://addons.mozilla.org/en-US/firefox/addon/tab-groups-panorama/
-// check if TabView exist in a window and update our code if not initialized
-// since more than one extension can replace panorama we check if we need to
-// update the code after every extensions change
-var TabGroups = {
-  tabViewState: false,
-  isUpdateNeeded() {
-    let win = TabmixSvc.topWin();
-    let needUpdate = typeof win.TabView == "object" &&
-        !win.TabView.hasOwnProperty("tabmixInitialized");
-    let currentState = this.tabViewState;
-    this.tabViewState = needUpdate;
-    return needUpdate && !currentState;
-  },
-  onEnabled() {
-    if (this.isUpdateNeeded()) {
-      TabmixSvc.forEachBrowserWindow(aWindow => {
-        aWindow.TMP_TabView.init();
-      });
-    }
-  },
-  onDisabled() {
-  },
-};
-
 // https://addons.mozilla.org/en-US/firefox/addon/google-no-tracking-url/
 var GoogleNoTrackingUrl = {
   id: "jid1-zUrvDCat3xoDSQ@jetpack",
@@ -70,21 +45,6 @@ var PrivateTab = {
   }
 };
 
-// noinspection SpellCheckingInspection
-const SMID = "{1280606b-2510-4fe0-97ef-9b5a22eafe30}";
-var SessionManager = {
-  id: SMID,
-  init() {
-    TabmixSvc.sessionManagerAddonInstalled = true;
-  },
-  onEnabled() {
-    TabmixSvc.sessionManagerAddonInstalled = true;
-  },
-  onDisabled() {
-    TabmixSvc.sessionManagerAddonInstalled = false;
-  },
-};
-
 var Glitter = {
   id: "glitterdrag@harytfw",
   onEnabled() {
@@ -97,28 +57,20 @@ var Glitter = {
 
 var TabmixListener = {
   init(id) {
-    if (id == SessionManager.id) {
-      SessionManager.init();
-    } else if (id == GoogleNoTrackingUrl.id) {
+    if (id == GoogleNoTrackingUrl.id) {
       GoogleNoTrackingUrl.onEnabled();
     } else if (id == Glitter.id) {
       Glitter.onEnabled();
-    } else {
-      TabGroups.onEnabled();
     }
   },
   onChange(aAddon, aAction) {
     let id = aAddon.id;
-    if (id == SessionManager.id) {
-      SessionManager[aAction]();
-    } else if (id == PrivateTab.id) {
+    if (id == PrivateTab.id) {
       PrivateTab[aAction]();
     } else if (id == GoogleNoTrackingUrl.id) {
       GoogleNoTrackingUrl[aAction]();
     } else if (id == Glitter.id) {
       Glitter[aAction]();
-    } else {
-      TabGroups[aAction]();
     }
   },
   onEnabled(aAddon) {
diff --git a/addon/modules/extensions/CompatibilityCheck.sys.mjs b/addon/modules/extensions/CompatibilityCheck.sys.mjs
index dcb8d75a8..96f681386 100644
--- a/addon/modules/extensions/CompatibilityCheck.sys.mjs
+++ b/addon/modules/extensions/CompatibilityCheck.sys.mjs
@@ -10,13 +10,6 @@
  *                   code modified by onemen 2010-03-22 - work with new AddonManager for firefox 4.0
  */
 
-const TMP_BUTTON_CANCEL = 1;
-const TMP_BUTTON_EXTRA1 = 2;
-const TMP_HIDE_MENUANDTEXT = 2;
-const TMP_CHECKBOX_UNCHECKED = 0;
-const TMP_CHECKBOX_CHECKED = 1;
-const TMP_HIDE_CHECKBOX = 2;
-
 import {TabmixSvc} from "chrome://tabmix-resource/content/TabmixSvc.sys.mjs";
 import {AddonManager} from "resource://gre/modules/AddonManager.sys.mjs";
 
@@ -87,64 +80,69 @@ CompatibilityCheck.prototype = {
       this.dialogCallback(emptyList);
   },
 
-  warnAboutIncompatible: function TMP_EX_warnAboutIncompatible() {
-    var list = this.list;
+  async warnAboutIncompatible() {
+    const list = this.list;
     try {
       list.sort();
     } catch {}
 
-    var outStr = "";
+    let outStr = "";
     for (let i = 0; i < list.length; i++) {
       let name = list[i]._name;
       name = name.charAt(0).toUpperCase() + name.substr(1);
       outStr += " - " + name + " " + list[i]._version + "\n";
     }
 
-    var showatStart = TabmixSvc.prefBranch.getBoolPref("disableIncompatible");
-    var chkBoxState = showatStart ? TMP_CHECKBOX_CHECKED : TMP_CHECKBOX_UNCHECKED;
-
-    var title = TabmixSvc.getString("incompatible.title");
-    var msg = TabmixSvc.getString("incompatible.msg0") + "\n" +
+    const showatStart = TabmixSvc.prefBranch.getBoolPref("disableIncompatible");
+    const chkBoxState = {value: showatStart};
+    const title = TabmixSvc.getString("incompatible.title");
+    const msg = TabmixSvc.getString("incompatible.msg0") + "\n" +
               TabmixSvc.getString("incompatible.msg1") + "\n\n" + outStr + "\n\n";
-    var chkBoxLabel = TabmixSvc.getString("incompatible.chkbox.label");
-    var buttons = [TabmixSvc.setLabel("incompatible.button0"),
-      TabmixSvc.setLabel("incompatible.button1")];
-    buttons.push(TabmixSvc.setLabel("incompatible.button2"));
-
-    // make promptService non modal on startup
-    var self = this;
-    var callBack = this.callbackDialog ? null :
-      function(aResult) {
-        aResult.showatStart = showatStart;
-        self.promptCallBack(aResult);
-      };
-    var result = this.window.Tabmix.promptService([TMP_BUTTON_EXTRA1, TMP_HIDE_MENUANDTEXT, chkBoxState],
-      [title, msg, "", chkBoxLabel, buttons.join("\n")], this.window, callBack);
-    if (!callBack)
-      this.promptCallBack(result);
+    const chkBoxLabel = TabmixSvc.getString("incompatible.chkbox.label");
+    const buttonFlags = Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +
+      Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_IS_STRING +
+      Services.prompt.BUTTON_POS_2 * Services.prompt.BUTTON_TITLE_IS_STRING +
+      Services.prompt.BUTTON_POS_2_DEFAULT;
+
+    const tabBrowser = this.window.gBrowser ?? this.window.opener.gBrowser;
+    const result = await Services.prompt.asyncConfirmEx(
+      tabBrowser.browsingContext, // browsingContext,
+      Ci.nsIPromptService.MODAL_TYPE_WINDOW, // modalType
+      title, // title
+      msg, // list of extensions
+      buttonFlags,
+      TabmixSvc.setLabel("incompatible.button0"), // button 0 label
+      TabmixSvc.setLabel("incompatible.button1"), // button 1 label
+      TabmixSvc.setLabel("incompatible.button2"), // button 2 label
+      chkBoxLabel, // checkbox label
+      chkBoxState // checkbox initial state
+    );
+    this.promptCallBack({
+      button: result.getProperty("buttonNumClicked"),
+      checked: result.getProperty("checked"),
+      showatStart,
+    });
   },
 
-  // we use non modal promptService on startup
-  promptCallBack: function TMP_EX_promptCallBack(aResult) {
+  async promptCallBack(aResult) {
     if (aResult.checked != aResult.showatStart) {
       TabmixSvc.prefBranch.setBoolPref("disableIncompatible", aResult.checked);
       Services.prefs.savePrefFile(null); // store the pref immediately
     }
 
     if (aResult.button != this.CANCEL) {
-      this.doDisable();
+      await this.disableExtensions();
       this.restart(aResult.button == this.DISABLE_AND_RESTART);
       this.dialogCallback(true); // we don't need this on startup
     }
   },
 
-  doDisable: function TMP_EX_doDisable() {
-    var list = this.list;
-    list.forEach(aAddonToDisable => {
-      AddonManager.getAddonByID(aAddonToDisable.id).then(aAddon => {
-        aAddon.userDisabled = true;
-      });
+  async disableExtensions() {
+    const promises = this.list.map(async({id}) => {
+      const addon = await AddonManager.getAddonByID(id);
+      await addon.disable();
     });
+    await Promise.all(promises);
   },
 
   restart: function TMP_EX_restart(aRestart) {
@@ -152,15 +150,6 @@ CompatibilityCheck.prototype = {
       var appStartup = Ci.nsIAppStartup;
       Cc["@mozilla.org/toolkit/app-startup;1"]
           .getService(appStartup).quit(appStartup.eRestart | appStartup.eAttemptQuit);
-    } else {
-      let title = TabmixSvc.getString("incompatible.title");
-      let msg = TabmixSvc.getString("incompatible.msg2");
-      let button = TabmixSvc.setLabel("sm.button.continue");
-      let buttons = ["", button].join("\n");
-      // make it not modal on startup
-      let callBack = this.callbackDialog ? null : function() {/* nothing to do */};
-      this.window.Tabmix.promptService([TMP_BUTTON_CANCEL, TMP_HIDE_MENUANDTEXT, TMP_HIDE_CHECKBOX],
-        [title, msg, "", "", buttons], this.window, callBack);
     }
   },
 
diff --git a/addon/modules/extensions/TabGroupsManager.sys.mjs b/addon/modules/extensions/TabGroupsManager.sys.mjs
deleted file mode 100644
index 50f2e6576..000000000
--- a/addon/modules/extensions/TabGroupsManager.sys.mjs
+++ /dev/null
@@ -1,148 +0,0 @@
-
-/**
- * original code by onemen
- */
-
-export const TMP_TabGroupsManager = {
-  init: function TMP_TGM_init(aWindow) {
-    this.changeCode(aWindow.TMP_eventListener, "TMP_eventListener.onTabOpen")._replace(
-      /(})(\)?)$/,
-      '    try {\n' +
-      '      if (TabGroupsManager.apiEnabled)\n' +
-      '        TabGroupsManager.eventListener.onTabOpen(aEvent);\n' +
-      '    } catch(e) {Tabmix.log(e);}\n' +
-      '    $1$2'
-    ).toCode();
-
-    // we call TabGroupsManager.eventListener.onTabClose regardless of tab animations
-    this.changeCode(aWindow.TMP_eventListener, "TMP_eventListener.onTabClose")._replace(
-      'this.onTabClose_updateTabBar(tab);',
-      'try {TabGroupsManager.eventListener.onTabClose(aEvent);} catch(e) {Tabmix.log(e);}'
-    )._replace(
-      'gReduceMotion', 'true'
-    ).toCode();
-
-    this.changeCode(aWindow.TMP_tabDNDObserver, "TMP_tabDNDObserver.on_dragleave")._replace(
-      'if (target)',
-      'if (target && !(/^TabGroupsManager/.test(target.id)))'
-    ).toCode();
-
-    this.changeCode(aWindow.TMP_TabView, "TMP_TabView.checkTabs")._replace(
-      '!tab.collapsed',
-      '!tab.hidden && $&'
-    ).toCode();
-
-    // **************************** for Session Manager ****************************
-
-    this.changeCode(aWindow.TabmixSessionData, "TabmixSessionData.getTabProperties")._replace(
-      'return tabProperties;',
-      'if (aTab.group && aTab.group.id) \
-         tabProperties += " tabgroups-data=" + encodeURI(aTab.group.id + " " + aTab.group.name); \
-       $&'
-    )._replace(
-      'tabProperties += " hidden=" + aTab.hidden;',
-      '' // don't save hidden attribute when we use TGM
-    ).toCode();
-
-    let sessionManager = aWindow.TabmixSessionManager;
-    this.changeCode(sessionManager, "TabmixSessionManager.saveOneWindow")._replace(
-      'if (caller == "windowbackup")',
-      '  try{this.saveAllGroupsData(null, rdfNodeThisWindow);} catch(ex) {Tabmix.assert(ex);}' +
-      '  $&'
-    ).toCode();
-
-    /*
-      we have some compatibility issue if we let TabGroupsManager
-      listen to "SSTabRestoring", probably since TGM move tabs around
-      the fix is to call TGM.moveTabToGroupBySessionStore for each tab
-      after the tab restored by SessionStore
-    */
-    sessionManager._moveTabsToGroupByTGM = function(window, tabs) {
-      let sessionStore = window.SessionStore;
-      let TGM = window.TabGroupsManager.session;
-      for (let i = 0; i < tabs.length; i++) {
-        let tab = tabs[i];
-        let data = sessionStore.getTabValue(tab, "__tabmixTGM");
-        let [groupId, groupName] = data ? data.split(" ") : ["-1", ""];
-        sessionStore.setTabValue(tab, "TabGroupsManagerGroupId", groupId);
-        sessionStore.setTabValue(tab, "TabGroupsManagerGroupName", groupName);
-        sessionStore.deleteTabValue(tab, "__tabmixTGM");
-        TGM.moveTabToGroupBySessionStore(tab);
-      }
-    };
-
-    this.changeCode(sessionManager, "TabmixSessionManager.loadOneWindow")._replace(
-      // get saved group data and replace ids with new one
-      'var lastSelectedIndex = restoreSelect ? winData.selected - 1 : 0;',
-      '$&' +
-      '  var [_restoreSelect, _lastSelectedIndex] = [restoreSelect, lastSelectedIndex];' +
-      '  [restoreSelect, lastSelectedIndex] = [false, 0];' +
-      '  let jsonText = winData.extData && winData.extData.TabGroupsManagerAllGroupsData;' +
-      '  TabGroupsManager.session.groupRestored = 1;' +
-      '  if (jsonText) {' +
-      '    if ("__SSi" in window)' +
-      '      SessionStore.setWindowValue(window, "TabGroupsManagerAllGroupsData", decodeURI(jsonText));' +
-      '    TabGroupsManager.allGroups.loadAllGroupsData();' +
-      '  }'
-    )._replace(
-      // open new group and add new tabs to it
-      'else if (newtabsCount > 0 && !overwrite) {',
-      '$&' +
-      '  let newTab = TMP_addTab();' +
-      '  gBrowser.moveTabTo(newTab, gBrowser.tabs.length - 1);' +
-      '  gBrowser.selectedTab = newTab;' +
-      '  newIndex = newTab._tPos;' +
-      '  TabGroupsManager.allGroups.openNewGroupActive(newTab, -1);' +
-      '  for (let i = 1; i < newtabsCount; i++) {' +
-      '    TMP_addTab();' +
-      '  }' +
-      '}' +
-      'if (false) {'
-    )._replace(
-      'if ("tabmixdata" in window) {',
-      '  let isBlank = gBrowser.isBlankNotBusyTab(cTab);' +
-      '  if (_restoreSelect && (overwrite || !isBlank)) {' +
-      '    this.updateSelected(newIndex + _lastSelectedIndex, overwrite ||' +
-      '                        caller=="firstwindowopen" || caller=="windowopenedbytabmix");' +
-      '  }' +
-      '  $&'
-    )._replace(
-      'TabmixSvc.SessionStore[fnName](window, tabs, tabsData, 0);',
-      '$&\n' +
-      '      this._moveTabsToGroupByTGM(window, tabs);'
-    ).toCode();
-
-    // for TabGroupsManager use - don't change function name from tabmixSessionsManager
-    aWindow.TMP_TabGroupsManager = {};
-    aWindow.TMP_TabGroupsManager.tabmixSessionsManager = this.tabmixSessionsManager.bind(aWindow);
-    this.changeCode(this, "TMP_TabGroupsManager._saveAllGroupsData", {forceUpdate: true})
-        .toCode(false, aWindow.TabmixSessionManager, "saveAllGroupsData");
-  },
-
-  // for TabGroupsManager use - don't change function name
-  tabmixSessionsManager() {
-    // this here refers to the top browser window
-    if (!this.Tabmix.isFirstWindow || this.Tabmix._afterTabduplicated) {
-      return false;
-    }
-
-    return this.Tabmix.prefs.getBoolPref("sessions.manager") &&
-        (!this.Tabmix.isWindowAfterSessionRestore || "tabmixdata" in this);
-  },
-
-  // for TabGroupsManager use
-  _saveAllGroupsData(jsonText, windowNode) {
-    if (!this.enableBackup && !windowNode)
-      return;
-    try {
-      let value = jsonText || window.SessionStore.getWindowValue(window, "TabGroupsManagerAllGroupsData");
-      if (!windowNode)
-        windowNode = this.gThisWin;
-      this.setLiteral(windowNode, "tgm_jsonText", encodeURI(value));
-      this.saveStateDelayed();
-    } catch (ex) {
-      window.Tabmix.assert(ex);
-    }
-  }
-
-};
diff --git a/config/eslint-plugin-tabmix/index.js b/config/eslint-plugin-tabmix/index.js
index 1e5a9df38..b152b1f91 100644
--- a/config/eslint-plugin-tabmix/index.js
+++ b/config/eslint-plugin-tabmix/index.js
@@ -45,8 +45,6 @@ export default {
       TabmixChromeUtils: true,
       TabmixContext: true,
       TabmixProgressListener: true,
-      TabmixSessionData: true,
-      TabmixSessionManager: true,
       TabmixSvc: true,
       TabmixTabbar: true,
       TabmixTabClickOptions: true,
@@ -58,7 +56,6 @@ export default {
       TMP_Places: true,
       TMP_SessionStore: true,
       TMP_tabDNDObserver: true,
-      TMP_TabView: true,
       TMP_undocloseTabButtonObserver: true,
     },
     preferences: {
@@ -78,12 +75,6 @@ export default {
       TabmixChromeUtils: true,
       TabmixSvc: false,
     },
-    dialog: {
-      centerWindowOnScreen: false,
-      moveToAlertPosition: false,
-      Tabmix: false,
-      TabmixSvc: false,
-    },
   },
   rules: {
     "import-globals": importGlobals,
diff --git a/eslint.config.js b/eslint.config.js
index a839c6195..1e2effd31 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -331,12 +331,6 @@ export default [
     },
   },
 
-  {
-    name: "tabmix/dialogs-globals",
-    files: ["addon/chrome/content/dialogs/**"],
-    languageOptions: {globals: tabmixGlobals.dialog},
-  },
-
   {
     name: "tabmix/overlay-and-scripts-globals",
     files: ["addon/chrome/content/overlay/**", "addon/chrome/content/scripts/**"],
diff --git a/types/addon.d.ts b/types/addon.d.ts
index 0480c8925..d645e0f69 100644
--- a/types/addon.d.ts
+++ b/types/addon.d.ts
@@ -106,7 +106,6 @@ interface Window {
     readonly sidebarVerticalTabsEnabled: boolean;
   };
   Tabmix: typeof TabmixNS;
-  TabmixSessionManager: TabmixSessionManager;
   TMP_Places: TabmixPlaces;
   URILoadingHelper: {
     getTargetWindow(window: Window, {skipPopups, forceNonPrivate}?: {skipPopups?: boolean; forceNonPrivate?: boolean}): Window | null;
@@ -626,8 +625,6 @@ declare namespace TabmixSessionStoreNS {
   function getTitleFromTabState(aTab: Tab): string;
   function getUrlFromTabState(aTab: Tab): string;
   function isBlankPendingTab(aTab: Tab): boolean;
-  function setService(msgNo: number, start: boolean): void;
-  function isSessionStoreEnabled(): boolean;
   let afterSwitchThemes: boolean;
   function setAfterSessionRestored(): void;
   function setSessionRestore(aEnable: boolean): void;
@@ -703,21 +700,6 @@ declare namespace TabmixProgressListenerNS {
   const listener: typeof TabWebProgressListener;
 }
 
-declare namespace TabmixTabViewNS {
-  let subScriptLoaded: boolean;
-  function init(): void;
-  const installed: boolean;
-  function exist(id: string): boolean;
-  function checkTabs(tabs: Tab[]): Tab | undefined;
-  function currentGroup(): Tab[];
-  function getTabPosInCurrentGroup(aTab: Tab): number;
-  function getIndexInVisibleTabsFromTab(aTab: Tab): number;
-
-  // from tabView.js
-  function _patchBrowserTabview(): void;
-  function _resetTabviewFrame(): void;
-}
-
 declare namespace UndocloseTabButtonObserverNS {
   type TabDragEvent = Omit<DragEvent, "target"> & {target: HTMLButtonElement};
   function onDragOver(aEvent: TabDragEvent): boolean;
@@ -738,7 +720,6 @@ type TabmixProgressListener = typeof TabmixProgressListenerNS;
 type TabmixSessionStore = typeof TabmixSessionStoreNS;
 type TabmixTabbar = typeof TabmixTabbarNS & {_failedToEnterVerticalMode?: boolean};
 type TabmixTabClickOptions = typeof TabmixTabClickOptionsNS;
-type TabmixTabView = typeof TabmixTabViewNS;
 type UndocloseTabButtonObserver = typeof UndocloseTabButtonObserverNS;
 
 // this namespace is for all SessionStore useage in Tabmix
@@ -806,6 +787,7 @@ declare namespace SessionStoreNS {
     function forgetClosedWindow(aIndex: number): void;
     function getClosedTabCount(aOptions?: WindowSource): number;
     function getClosedTabCountForWindow(aWindow: Window): number;
+    function getClosedTabCountFromClosedWindows(): number;
     function getClosedTabData(aOptions?: WindowSource): ClosedTabData[];
     /** @deprecated - use getClosedTabData with aOptions?: Source since Firefox 117 */
     function getClosedTabData(aWindow: Window, aAsString: boolean): ClosedTabData[];
@@ -925,32 +907,6 @@ interface QuerySelectorMap {
   ".panel-subview-body": ClosedObjectsUtils.PopupElement;
 }
 
-interface TabmixSessionManager {
-  canRestoreLastSession: boolean;
-  disableSessionManager: boolean;
-  enableManager: boolean;
-  firstNonPrivateWindow: boolean;
-  notifyObservers: boolean;
-  isPrivateWindow: boolean;
-  windowClosed: boolean;
-  init: () => void;
-  initializePrivateStateVars: () => void;
-  onWindowClose: (isLastWindow: boolean) => void;
-  overrideHomepage: string | nsIArray | Tab | null;
-  privateTabChanged: (event: TabmixEventListenerNS.TabEvent) => void;
-  restoreLastSession: () => void;
-  sessionUtil: (action: string, what: string, sessionPath?: string) => void;
-  tabClosed: (tab: Tab) => void;
-  tabMoved: (aTab: Tab, oldPos: number, newPos: number) => void;
-  tabSelected: (needFlush: boolean) => void;
-  tabLoaded: (tab: Tab) => void;
-  shutDown: (aCanClose: boolean, aLastWindow: boolean, aSaveSession: boolean, aRemoveClosedTabs?: boolean, aKeepClosedWindows?: boolean, _flush?: boolean) => void;
-  updateTabProp: (aTab: Tab) => void;
-}
-interface TabmixSessionData {
-  getTabValue<T extends boolean | undefined = undefined>(tab: Tab, id: string, parse?: T): T extends true ? Record<string, unknown> : string;
-}
-
 /** globals installed by extensions */
 declare var colorfulTabs: Window["colorfulTabs"];
 declare var privateTab: Window["privateTab"];
diff --git a/types/autoReload.d.ts b/types/autoReload.d.ts
index cafd83d5a..d3497f59f 100644
--- a/types/autoReload.d.ts
+++ b/types/autoReload.d.ts
@@ -2,6 +2,8 @@
 
 declare var gNumberInput: typeof NumberInput;
 
+interface DocumentElement extends Omit<HTMLDialogElement, "addEventListener" | "removeEventListener"> {}
+
 interface GetByMap {
   autoreload_minutes: HTMLNumberInputElement;
   autoreload_seconds: HTMLNumberInputElement;
@@ -12,3 +14,7 @@ interface GetClosestMap {
   ".combined-element": HTMLElement & {firstChild: HTMLNumberInputElement};
   ".container": HTMLElement;
 }
+
+interface WindowProxy {
+  arguments: any[];
+}
diff --git a/types/custom.gecko.dom.d.ts b/types/custom.gecko.dom.d.ts
index fb128bcbd..84bcf7bb7 100644
--- a/types/custom.gecko.dom.d.ts
+++ b/types/custom.gecko.dom.d.ts
@@ -182,7 +182,3 @@ interface JSWindowActorChild {
   onProcessedClick: (json: Params) => void;
   seenTabIcon: boolean;
 }
-
-interface mozIDOMWindowProxy {
-  _callBackFunction?: (data: {button: number; checked: boolean; label: string; value: number}) => void;
-}
diff --git a/types/customDialog.d.ts b/types/customDialog.d.ts
deleted file mode 100644
index 8bbb716d1..000000000
--- a/types/customDialog.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-interface Element {
-  getButton(buttonId: string): HTMLButtonElement;
-  set defaultButton(buttonId: string);
-  get defaultButton(): string;
-  label: string;
-}
-
-interface HTMLMenuElement {
-  selectedItem: HTMLElement;
-  readonly defaultIndex: number;
-  set selectedIndex(value: number);
-  get selectedIndex(): number;
-}
-
-declare function moveToAlertPosition(): void;
-declare function centerWindowOnScreen(): void;
-
-interface Window {
-  arguments: any[];
-  _callBackFunction?: (data: {button: number; checked: boolean; label: string; value: number}) => void;
-}
-
-interface GetByMap {
-  checkboxContainer: HTMLElement;
-  space_before_checkbox: HTMLElement;
-  tm_info: HTMLElement;
-  tm_checkbox: HTMLInputElement;
-  tm_prompt: HTMLMenuElement & {selectedItem: HTMLElement & {session?: string; fileName: string; value: string}};
-  tm_prompt_menu: XULPopupElement;
-  tm_textbox: HTMLInputElement;
-}
diff --git a/types/extraTabmixUtils.d.ts b/types/extraTabmixUtils.d.ts
index fc77f74b0..c882e8fd9 100644
--- a/types/extraTabmixUtils.d.ts
+++ b/types/extraTabmixUtils.d.ts
@@ -92,7 +92,7 @@ declare namespace TabmixNS {
   let contentAreaClick: typeof ContentAreaClick;
 
   // extensions.js
-  let extensions: {treeStyleTab: boolean; tabGroupManager: boolean; verticalTabs: boolean; verticalTabBar: boolean; ieTab2: boolean; gIeTab: false | {obj: "gIeTab2" | "gIeTab"; folder: "ietab2" | "ietab"}; sessionManager: boolean};
+  let extensions: {treeStyleTab: boolean; tabGroupManager: boolean; verticalTabs: boolean; verticalTabBar: boolean; ieTab2: boolean; gIeTab: false | {obj: "gIeTab2" | "gIeTab"; folder: "ietab2" | "ietab"}};
 
   // lasttab.js
   let keyModifierDown: boolean;
@@ -112,18 +112,11 @@ declare namespace TabmixNS {
   let onContentLoaded: typeof OnContentLoaded;
   function whereToOpenLink(event: MouseEvent, ignoreButton: boolean, ignoreAlt: boolean): WhereToOpen;
 
-  // session.js
-  const BUTTON_OK: number;
-  const CHECKBOX_CHECKED: number;
-  const HIDE_CHECKBOX: number;
-  const HIDE_MENUANDTEXT: number;
-
   // sessionStore.js
   let closedObjectsUtils: typeof ClosedObjectsUtils;
   let isWindowAfterSessionRestore: boolean;
 
   // setup.js
-  function _updateCloseButtons(this: MockedGeckoTypes.TabContainer, skipUpdateScrollStatus: boolean, aUrl?: string | null): void;
   function beforeStartup(tabBrowser: MockedGeckoTypes.TabBrowser, aTabContainer: MockedGeckoTypes.TabContainer): void;
   function beforeBrowserInitOnLoad(): void;
   function BrowserOpenTab(): void;
@@ -451,7 +444,6 @@ declare namespace Tablib {
   function addNewFunctionsTo_gBrowser(): void;
   function getTabTitle(aTab: Tab, url: string): boolean;
   function onTabTitleChanged(aTab: Tab, aBrowser: Browser, isUrlTitle?: boolean): void;
-  function onRemoveTab(tab: Tab): void;
   function closeLastTab(): void;
   function whereToOpenDrop(aEvent: MouseEvent | DragEvent, aUri: string): string;
   function setURLBarFocus(): void;
diff --git a/types/gecko/tools/index.d.ts b/types/gecko/tools/index.d.ts
index 1d5d9a74d..9ac440e6f 100644
--- a/types/gecko/tools/index.d.ts
+++ b/types/gecko/tools/index.d.ts
@@ -14,6 +14,11 @@
 /// Order of references matters here, for overriding type signatures.
 /// <reference types="./lib.gecko.tweaks.d.ts" />
 
+/// Substitutions for modules that can't be referenced directly from source.
+declare module "resource://gre/modules/AppConstants.sys.mjs" {
+  const AppConstants: typeof import("./substitutions/AppConstants.sys.d.mts").AppConstants;
+}
+
 declare global {
   const Cc: nsXPCComponents_Classes;
   const Ci: nsIXPCComponents_Interfaces;
diff --git a/types/gecko/tools/lib.gecko.dom.d.ts b/types/gecko/tools/lib.gecko.dom.d.ts
index 3b816226f..56ac92521 100644
--- a/types/gecko/tools/lib.gecko.dom.d.ts
+++ b/types/gecko/tools/lib.gecko.dom.d.ts
@@ -13,6 +13,7 @@
 interface Principal extends nsIPrincipal {}
 interface URI extends nsIURI {}
 interface WindowProxy extends Window {}
+interface MozChannel extends nsIChannel {}
 
 type HTMLCollectionOf<T> = any;
 type IsInstance<T> = (obj: any) => obj is T;
@@ -865,11 +866,6 @@ interface FileInfo {
     type?: FileType;
 }
 
-interface FileNameTypeDetails {
-    fileNameDetails?: string;
-    fileNameType: string;
-}
-
 interface FilePropertyBag extends BlobPropertyBag {
     lastModified?: number;
 }
@@ -2773,7 +2769,6 @@ interface ProcessActorOptions {
 
 interface ProcessActorSidedOptions {
     esModuleURI?: string;
-    moduleURI?: string;
 }
 
 interface ProfilerMarkerOptions {
@@ -3491,6 +3486,10 @@ interface SVGBoundingBoxOptions {
     stroke?: boolean;
 }
 
+interface SVGPathDataSettings {
+    normalize?: boolean;
+}
+
 interface SanitizerAttributeNamespace {
     name: string;
     namespace?: string | null;
@@ -4173,7 +4172,6 @@ interface WindowActorOptions {
 
 interface WindowActorSidedOptions {
     esModuleURI?: string;
-    moduleURI?: string;
 }
 
 interface WindowInfoDictionary {
@@ -5220,6 +5218,7 @@ declare var BroadcastChannel: {
     prototype: BroadcastChannel;
     new(channel: string): BroadcastChannel;
     isInstance: IsInstance<BroadcastChannel>;
+    unpartitionedTestingChannel(channel: string): BroadcastChannel;
 };
 
 interface BrowsingContext extends LoadContextMixin {
@@ -5807,6 +5806,7 @@ declare var CallbackDebuggerNotification: {
 
 interface CanonicalBrowsingContext extends BrowsingContext {
     readonly activeSessionHistoryEntry: nsISHEntry | null;
+    readonly canOpenModalPicker: boolean;
     crossGroupOpener: CanonicalBrowsingContext | null;
     readonly currentRemoteType: string | null;
     readonly currentURI: URI | null;
@@ -5869,6 +5869,7 @@ interface CanvasCompositing {
 }
 
 interface CanvasDrawImage {
+    contextProperties: CanvasContextProperties;
     drawImage(image: CanvasImageSource, dx: number, dy: number): void;
     drawImage(image: CanvasImageSource, dx: number, dy: number, dw: number, dh: number): void;
     drawImage(image: CanvasImageSource, sx: number, sy: number, sw: number, sh: number, dx: number, dy: number, dw: number, dh: number): void;
@@ -7424,7 +7425,7 @@ interface Document extends Node, DocumentOrShadowRoot, FontFaceSource, GeometryU
     mozSetImageElement(aImageElementId: string, aImageElement: Element | null): void;
     notifyUserGestureActivation(): void;
     open(unused1?: string, unused2?: string): Document;
-    open(url: string | URL, name: string, features: string): WindowProxy | null;
+    open(url: string, name: string, features: string): WindowProxy | null;
     queryCommandEnabled(commandId: string): boolean;
     queryCommandIndeterm(commandId: string): boolean;
     queryCommandState(commandId: string): boolean;
@@ -8411,6 +8412,7 @@ declare var FormDataEvent: {
 };
 
 interface FragmentDirective {
+    createTextDirective(range: Range): Promise<string>;
     getTextDirectiveRanges(): Range[];
     removeAllTextDirectives(): void;
 }
@@ -8485,6 +8487,7 @@ interface GPUAdapter {
     readonly info: GPUAdapterInfo;
     readonly isFallbackAdapter: boolean;
     readonly limits: GPUSupportedLimits;
+    readonly missingFeatures: number;
     requestDevice(descriptor?: GPUDeviceDescriptor): Promise<GPUDevice>;
 }
 
@@ -10500,6 +10503,7 @@ interface HTMLInputElement extends HTMLElement, InvokerElement, MozEditableEleme
     reportValidity(): boolean;
     select(): void;
     setCustomValidity(error: string): void;
+    setDateTimePickerState(aIsOpen: boolean): void;
     setFocusState(aIsFocused: boolean): void;
     setRangeText(replacement: string): void;
     setRangeText(replacement: string, start: number, end: number, selectionMode?: SelectionMode): void;
@@ -12045,13 +12049,52 @@ interface InspectorFontFace {
     readonly rule: CSSFontFaceRule | null;
     readonly srcIndex: number;
     getFeatures(): InspectorFontFeature[];
+    getNameString(id: number): string;
     getVariationAxes(): InspectorVariationAxis[];
     getVariationInstances(): InspectorVariationInstance[];
+    readonly NAME_ID_COPYRIGHT: 0;
+    readonly NAME_ID_FAMILY: 1;
+    readonly NAME_ID_SUBFAMILY: 2;
+    readonly NAME_ID_UNIQUE: 3;
+    readonly NAME_ID_FULL: 4;
+    readonly NAME_ID_VERSION: 5;
+    readonly NAME_ID_POSTSCRIPT: 6;
+    readonly NAME_ID_TRADEMARK: 7;
+    readonly NAME_ID_MANUFACTURER: 8;
+    readonly NAME_ID_DESIGNER: 9;
+    readonly NAME_ID_DESCRIPTION: 10;
+    readonly NAME_ID_VENDOR_URL: 11;
+    readonly NAME_ID_DESIGNER_URL: 12;
+    readonly NAME_ID_LICENSE: 13;
+    readonly NAME_ID_LICENSE_URL: 14;
+    readonly NAME_ID_TYPOGRAPHIC_FAMILY: 16;
+    readonly NAME_ID_TYPOGRAPHIC_SUBFAMILY: 17;
+    readonly NAME_ID_COMPATIBLE_FULL: 18;
+    readonly NAME_ID_SAMPLE_TEXT: 19;
 }
 
 declare var InspectorFontFace: {
     prototype: InspectorFontFace;
     new(): InspectorFontFace;
+    readonly NAME_ID_COPYRIGHT: 0;
+    readonly NAME_ID_FAMILY: 1;
+    readonly NAME_ID_SUBFAMILY: 2;
+    readonly NAME_ID_UNIQUE: 3;
+    readonly NAME_ID_FULL: 4;
+    readonly NAME_ID_VERSION: 5;
+    readonly NAME_ID_POSTSCRIPT: 6;
+    readonly NAME_ID_TRADEMARK: 7;
+    readonly NAME_ID_MANUFACTURER: 8;
+    readonly NAME_ID_DESIGNER: 9;
+    readonly NAME_ID_DESCRIPTION: 10;
+    readonly NAME_ID_VENDOR_URL: 11;
+    readonly NAME_ID_DESIGNER_URL: 12;
+    readonly NAME_ID_LICENSE: 13;
+    readonly NAME_ID_LICENSE_URL: 14;
+    readonly NAME_ID_TYPOGRAPHIC_FAMILY: 16;
+    readonly NAME_ID_TYPOGRAPHIC_SUBFAMILY: 17;
+    readonly NAME_ID_COMPATIBLE_FULL: 18;
+    readonly NAME_ID_SAMPLE_TEXT: 19;
     isInstance: IsInstance<InspectorFontFace>;
 };
 
@@ -12916,9 +12959,9 @@ interface Location {
     port: string;
     protocol: string;
     search: string;
-    assign(url: string | URL): void;
+    assign(url: string): void;
     reload(forceget?: boolean): void;
-    replace(url: string | URL): void;
+    replace(url: string): void;
 }
 
 declare var Location: {
@@ -16743,7 +16786,7 @@ declare var SVGAnimatedRect: {
 
 interface SVGAnimatedString {
     readonly animVal: string;
-    baseVal: string;
+    baseVal: TrustedScriptURL | string;
 }
 
 declare var SVGAnimatedString: {
@@ -16882,6 +16925,19 @@ declare var SVGDescElement: {
     isInstance: IsInstance<SVGDescElement>;
 };
 
+interface SVGDiscardElement extends SVGAnimationElement {
+    addEventListener<K extends keyof SVGAnimationElementEventMap>(type: K, listener: (this: SVGDiscardElement, ev: SVGAnimationElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof SVGAnimationElementEventMap>(type: K, listener: (this: SVGDiscardElement, ev: SVGAnimationElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var SVGDiscardElement: {
+    prototype: SVGDiscardElement;
+    new(): SVGDiscardElement;
+    isInstance: IsInstance<SVGDiscardElement>;
+};
+
 interface SVGElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, OnErrorEventHandlerForNodesEventMap, TouchEventHandlersEventMap {
 }
 
@@ -17801,7 +17857,13 @@ declare var SVGNumberList: {
     isInstance: IsInstance<SVGNumberList>;
 };
 
-interface SVGPathElement extends SVGGeometryElement {
+interface SVGPathData {
+    getPathData(settings?: SVGPathDataSettings): SVGPathSegment[];
+    setPathData(pathData: SVGPathSegment[]): void;
+}
+
+interface SVGPathElement extends SVGGeometryElement, SVGPathData {
+    getPathSegmentAtLength(distance: number): SVGPathSegment | null;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -17814,6 +17876,11 @@ declare var SVGPathElement: {
     isInstance: IsInstance<SVGPathElement>;
 };
 
+interface SVGPathSegment {
+    type: string;
+    values: number[] | Float32Array;
+}
+
 interface SVGPatternElement extends SVGElement, SVGFitToViewBox, SVGURIReference {
     readonly height: SVGAnimatedLength;
     readonly patternContentUnits: SVGAnimatedEnumeration;
@@ -18597,7 +18664,7 @@ interface ServiceWorkerContainer extends EventTarget {
     readonly ready: Promise<ServiceWorkerRegistration>;
     getRegistration(documentURL?: string | URL): Promise<ServiceWorkerRegistration | undefined>;
     getRegistrations(): Promise<ServiceWorkerRegistration[]>;
-    register(scriptURL: string | URL, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
+    register(scriptURL: TrustedScriptURL | string, options?: RegistrationOptions): Promise<ServiceWorkerRegistration>;
     startMessages(): void;
     addEventListener<K extends keyof ServiceWorkerContainerEventMap>(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -23367,7 +23434,7 @@ interface WindowContext {
     readonly isInBFCache: boolean;
     readonly isInProcess: boolean;
     readonly isLocalIP: boolean;
-    readonly overriddenFingerprintingSettings: number | null;
+    readonly overriddenFingerprintingSettings: nsIRFPTargetSetIDL | null;
     readonly parentWindowContext: WindowContext | null;
     readonly shouldResistFingerprinting: boolean;
     readonly topWindowContext: WindowContext;
@@ -24353,6 +24420,9 @@ interface nsIPermissionDelegateHandler {
 interface nsIPrintSettings {
 }
 
+interface nsIRFPTargetSetIDL {
+}
+
 interface nsIReferrerInfo {
 }
 
@@ -24673,12 +24743,11 @@ declare namespace ChromeUtils {
     function releaseAssert(condition: boolean, message?: string): void;
     function requestProcInfo(): Promise<ParentProcInfoDictionary>;
     function resetLastExternalProtocolIframeAllowed(): void;
-    function sanitizeTelemetryFileURL(url: string): FileNameTypeDetails;
     function saveHeapSnapshot(boundaries?: HeapSnapshotBoundaries): string;
     function saveHeapSnapshotGetId(boundaries?: HeapSnapshotBoundaries): string;
     function setPerfStatsCollectionMask(aCollectionMask: number): void;
     function shallowClone(obj: any, target?: any): any;
-    function shouldResistFingerprinting(target: JSRFPTarget, overriddenFingerprintingSettings: number | null): boolean;
+    function shouldResistFingerprinting(target: JSRFPTarget, overriddenFingerprintingSettings: nsIRFPTargetSetIDL | null, isPBM?: boolean): boolean;
     function unregisterProcessActor(aName: string): void;
     function unregisterWindowActor(aName: string): void;
     function unwaiveXrays(val: any): any;
@@ -25625,6 +25694,7 @@ type CSSBoxType = "border" | "content" | "margin" | "padding";
 type CSSStyleSheetParsingMode = "agent" | "author" | "user";
 type CacheStorageNamespace = "chrome" | "content";
 type CallbackDebuggerNotificationPhase = "post" | "pre";
+type CanvasContextProperties = "both" | "fill" | "none" | "stroke";
 type CanvasDirection = "inherit" | "ltr" | "rtl";
 type CanvasFontKerning = "auto" | "none" | "normal";
 type CanvasFontStretch = "condensed" | "expanded" | "extra-condensed" | "extra-expanded" | "normal" | "semi-condensed" | "semi-expanded" | "ultra-condensed" | "ultra-expanded";
@@ -25699,7 +25769,7 @@ type GPUTextureDimension = "1d" | "2d" | "3d";
 type GPUTextureFormat = "astc-10x10-unorm" | "astc-10x10-unorm-srgb" | "astc-10x5-unorm" | "astc-10x5-unorm-srgb" | "astc-10x6-unorm" | "astc-10x6-unorm-srgb" | "astc-10x8-unorm" | "astc-10x8-unorm-srgb" | "astc-12x10-unorm" | "astc-12x10-unorm-srgb" | "astc-12x12-unorm" | "astc-12x12-unorm-srgb" | "astc-4x4-unorm" | "astc-4x4-unorm-srgb" | "astc-5x4-unorm" | "astc-5x4-unorm-srgb" | "astc-5x5-unorm" | "astc-5x5-unorm-srgb" | "astc-6x5-unorm" | "astc-6x5-unorm-srgb" | "astc-6x6-unorm" | "astc-6x6-unorm-srgb" | "astc-8x5-unorm" | "astc-8x5-unorm-srgb" | "astc-8x6-unorm" | "astc-8x6-unorm-srgb" | "astc-8x8-unorm" | "astc-8x8-unorm-srgb" | "bc1-rgba-unorm" | "bc1-rgba-unorm-srgb" | "bc2-rgba-unorm" | "bc2-rgba-unorm-srgb" | "bc3-rgba-unorm" | "bc3-rgba-unorm-srgb" | "bc4-r-snorm" | "bc4-r-unorm" | "bc5-rg-snorm" | "bc5-rg-unorm" | "bc6h-rgb-float" | "bc6h-rgb-ufloat" | "bc7-rgba-unorm" | "bc7-rgba-unorm-srgb" | "bgra8unorm" | "bgra8unorm-srgb" | "depth16unorm" | "depth24plus" | "depth24plus-stencil8" | "depth32float" | "depth32float-stencil8" | "eac-r11snorm" | "eac-r11unorm" | "eac-rg11snorm" | "eac-rg11unorm" | "etc2-rgb8a1unorm" | "etc2-rgb8a1unorm-srgb" | "etc2-rgb8unorm" | "etc2-rgb8unorm-srgb" | "etc2-rgba8unorm" | "etc2-rgba8unorm-srgb" | "r16float" | "r16sint" | "r16uint" | "r32float" | "r32sint" | "r32uint" | "r8sint" | "r8snorm" | "r8uint" | "r8unorm" | "rg11b10ufloat" | "rg16float" | "rg16sint" | "rg16uint" | "rg32float" | "rg32sint" | "rg32uint" | "rg8sint" | "rg8snorm" | "rg8uint" | "rg8unorm" | "rgb10a2uint" | "rgb10a2unorm" | "rgb9e5ufloat" | "rgba16float" | "rgba16sint" | "rgba16uint" | "rgba32float" | "rgba32sint" | "rgba32uint" | "rgba8sint" | "rgba8snorm" | "rgba8uint" | "rgba8unorm" | "rgba8unorm-srgb" | "stencil8";
 type GPUTextureSampleType = "depth" | "float" | "sint" | "uint" | "unfilterable-float";
 type GPUTextureViewDimension = "1d" | "2d" | "2d-array" | "3d" | "cube" | "cube-array";
-type GPUVertexFormat = "float16x2" | "float16x4" | "float32" | "float32x2" | "float32x3" | "float32x4" | "sint16x2" | "sint16x4" | "sint32" | "sint32x2" | "sint32x3" | "sint32x4" | "sint8x2" | "sint8x4" | "snorm16x2" | "snorm16x4" | "snorm8x2" | "snorm8x4" | "uint16x2" | "uint16x4" | "uint32" | "uint32x2" | "uint32x3" | "uint32x4" | "uint8x2" | "uint8x4" | "unorm10-10-10-2" | "unorm16x2" | "unorm16x4" | "unorm8x2" | "unorm8x4";
+type GPUVertexFormat = "float16" | "float16x2" | "float16x4" | "float32" | "float32x2" | "float32x3" | "float32x4" | "sint16" | "sint16x2" | "sint16x4" | "sint32" | "sint32x2" | "sint32x3" | "sint32x4" | "sint8" | "sint8x2" | "sint8x4" | "snorm16" | "snorm16x2" | "snorm16x4" | "snorm8" | "snorm8x2" | "snorm8x4" | "uint16" | "uint16x2" | "uint16x4" | "uint32" | "uint32x2" | "uint32x3" | "uint32x4" | "uint8" | "uint8x2" | "uint8x4" | "unorm10-10-10-2" | "unorm16" | "unorm16x2" | "unorm16x4" | "unorm8" | "unorm8x2" | "unorm8x4" | "unorm8x4-bgra";
 type GPUVertexStepMode = "instance" | "vertex";
 type GamepadHand = "" | "left" | "right";
 type GamepadHapticActuatorType = "vibration";
@@ -26195,6 +26265,10 @@ interface SVGNumberList {
     [Symbol.iterator](): IterableIterator<SVGNumber>;
 }
 
+interface SVGPathData {
+    setPathData(pathData: Iterable<SVGPathSegment>): void;
+}
+
 interface SVGPointList {
     [Symbol.iterator](): IterableIterator<SVGPoint>;
 }
diff --git a/types/gecko/tools/lib.gecko.nsresult.d.ts b/types/gecko/tools/lib.gecko.nsresult.d.ts
index a59090108..212ca3ea0 100644
--- a/types/gecko/tools/lib.gecko.nsresult.d.ts
+++ b/types/gecko/tools/lib.gecko.nsresult.d.ts
@@ -372,6 +372,9 @@ interface nsIXPCComponents_Results {
   /** User refused navigation to potentially unsafe URL with embedded credentials/superfluos authentication */
   NS_ERROR_SUPERFLUOS_AUTH: 0x804b005b;
 
+  /** User attempted basic HTTP authentication when it is disabled */
+  NS_ERROR_BASIC_HTTP_AUTH_DISABLED: 0x804b005c;
+
   // Error codes return from the proxy
 
   /** The connection to the proxy server was refused */
@@ -416,6 +419,9 @@ interface nsIXPCComponents_Results {
   /** The connection was established, but no data was ever received */
   NS_ERROR_NET_RESET: 0x804b0014;
 
+  /** The connection was established, but the browser received an empty page with an error response */
+  NS_ERROR_NET_EMPTY_RESPONSE: 0x804b0024;
+
   /** The connection was established, but the browser received an error response from the server */
   NS_ERROR_NET_ERROR_RESPONSE: 0x804b0023;
 
diff --git a/types/gecko/tools/lib.gecko.tweaks.d.ts b/types/gecko/tools/lib.gecko.tweaks.d.ts
index a12d4bbfc..d2d52d52d 100644
--- a/types/gecko/tools/lib.gecko.tweaks.d.ts
+++ b/types/gecko/tools/lib.gecko.tweaks.d.ts
@@ -53,8 +53,25 @@ interface nsIXPCComponents_Constructor {
   }
 }
 
+interface ComponentsExceptionOptions {
+  result?: number,
+  stack?: nsIStackFrame,
+  data?: object,
+}
+
+interface nsIException extends ExceptionMembers {}
+
 interface nsIXPCComponents_Exception {
-  (...args: ConstructorParameters<typeof Error>): Error;
+  (
+    message?: string,
+    resultOrOptions?: number | ComponentsExceptionOptions,
+    stack?: nsIStackFrame,
+    data?: object
+  ): nsIException;
+}
+
+interface nsIXPCComponents_ID {
+  (uuid: string): nsID
 }
 
 interface nsIXPCComponents_utils_Sandbox {
diff --git a/types/gecko/tools/lib.gecko.xpcom.d.ts b/types/gecko/tools/lib.gecko.xpcom.d.ts
index 2b75d5e25..b92d31a31 100644
--- a/types/gecko/tools/lib.gecko.xpcom.d.ts
+++ b/types/gecko/tools/lib.gecko.xpcom.d.ts
@@ -614,6 +614,9 @@ interface nsICookieManager extends nsISupports {
   removeCookiesFromExactHost(aHost: string, aPattern: string): void;
   removeAllSince(aSinceWhen: i64): Promise<any>;
   getCookiesSince(aSinceWhen: i64): nsICookie[];
+  addThirdPartyCookieBlockingExceptions(aExcpetions: nsIThirdPartyCookieExceptionEntry[]): void;
+  removeThirdPartyCookieBlockingExceptions(aExceptions: nsIThirdPartyCookieExceptionEntry[]): void;
+  testGet3PCBExceptions(): string[];
 }
 
 // https://searchfox.org/mozilla-central/source/netwerk/cookie/nsICookieNotification.idl
@@ -674,6 +677,19 @@ interface nsICookieService extends nsISupports {
   runInTransaction(aCallback: nsICookieTransactionCallback): void;
 }
 
+// https://searchfox.org/mozilla-central/source/netwerk/cookie/nsIThirdPartyCookieBlockingExceptionListService.idl
+
+interface nsIThirdPartyCookieBlockingExceptionListService extends nsISupports {
+  init(): Promise<any>;
+  shutdown(): void;
+}
+
+interface nsIThirdPartyCookieExceptionEntry extends nsISupports {
+  readonly firstPartySite: string;
+  readonly thirdPartySite: string;
+  serialize(): string;
+}
+
 // https://searchfox.org/mozilla-central/source/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl
 
 interface nsIAsyncShutdownBlocker extends nsISupports {
@@ -2442,6 +2458,7 @@ interface nsIMemoryReporterManager extends nsISupports {
   unblockRegistrationAndRestoreOriginalReporters(): void;
   registerStrongReporterEvenIfBlocked(aReporter: nsIMemoryReporter): void;
   getReports(handleReport: nsIHandleReportCallback, handleReportData: nsISupports, finishReporting: nsIFinishReportingCallback, finishReportingData: nsISupports, anonymize: boolean): void;
+  getReportsExtended(handleReport: nsIHandleReportCallback, handleReportData: nsISupports, finishReporting: nsIFinishReportingCallback, finishReportingData: nsISupports, anonymize: boolean, minimizeMemoryUsage: boolean, DMDDumpIdent: string): void;
   readonly vsize: i64;
   readonly vsizeMaxContiguous: i64;
   readonly resident: i64;
@@ -3105,7 +3122,7 @@ interface nsIHttpRequest extends nsISupports {
 
 interface nsIHttpResponse extends nsISupports {
   setStatusLine(httpVersion: string, statusCode: u16, description: string): void;
-  setHeader(name: string, value: string, merge: boolean): void;
+  setHeader(name: string, value: string, merge?: boolean): void;
   setHeaderNoCheck(name: string, value: string): void;
   readonly bodyOutputStream: nsIOutputStream;
   write(data: string): void;
@@ -3645,7 +3662,6 @@ interface nsIComponentManager extends nsISupports {
   addBootstrappedManifestLocation(aLocation: nsIFile): void;
   removeBootstrappedManifestLocation(aLocation: nsIFile): void;
   getManifestLocations(): nsIArray;
-  getComponentJSMs(): nsIUTF8StringEnumerator;
   getComponentESModules(): nsIUTF8StringEnumerator;
 }
 
@@ -6114,7 +6130,7 @@ interface nsIDOMWindowUtils extends nsISupports {
   setHandlingUserInput(aHandlingInput: boolean): nsIJSRAIIHelper;
   isKeyboardEventUserActivity(aKeyboardEvent: Event): boolean;
   getContentAPZTestData(): any;
-  getCompositorAPZTestData(): any;
+  getCompositorAPZTestData(aElement?: Element): any;
   postRestyleSelfEvent(aElement: Element): void;
   xpconnectArgument(aObj: nsISupports): void;
   askPermission(aRequest: nsIContentPermissionRequest): void;
@@ -6152,7 +6168,7 @@ interface nsIDOMWindowUtils extends nsISupports {
   systemFont: string;
   readonly paintCount: u64;
   syncFlushCompositor(): void;
-  getLayersId(): u64;
+  getLayersId(aElement?: Element): u64;
   readonly effectivelyThrottlesFrameRequests: boolean;
   readonly webrtcRawDeviceId: string;
   readonly suspendedByBrowsingContextGroup: boolean;
@@ -6487,7 +6503,7 @@ interface nsICrashReporter extends nsISupports {
   minidumpPath: nsIFile;
   getMinidumpForID(id: string): nsIFile;
   getExtraFileForID(id: string): nsIFile;
-  annotateCrashReport(key: string, data: string): void;
+  annotateCrashReport(key: string, data: any): void;
   removeCrashReportAnnotation(key: string): void;
   isAnnotationAllowedForPing(value: string): boolean;
   appendAppNotesToCrashReport(data: string): void;
@@ -7198,6 +7214,7 @@ interface nsISearchService extends nsISupports {
   readonly CHANGE_REASON_ENTERPRISE: 11;
   readonly CHANGE_REASON_UITOUR: 12;
   readonly CHANGE_REASON_ENGINE_UPDATE: 13;
+  readonly CHANGE_REASON_USER_PRIVATE_PREF_ENABLED: 14;
 
   init(): Promise<any>;
   readonly promiseInitialized: Promise<any>;
@@ -7541,11 +7558,7 @@ interface nsIXPCComponents_Utils extends nsISupports {
   getUAWidgetScope(principal: nsIPrincipal): any;
   getSandboxMetadata(sandbox: any): any;
   setSandboxMetadata(sandbox: any, metadata: any): void;
-  import(aResourceURI: string, targetObj?: any): any;
-  isModuleLoaded(aResourceURI: string): boolean;
-  isJSModuleLoaded(aResourceURI: string): boolean;
   isESModuleLoaded(aResourceURI: string): boolean;
-  unload(registryLocation: string): void;
   importGlobalProperties(aPropertyList: any): void;
   getWeakReference(obj: any): xpcIJSWeakReference;
   forceGC(): void;
@@ -7604,8 +7617,6 @@ interface nsIXPCComponents_Utils extends nsISupports {
   createPersistentProperties(): nsIPersistentProperties;
   createDocumentEncoder(contentType: string): nsIDocumentEncoder;
   createHTMLCopyEncoder(): nsIDocumentEncoder;
-  readonly loadedModules: string[];
-  readonly loadedJSModules: string[];
   readonly loadedESModules: string[];
   getModuleImportStack(aLocation: string): string;
 }
@@ -8869,6 +8880,13 @@ interface mozISpellCheckingEngine extends nsISupports {
   removeDictionary(lang: string, file: nsIURI): boolean;
 }
 
+// https://searchfox.org/mozilla-central/source/toolkit/components/cleardata/nsIClearBySiteEntry.idl
+
+interface nsIClearBySiteEntry extends nsISupports {
+  schemelessSite: string;
+  patternJSON: string;
+}
+
 // https://searchfox.org/mozilla-central/source/toolkit/components/cleardata/nsIClearDataService.idl
 
 interface nsIClearDataService extends nsISupports {
@@ -8945,9 +8963,9 @@ interface nsIFingerprintingWebCompatService extends nsISupports {
 
 interface nsIRFPService extends nsISupports {
   setFingerprintingOverrides(aOverrides: nsIFingerprintingOverride[]): void;
-  getFingerprintingOverrides(aDomainKey: string): u64;
+  getFingerprintingOverrides(aDomainKey: string): nsIRFPTargetSetIDL;
   cleanAllOverrides(): void;
-  readonly enabledFingerprintingProtections: u64;
+  readonly enabledFingerprintingProtections: nsIRFPTargetSetIDL;
   cleanAllRandomKeys(): void;
   cleanRandomKeyByPrincipal(aPrincipal: nsIPrincipal): void;
   cleanRandomKeyBySite(aSchemelessSite: string, originAttributes: any): void;
@@ -8956,6 +8974,13 @@ interface nsIRFPService extends nsISupports {
   testGenerateRandomKey(aChannel: nsIChannel): u8[];
 }
 
+// https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/nsIRFPTargetSetIDL.idl
+
+interface nsIRFPTargetSetIDL extends nsISupports {
+  low: u64;
+  high: u64;
+}
+
 // https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/nsIUserCharacteristicsPageService.idl
 
 interface nsIUserCharacteristicsPageService extends nsISupports {
@@ -9041,11 +9066,17 @@ enum CSPDirective {
   REPORT_TO_DIRECTIVE = 27,
 }
 
+enum RequireTrustedTypesForDirectiveState {
+  NONE = 0,
+  REPORT_ONLY = 1,
+  ENFORCE = 2,
+}
+
 }
 
 declare global {
 
-interface nsIContentSecurityPolicy extends nsISerializable, Enums<typeof nsIContentSecurityPolicy.CSPDirective> {
+interface nsIContentSecurityPolicy extends nsISerializable, Enums<typeof nsIContentSecurityPolicy.CSPDirective & typeof nsIContentSecurityPolicy.RequireTrustedTypesForDirectiveState> {
   readonly VIOLATION_TYPE_EVAL: 1;
   readonly VIOLATION_TYPE_WASM_EVAL: 2;
 
@@ -9055,7 +9086,7 @@ interface nsIContentSecurityPolicy extends nsISerializable, Enums<typeof nsICont
   readonly blockAllMixedContent: boolean;
   readonly enforcesFrameAncestors: boolean;
   appendPolicy(policyString: string, reportOnly: boolean, deliveredViaMetaTag: boolean): void;
-  readonly hasPolicyWithRequireTrustedTypesForDirective: boolean;
+  readonly requireTrustedTypesForDirectiveState: nsIContentSecurityPolicy.RequireTrustedTypesForDirectiveState;
   getAllowsInline(aDirective: nsIContentSecurityPolicy.CSPDirective, aHasUnsafeHash: boolean, aNonce: string, aParserCreated: boolean, aTriggeringElement: Element, aCSPEventListener: nsICSPEventListener, aContentOfPseudoScript: string, aLineNumber: u32, aColumnNumber: u32): boolean;
   getAllowsEval(shouldReportViolations: OutParam<boolean>): boolean;
   getAllowsWasmEval(shouldReportViolations: OutParam<boolean>): boolean;
@@ -9924,6 +9955,7 @@ interface nsILoadInfo extends nsISupports, Enums<typeof nsILoadInfo.StoragePermi
   isInDevToolsContext: boolean;
   isInThirdPartyContext: boolean;
   isThirdPartyContextToTopWindow: boolean;
+  isOn3PCBExceptionList: boolean;
   readonly cookiePolicy: u32;
   cookieJarSettings: nsICookieJarSettings;
   storagePermission: nsILoadInfo.StoragePermissionState;
@@ -9994,6 +10026,7 @@ interface nsILoadInfo extends nsISupports, Enums<typeof nsILoadInfo.StoragePermi
   httpsUpgradeTelemetry: nsILoadInfo.HTTPSUpgradeTelemetryType;
   isNewWindowTarget: boolean;
   skipHTTPSUpgrade: boolean;
+  userNavigationInvolvement: u8;
 }
 
 // https://searchfox.org/mozilla-central/source/netwerk/base/nsIMIMEInputStream.idl
@@ -11631,6 +11664,7 @@ interface nsIDNSHTTPSSVCRecord extends nsISupports {
   readonly ttl: u32;
   IsTRR(): boolean;
   GetAllRecordsWithEchConfig(aNoHttp2: boolean, aNoHttp3: boolean, aCName: string, aAllRecordsHaveEchConfig: OutParam<boolean>, aAllRecordsInH3ExcludedList: OutParam<boolean>): nsISVCBRecord[];
+  GetAllRecords(aNoHttp2: boolean, aNoHttp3: boolean, aCName: string): nsISVCBRecord[];
 }
 
 // https://searchfox.org/mozilla-central/source/netwerk/dns/nsIDNSListener.idl
@@ -12556,6 +12590,7 @@ interface nsIAutoCompleteSimpleSearch extends nsIAutoCompleteSearch {
 
 interface nsIMLUtils extends nsISupports {
   hasEnoughMemoryToInfer(aModelSizeInMemory: u64, aThresholdPercentage: u32, aMinMemoryRequirement: u64): boolean;
+  getNumPhysicalCores(): u8;
 }
 
 // https://searchfox.org/mozilla-central/source/toolkit/components/finalizationwitness/nsIFinalizationWitnessService.idl
@@ -14793,6 +14828,7 @@ interface nsIAccessibleRole extends nsISupports {
   readonly ROLE_TIME: 137;
   readonly ROLE_GRID: 138;
   readonly ROLE_ROWGROUP: 139;
+  readonly ROLE_SEARCHBOX: 140;
 }
 
 // https://searchfox.org/mozilla-central/source/accessible/interfaces/nsIAccessibleScrollingEvent.idl
@@ -15232,6 +15268,8 @@ interface nsIXPCComponents_Interfaces {
   nsICookiePermission: nsJSIID<nsICookiePermission>;
   nsICookieTransactionCallback: nsJSIID<nsICookieTransactionCallback>;
   nsICookieService: nsJSIID<nsICookieService>;
+  nsIThirdPartyCookieBlockingExceptionListService: nsJSIID<nsIThirdPartyCookieBlockingExceptionListService>;
+  nsIThirdPartyCookieExceptionEntry: nsJSIID<nsIThirdPartyCookieExceptionEntry>;
   nsIAsyncShutdownBlocker: nsJSIID<nsIAsyncShutdownBlocker>;
   nsIAsyncShutdownClient: nsJSIID<nsIAsyncShutdownClient>;
   nsIAsyncShutdownCompletionCallback: nsJSIID<nsIAsyncShutdownCompletionCallback>;
@@ -15849,17 +15887,19 @@ interface nsIXPCComponents_Interfaces {
   nsIX509CertValidity: nsJSIID<nsIX509CertValidity>;
   mozIPersonalDictionary: nsJSIID<mozIPersonalDictionary>;
   mozISpellCheckingEngine: nsJSIID<mozISpellCheckingEngine>;
+  nsIClearBySiteEntry: nsJSIID<nsIClearBySiteEntry>;
   nsIClearDataService: nsJSIID<nsIClearDataService>;
   nsIClearDataCallback: nsJSIID<nsIClearDataCallback>;
   nsIFingerprintingOverride: nsJSIID<nsIFingerprintingOverride>;
   nsIFingerprintingWebCompatService: nsJSIID<nsIFingerprintingWebCompatService>;
   nsIRFPService: nsJSIID<nsIRFPService>;
+  nsIRFPTargetSetIDL: nsJSIID<nsIRFPTargetSetIDL>;
   nsIUserCharacteristicsPageService: nsJSIID<nsIUserCharacteristicsPageService>;
   nsICommandLine: nsJSIID<nsICommandLine>;
   nsICommandLineHandler: nsJSIID<nsICommandLineHandler>;
   nsICommandLineValidator: nsJSIID<nsICommandLineValidator>;
   nsIContentSecurityManager: nsJSIID<nsIContentSecurityManager>;
-  nsIContentSecurityPolicy: nsJSIID<nsIContentSecurityPolicy, typeof nsIContentSecurityPolicy.CSPDirective>;
+  nsIContentSecurityPolicy: nsJSIID<nsIContentSecurityPolicy, typeof nsIContentSecurityPolicy.CSPDirective & typeof nsIContentSecurityPolicy.RequireTrustedTypesForDirectiveState>;
   nsICSPEventListener: nsJSIID<nsICSPEventListener>;
   nsIReferrerInfo: nsJSIID<nsIReferrerInfo, typeof nsIReferrerInfo.ReferrerPolicyIDL>;
   nsIHttpsOnlyModePermission: nsJSIID<nsIHttpsOnlyModePermission>;
@@ -16364,6 +16404,7 @@ type PRTime = i64;
 type PivotMoveReason = i16;
 type PredictorLearnReason = u32;
 type PredictorPredictReason = u32;
+type RequireTrustedTypesForDirectiveState = nsIContentSecurityPolicy.RequireTrustedTypesForDirectiveState;
 type nsBitsErrorAction = i32;
 type nsBitsErrorStage = i32;
 type nsBitsErrorType = i32;
diff --git a/types/general.d.ts b/types/general.d.ts
index ada6d9842..2e64d59f3 100644
--- a/types/general.d.ts
+++ b/types/general.d.ts
@@ -17,6 +17,7 @@ interface Element {
   getElementsByClassName<K extends keyof GetByMap>(name: K): NonEmptyCollection_G<GetByMap[K]>;
   // it is ok to allow setAttribute to convert the value to string for us
   setAttribute(name: string, value: string | boolean | number): void;
+  label: string;
 }
 
 interface NodeList {
@@ -161,7 +162,6 @@ declare namespace MockedGeckoTypes {
     _restoreState: number;
     _tabmix_downloadingTimeout: number | null;
     _tabmixState?: {noBookmart?: boolean};
-    _tPosInGroup?: number;
     autoReloadEnabled?: boolean;
     autoReloadTimerID: number | null;
     autoReloadURI?: string;
@@ -248,7 +248,7 @@ declare namespace MockedGeckoTypes {
     _tabClipWidth: number;
     _tabDropIndicator: HTMLElement;
     _unlockTabSizing: () => void;
-    _updateCloseButtons(skipUpdateScrollStatus?: boolean, aUrl?: string): void;
+    _updateCloseButtons(skipUpdateScrollStatus?: boolean, aUrl?: string | null): void;
     advanceSelectedTab: (dir: number, wrap: boolean) => void;
     get allTabs(): Tabs;
     get allGroups(): MozTabbrowserTabGroup[];
@@ -277,7 +277,6 @@ declare namespace MockedGeckoTypes {
 
     // Tabmix
     __showbuttonTab?: BrowserTab;
-    tabmix_updateCloseButtons: TabContainer["_updateCloseButtons"];
 
     // replacment for private methods
     _clearDragOverCreateGroupTimer: () => void;
diff --git a/types/override.d.ts b/types/override.d.ts
index fcf4331a1..6f0f8a17f 100644
--- a/types/override.d.ts
+++ b/types/override.d.ts
@@ -33,10 +33,12 @@ interface ChromeUtils {
 // @ts-expect-error - override `namespace ChromeUtils` from `gecko/lib.gecko.dom.d.ts`
 declare var ChromeUtils: ChromeUtils;
 
+interface DocumentElement extends HTMLElement {}
+
 interface Document {
   readonly commandDispatcher: XULCommandDispatcher;
   readonly defaultView: WindowProxy;
-  readonly documentElement: Element;
+  readonly documentElement: DocumentElement;
   getElementsByClassName<K extends keyof GetByMap>(name: K): NonEmptyCollection_G<GetByMap[K]>;
 }
 
diff --git a/types/preferences.d.ts b/types/preferences.d.ts
index 8e03322a8..af2c02c2f 100644
--- a/types/preferences.d.ts
+++ b/types/preferences.d.ts
@@ -1,7 +1,6 @@
 /// <reference types="./general.d.ts" />
 /// <reference types="./tabmix.d.ts" />
 /// <reference types="./extraTabmixUtils.d.ts" />
-/// <reference types="./customDialog.d.ts" />
 
 type GeneralElement = HTMLElement;
 
@@ -31,6 +30,10 @@ interface Element {
   type: string;
 }
 
+interface HTMLMenuElement {
+  selectedItem: HTMLElement;
+}
+
 declare class ExtensionShortcutKeyMap {
   constructor();
   buildForAddonIds(addonIds: string[]): Promise<void>;
@@ -51,19 +54,21 @@ interface XULCommandDispatcher {
 }
 
 interface Window {
-  _sminstalled: boolean;
   $<K extends keyof GetByMap>(selectors: K | string): K extends keyof GetByMap ? GetByMap[K] : HTMLElement | null;
   getComputedStyle(elt: HTMLElement, pseudoElt?: string | null): CSSStyleDeclaration | null;
   notifyDefaultButtonLoaded(defaultButton: HTMLButtonElement): void;
   CustomizableUI: typeof CustomizableUI;
 }
 
-interface WindowProxy {
+interface WindowProxy extends mozIDOMWindowProxy {
   readonly opener: WindowProxy;
   openHelp: typeof Globals.openHelp;
+  gIncompatiblePane: IgIncompatiblePane;
+  Tabmix: typeof TabmixNS;
 }
 
 interface IgIncompatiblePane {
+  _initialized: boolean;
   lastSelected: string;
   paneButton: PrefPaneClass;
   init: () => void;
@@ -72,11 +77,6 @@ interface IgIncompatiblePane {
   hide_IncompatibleNotice: (this: IgIncompatiblePane, aHide: boolean, aFocus: boolean) => void;
 }
 
-interface WindowProxy {
-  gIncompatiblePane: IgIncompatiblePane;
-  Tabmix: typeof TabmixNS;
-}
-
 /** classes in prefs-ce.js */
 
 // for testing...
@@ -460,7 +460,6 @@ declare namespace MenuPaneNS {
   function updateShortcuts(aShortcuts: ShortcutParent, aCallBack: (shortcut: MozShortcutClass) => void): void;
   function setSlideShowLabel(): void;
   function editSlideShowKey(): void;
-  function updateSessionShortcuts(): void;
   function toggleLinkLabel(item: HTMLElement): void;
   function setInverseLinkLabel(): void;
 }
@@ -550,10 +549,6 @@ declare namespace SessionPaneNS {
   };
 
   function init(): void;
-  function updateSessionShortcuts(): void;
-  function isSessionStoreEnabled(onStart: boolean): void;
-  function setSessionsOptions(item: PreferenceElement): void;
-  function setSessionpath(val: number): void;
 }
 
 /** function in the preference window global scope */
@@ -668,7 +663,6 @@ interface GetByMap {
   "showBmkTabs": CheckboxClass & Element;
   "unmuteTab": CheckboxClass & Element;
   "session": SessionPaneNS.SessionsTabs;
-  "sessionsOptions": CheckboxClass & Element;
   "stylestabs": CustomGroupElement<HTMLElement>;
   "stylespanels": Omit<HTMLElement, "childNodes"> & {childNodes: HTMLCollectionBase_G<TabstylepanelClass>};
 
@@ -718,9 +712,6 @@ interface BrowserWindow extends MockedGeckoTypes.BrowserWindow {
   gNavigatorBundle: gNavigatorBundle;
   gTMPprefObserver: gTMPprefObserver;
   Tabmix: typeof TabmixNS;
-  TMP_TabView: {
-    installed: boolean;
-  };
 }
 
 interface TabmixKnownModules {
diff --git a/types/tabmix.d.ts b/types/tabmix.d.ts
index 8d9ae2a08..684876d8c 100644
--- a/types/tabmix.d.ts
+++ b/types/tabmix.d.ts
@@ -27,6 +27,12 @@ interface CSSRule {
   readonly style: CSSStyleDeclaration;
 }
 
+interface HTMLDialogElement {
+  getButton(buttonId: string): HTMLButtonElement;
+  set defaultButton(buttonId: string);
+  get defaultButton(): string;
+}
+
 type RulesTypes = "max-rows" | "visibleRows" | "width" | "tabMinHeight" | "themeBackground";
 interface gTMPprefObserver {
   _marginStart: string;
@@ -152,7 +158,6 @@ type ItemOrId = string | Node | Element | AttributeProps | null | undefined;
 
 declare namespace TabmixNS {
   type LazyGetterReturnType<T extends (() => unknown) | unknown> = T extends () => infer R ? R : T;
-  type promptServiceReturnType = {button: number; checked: boolean; label: string; value: number};
   type ElementTypes = Node | HTMLElement | MockedGeckoTypes.BrowserTab;
 
   const _debug: boolean;
@@ -175,7 +180,6 @@ declare namespace TabmixNS {
   function lazyGetter<T extends (() => unknown) | unknown, O extends object, K extends keyof O & string>(obj: O, name: K, get: T, config?: {configurable?: boolean; enumerable?: boolean}): LazyGetterReturnType<T>;
   function backwardCompatibilityGetter(aObject: Record<string, unknown>, aOldName: string, aNewName: string): void;
   function informAboutChangeInTabmix(aOldName: string, aNewName: string): void;
-  function promptService(intParam: number[], strParam: string[], aWindow: Window, aCallBack?: (aResult: promptServiceReturnType) => void): promptServiceReturnType;
   function windowEnumerator(aWindowtype?: string | null): MockedGeckoTypes.nsISimpleEnumeratorWithWindow;
   function numberOfWindows(all?: boolean, aWindowtype?: string | null): number;
   const isFirstWindowInSession: boolean;
@@ -217,6 +221,7 @@ interface OriginalFunctions {
   gURLBar_handleCommand: gURLBar["handleCommand"];
   gURLBar__whereToOpen: gURLBar["_whereToOpen"];
   gURLBar_setURI: gURLBar["setURI"];
+  tabContainer_updateCloseButtons: MockedGeckoTypes.TabContainer["_updateCloseButtons"];
   isBlankPageURL: Window["isBlankPageURL"];
   newWindowButtonObserver_onDrop: newWindowButtonObserver["onDrop"];
   OpenBrowserWindow: Window["OpenBrowserWindow"];
@@ -283,7 +288,6 @@ declare namespace TabmixModules {
     getFormattedString: (aStringKey: string, aStringsArray: number[]) => string;
     getSingleWindowMode: () => boolean;
     getString: (key: string) => string;
-    getSMString: (key: string) => string;
     i10IdMap: I10Map;
     isCyberfox: boolean;
     isFloorp: boolean;
@@ -298,7 +302,6 @@ declare namespace TabmixModules {
     prefBranch: nsIPrefBranchXpcom;
     prefs: typeof PreferencesService;
     setCustomTabValue: (tab: MockedGeckoTypes.BrowserTab, key: string, value?: unknown) => void;
-    sanitized: boolean;
     setLabel: (property: string) => string;
     sortByRecentlyUsed: string;
     // SessionStore is declared in addon.d.ts
@@ -307,16 +310,11 @@ declare namespace TabmixModules {
     sm: {
       TAB_STATE_NEEDS_RESTORE: number;
       TAB_STATE_RESTORING: number;
-      crashed: boolean;
-      lastSessionPath: string | null;
-      settingPreference: boolean;
-      status: string;
     };
     // SessionStore is declared in addon.d.ts
     // ss: unknown;
     _defaultPreferencesLoaded: boolean;
     _strings: nsIStringBundle;
-    SMstrings: nsIStringBundle;
     tabStylePrefs: {
       [key: string]: TabStyle;
       progressMeter: TabStyle & {text: false};