From dc6d8503b710899370d3bb6f0f1038f1b9b16576 Mon Sep 17 00:00:00 2001
From: Piro / SHIMODA Hiroshi <piro@p.club.ne.jp>
Date: Thu, 18 Nov 2010 02:55:23 +0900
Subject: [PATCH] remove "open link in tab" and "new tab from location bar"
 codes

---
 content/treestyletab/config.xul            | 13 ---------
 locale/de-DE/treestyletab/treestyletab.dtd | 33 ----------------------
 locale/en-US/treestyletab/treestyletab.dtd | 31 --------------------
 locale/es-ES/treestyletab/treestyletab.dtd | 30 --------------------
 locale/fr-FR/treestyletab/treestyletab.dtd | 32 ---------------------
 locale/it-IT/treestyletab/treestyletab.dtd | 32 ---------------------
 locale/ja/treestyletab/treestyletab.dtd    | 31 --------------------
 locale/pl/treestyletab/treestyletab.dtd    | 30 --------------------
 locale/ru-RU/treestyletab/treestyletab.dtd | 31 --------------------
 locale/zh-CN/treestyletab/treestyletab.dtd | 32 ---------------------
 locale/zh-TW/treestyletab/treestyletab.dtd | 31 --------------------
 11 files changed, 326 deletions(-)

diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index a35e3ddf..ec12dd4f 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -647,9 +647,6 @@
 		<preference id="extensions.treestyletab.tooltip.includeChildren"
 			name="extensions.treestyletab.tooltip.includeChildren"
 			type="bool"/>
-		<preference id="extensions.treestyletab.useEffectiveTLD"
-			name="extensions.treestyletab.useEffectiveTLD"
-			type="bool"/>
 	</preferences>
 
 	<checkbox id="extensions.treestyletab.animation.enabled-check"
@@ -658,16 +655,6 @@
 	<checkbox id="extensions.treestyletab.tooltip.includeChildren-check"
 		preference="extensions.treestyletab.tooltip.includeChildren"
 		label="&config.tooltip.includeChildren;"/>
-	<groupbox id="useEffectiveTLD">
-		<caption label="&config.useEffectiveTLD.caption;"/>
-		<radiogroup id="extensions.treestyletab.useEffectiveTLD-radiogroup"
-			preference="extensions.treestyletab.useEffectiveTLD"
-			orient="vertical">
-			<radio value="true" label="&config.useEffectiveTLD.enabled;"/>
-			<radio value="false" label="&config.useEffectiveTLD.disabled;"/>
-		</radiogroup>
-	</groupbox>
-
 </prefpane>
 
 <script src="config.js" type="application/javascript"/>
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index f09c1893..a900cd3e 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -48,21 +48,8 @@
 
 <!ENTITY config.tabs.tab "Tabs Öffnen">
 
-<!ENTITY config.tabs.link.tab     "Links">
-<!ENTITY config.tabs.urlbar.tab   "Adresszeile">
 <!ENTITY config.tabs.bookmark.tab "Lesezeichen">
 <!ENTITY config.tabs.dragdrop.tab "Ziehen von Links auf Tabs">
-<!ENTITY config.tabs.misc.tab     "Sonstiges">
-
-<!ENTITY config.link.caption "Verfolgte Links">
-<!ENTITY config.link.none    "Lv.0 Immer im aktiven Tab laden (Firefox Standard)">
-<!ENTITY config.link.outer   "Lv.1 In einem neuen Tab öffnen, falls es eine andere Webseite ist">
-<!ENTITY config.link.any     "Lv.2 Immer in einem neuen Tab öffnen">
-
-<!ENTITY config.open_newwindow.caption "Links, die sich unerwartet in einem neuen Fenster öffnen">
-<!ENTITY config.open_newwindow.window  "Als Fenster öffnen">
-<!ENTITY config.open_newwindow.tab     "Als neues Tab öffnen (Firefox Standard)">
-<!ENTITY config.open_newwindow.current "Immer im aktiven Tab laden">
 
 <!ENTITY config.openGroupBookmark.caption     "Verhalten von &quot;Alle in Tabs öffnen&quot; für Seiten in einem Lesezeichenordner">
 <!ENTITY config.openGroupBookmark.ask         "Jedes Mal nachfragen">
@@ -75,26 +62,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Aktuelles Tab durch die neuen Tabs ersetzen">
 <!ENTITY config.openGroupBookmark.underParent "Seiten zur Gruppierung einem Dummytab unterordnen">
 
-<!ENTITY config.urlbar.caption       "Eingegebene Adressen">
-<!ENTITY config.urlbar.none          "Lv.0 Immer im aktiven Tab laden (Firefox Standard)">
-<!ENTITY config.urlbar.outer         "Lv.1 In neuem Tab laden, falls es eine andere Webseite ist">
-<!ENTITY config.urlbar.any           "Lv.2 Immer in einem neuen Tab laden">
-<!ENTITY config.urlbar.asChild.caption "Anordnung des neuen Tabs">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 Neues eigenes Tab auf oberster Ebene">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 Neues untergeordnetes Tab, falls es die gleiche Webseite ist">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 Immer als untergeordnetes Tab">
-
 <!ENTITY config.dropLinksOnTab.caption "Verhalten für das Drag &amp; Drop von URLs auf Tabs">
 <!ENTITY config.dropLinksOnTab.ask     "Jedes Mal nachfragen">
 <!ENTITY config.dropLinksOnTab.load    "Seite im Tab laden (Firefox Standard)">
 <!ENTITY config.dropLinksOnTab.newTab  "Seite in einem neuen untergeordneten Tab laden">
 
-<!ENTITY config.jsopen.caption "Fenster, die sich durch Skripte öffnen">
-<!ENTITY config.jsopen.default "Als Fenster öffnen, wenn das Skript eine bestimmte Fenstergröße vorgibt (Firefox Standard)">
-<!ENTITY config.jsopen.forcetab "Auf jeden Fall als Tab öffnen (Empfohlen)">
-<!ENTITY config.jsopen.current  "Immer im aktiven Tab laden">
-
-
 <!ENTITY config.tabs.autohide "Platz sparen">
 
 <!ENTITY config.autoHide.mode.0 "Tableiste immer voll anzeigen">
@@ -155,11 +127,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Titel der untergeordneten Tabs im Tooltip geschlossener Tabs anzeigen">
 
-<!ENTITY config.useEffectiveTLD.caption  "Erkennung der &quot;gleichen Webseite&quot;">
-<!ENTITY config.useEffectiveTLD.enabled  "Nur Domain berücksichtigen (&quot;a.example.com&quot; and &quot;b.example.com&quot; gehören zur gleichen Webseite)">
-<!ENTITY config.useEffectiveTLD.disabled "Host/Subdomain auch berücksichtigen (&quot;a.example.com&quot; and &quot;b.example.com&quot; zählen als unterschiedliche Webeiten)">
-
-
 
 
 
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 0f6a22f5..c9a90847 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -47,21 +47,8 @@
 
 <!ENTITY config.tabs.tab "New Tabs">
 
-<!ENTITY config.tabs.link.tab     "Links">
-<!ENTITY config.tabs.urlbar.tab   "Location Bar">
 <!ENTITY config.tabs.bookmark.tab "Bookmarks">
 <!ENTITY config.tabs.dragdrop.tab "Drag &amp; Drop to tabs">
-<!ENTITY config.tabs.misc.tab     "Other Cases">
-
-<!ENTITY config.link.caption "Automatic New Tab Level for Links">
-<!ENTITY config.link.none    "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.link.outer   "Lv.1 Open links to different website in new tab">
-<!ENTITY config.link.any     "Lv.2 Open any link in new tab">
-
-<!ENTITY config.open_newwindow.caption "New window opened from links in webpages unexpectedly">
-<!ENTITY config.open_newwindow.window  "Open as Window">
-<!ENTITY config.open_newwindow.tab     "Open as Tab (Firefox default, recommended)">
-<!ENTITY config.open_newwindow.current "Load into the Current Tab anyway">
 
 <!ENTITY config.openGroupBookmark.caption     "Behavior of &quot;Open All in Tabs&quot; for bookmark folders">
 <!ENTITY config.openGroupBookmark.ask         "Ask me always">
@@ -74,25 +61,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Replace the current one tab with the pages in the folder">
 <!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping">
 
-<!ENTITY config.urlbar.caption       "Automatic New Tab Level for the Location Bar">
-<!ENTITY config.urlbar.none          "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.urlbar.outer         "Lv.1 Load into new tab if it is a different website">
-<!ENTITY config.urlbar.any           "Lv.2 Load into new tab always">
-<!ENTITY config.urlbar.asChild.caption "Structuring of opened tabs">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 Open as separate tab">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 Open as child tab if it is the same website">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 Open as child tab always">
-
 <!ENTITY config.dropLinksOnTab.caption "Action for drag drop of links, URLs, bookmarks or files to existing tab">
 <!ENTITY config.dropLinksOnTab.ask     "Ask me always">
 <!ENTITY config.dropLinksOnTab.load    "Load link into the tab (Firefox default)">
 <!ENTITY config.dropLinksOnTab.newTab  "Open link in a new child tab of the tab">
 
-<!ENTITY config.jsopen.caption "New window opened from a web page script">
-<!ENTITY config.jsopen.default "Open new window when it has a special width, height, etc. (Firefox default)">
-<!ENTITY config.jsopen.forcetab "Open new tab instead of window (Recommended)">
-<!ENTITY config.jsopen.current  "Load into the Current Tab anyway">
-
 
 <!ENTITY config.tabs.autohide "Auto hide">
 
@@ -154,10 +127,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Show tree contents in tooltips on tabs">
 
-<!ENTITY config.useEffectiveTLD.caption  "Detecting method for &quot;same website&quot;">
-<!ENTITY config.useEffectiveTLD.enabled  "by Domain (&quot;aaa.example.com&quot; and &quot;bbb.example.com&quot; are same websites)">
-<!ENTITY config.useEffectiveTLD.disabled "by Host (&quot;aaa.example.com&quot; and &quot;bbb.example.com&quot; are different websites)">
-
 
 
 
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 5816d544..351302c7 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -48,21 +48,8 @@
 <!ENTITY config.tabs.tab "New Tabs">
 <!--ENTITY config.tabs.tab "Operaciones"-->
 
-<!ENTITY config.tabs.link.tab     "Links">
-<!ENTITY config.tabs.urlbar.tab   "Location Bar">
 <!ENTITY config.tabs.bookmark.tab "Bookmarks">
 <!ENTITY config.tabs.dragdrop.tab "Drag &amp; Drop to tabs">
-<!ENTITY config.tabs.misc.tab     "Other Cases">
-
-<!ENTITY config.link.caption "Automatic New Tab Level for Links">
-<!ENTITY config.link.none    "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.link.outer   "Lv.1 Abrir enlaces a un diferente sitio en una nueva pestaña">
-<!ENTITY config.link.any     "Lv.2 Abrir cualquier enlace en una nueva pestaña">
-
-<!ENTITY config.open_newwindow.caption "Nuevas ventanas abiertas desde enlaces inesperadamente">
-<!ENTITY config.open_newwindow.window  "Abrir como una ventana">
-<!ENTITY config.open_newwindow.tab     "Abrir como pestaña (Predeterminado en Firefox)">
-<!ENTITY config.open_newwindow.current "Load into the Current Tab anyway">
 
 <!ENTITY config.openGroupBookmark.caption     "Behavior of &quot;Open All in Tabs&quot; for bookmark folders">
 <!--ENTITY config.openGroupBookmark.caption     "&quot;Abrir todos en pestañas&quot; desde carpetas de marcadores"-->
@@ -76,25 +63,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Replace the current one tab with the pages in the folder">
 <!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping">
 
-<!ENTITY config.urlbar.caption       "Automatic New Tab Level for the Location Bar">
-<!ENTITY config.urlbar.none          "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.urlbar.outer         "Lv.1 Cargar en una nueva pestaña si es un sitio diferente al actual">
-<!ENTITY config.urlbar.any           "Lv.2 Load into new tab always">
-<!ENTITY config.urlbar.asChild.caption "Structuring of opened tabs">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 Open as separate tab">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 Open as child tab if it is the same website">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 Open as child tab always">
-
 <!ENTITY config.dropLinksOnTab.caption "Acción para arrastrar y soltar enlaces o URIs en pestañas existentes">
 <!ENTITY config.dropLinksOnTab.ask     "Ask me always">
 <!ENTITY config.dropLinksOnTab.load    "Cargar enlace dentro de una nueva pestaña (Predeterminado en Firefox)">
 <!ENTITY config.dropLinksOnTab.newTab  "Abrir enlace como hija de la pestaña actual">
 
-<!ENTITY config.jsopen.caption "Nuevas ventanas abiertas desde Scripts">
-<!ENTITY config.jsopen.default "Abrir como ventana cuando contienen un ancho o altura especial. (Predeterminado en Firefox)">
-<!ENTITY config.jsopen.forcetab "Abrir como pestañas en ves de ventanas (Recomendado)">
-<!ENTITY config.jsopen.current  "Load into the Current Tab anyway">
-
 
 <!ENTITY config.tabs.autohide "Auto ocultar">
 
@@ -158,9 +131,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Show tree contents in tooltips on tabs">
 
-<!ENTITY config.useEffectiveTLD.caption  "Detecting method for &quot;same website&quot;">
-<!ENTITY config.useEffectiveTLD.enabled  "by Domain (&quot;aaa.example.com&quot; and &quot;bbb.example.com&quot; are same websites)">
-<!ENTITY config.useEffectiveTLD.disabled "by Host (&quot;aaa.example.com&quot; and &quot;bbb.example.com&quot; are different websites)">
 
 
 
diff --git a/locale/fr-FR/treestyletab/treestyletab.dtd b/locale/fr-FR/treestyletab/treestyletab.dtd
index b3f79a06..a07638be 100644
--- a/locale/fr-FR/treestyletab/treestyletab.dtd
+++ b/locale/fr-FR/treestyletab/treestyletab.dtd
@@ -47,21 +47,8 @@
 
 <!ENTITY config.tabs.tab "Nouveaux onglets">
 
-<!ENTITY config.tabs.link.tab     "Liens">
-<!ENTITY config.tabs.urlbar.tab   "Barre d'adresse">
 <!ENTITY config.tabs.bookmark.tab "Marque-pages">
 <!ENTITY config.tabs.dragdrop.tab "Glisser-déposer dans les onglets">
-<!ENTITY config.tabs.misc.tab     "Autres cas">
-
-<!ENTITY config.link.caption "Niveau automatique d'un nouvel onglet pour des liens">
-<!ENTITY config.link.none    "Lv.0 Aucun (défaut Firefox)">
-<!ENTITY config.link.outer   "Lv.1 Ouvrir les liens d'un site web différent dans un nouvel onglet">
-<!ENTITY config.link.any     "Lv.2 Ouvrir tous les liens dans un nouvel onglet">
-
-<!ENTITY config.open_newwindow.caption "Nouvelle fenêtre ouverte spontanément à partir d'un lien d'une page web">
-<!ENTITY config.open_newwindow.window  "Ouvrir en fenêtre">
-<!ENTITY config.open_newwindow.tab     "Ouvrir en onglet (défaut Firefox, recommandé)">
-<!ENTITY config.open_newwindow.current "Ouvrir systématiquement dans l'onglet actuel">
 
 <!ENTITY config.openGroupBookmark.caption     "Action pour &quot;Tout ouvrir dans des onglets&quot; pour les dossiers d'onglets">
 <!ENTITY config.openGroupBookmark.ask         "Toujours demander">
@@ -74,25 +61,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Remplacer l'onglet actuel par les pages du dossier">
 <!ENTITY config.openGroupBookmark.underParent "Mettre les onglets sous un onglet fictif afin de les grouper">
 
-<!ENTITY config.urlbar.caption       "Niveau automatique d'un nouvel onglet pour la barre d'adresse">
-<!ENTITY config.urlbar.none          "Lv.0 Aucun (défaut Firefox)">
-<!ENTITY config.urlbar.outer         "Lv.1 Charger dans un nouvel onglet si c'est un site web différent">
-<!ENTITY config.urlbar.any           "Lv.2 Toujours charger dans un nouvel onglet">
-<!ENTITY config.urlbar.asChild.caption "Arborescence des nouveaux onglets">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 Ouvrir dans un onglet séparé">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 Ouvrir en onglet enfant si c'est le même site web">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 Toujours ouvrir en onglet enfant">
-
 <!ENTITY config.dropLinksOnTab.caption "Action pour les glisser-déposer de liens, URL, marques-pages ou fichiers sur un onglet existant">
 <!ENTITY config.dropLinksOnTab.ask     "Toujours me demander">
 <!ENTITY config.dropLinksOnTab.load    "Charger le lien dans l'onglet (défaut Firefox)">
 <!ENTITY config.dropLinksOnTab.newTab  "Ouvrir le lien dans un onglet enfant de l'onglet">
 
-<!ENTITY config.jsopen.caption "Nouvelle fenêtre ouverte par le script d'une page">
-<!ENTITY config.jsopen.default "Ouvrir une nouvelle fenêtre si ses dimensions sont précisées (défaut Firefox)">
-<!ENTITY config.jsopen.forcetab "Ouvrir un nouvel onglet au lieu d'une fenêtre (Recommandé)">
-<!ENTITY config.jsopen.current  "Charger systématiquement dans l'onglet actuel">
-
 
 <!ENTITY config.tabs.autohide "Masquage automatique">
 
@@ -154,11 +127,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Afficher le contenu de l'arborescence dans les info-bulles des onglets">
 
-<!ENTITY config.useEffectiveTLD.caption  "Méthode de détection du &quot;même site web&quot;">
-<!ENTITY config.useEffectiveTLD.enabled  "par domaine (&quot;aaa.exemple.com&quot; et &quot;bbb.exemple.com&quot; sont du même site)">
-<!ENTITY config.useEffectiveTLD.disabled "par hôte (&quot;aaa.exemple.com&quot; et &quot;bbb.exemple.com&quot; sont des sites web différents)">
-
-
 
 
 
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 7e68f7cd..46271543 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -48,21 +48,8 @@
 <!ENTITY config.tabs.tab "New Tabs">
 <!--ENTITY config.tabs.tab "Navigazione"-->
 
-<!ENTITY config.tabs.link.tab     "Links">
-<!ENTITY config.tabs.urlbar.tab   "Location Bar">
 <!ENTITY config.tabs.bookmark.tab "Bookmarks">
 <!ENTITY config.tabs.dragdrop.tab "Drag &amp; Drop to tabs">
-<!ENTITY config.tabs.misc.tab     "Other Cases">
-
-<!ENTITY config.link.caption "Automatic New Tab Level for Links">
-<!ENTITY config.link.none    "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.link.outer   "Lv.1 Apri i collegamenti a siti esterni in una nuova scheda">
-<!ENTITY config.link.any     "Lv.2 Apri tutti i collegamenti in una nuova scheda">
-
-<!ENTITY config.open_newwindow.caption "Forza i collegamenti che aprono nuove finestre">
-<!ENTITY config.open_newwindow.window  "ad aprirsi in una nuova finestra">
-<!ENTITY config.open_newwindow.tab     "ad aprirsi in una nuova scheda (comportamento predefinito di Firefox)">
-<!ENTITY config.open_newwindow.current "Load into the Current Tab anyway">
 
 <!ENTITY config.openGroupBookmark.caption     "Behavior of &quot;Open All in Tabs&quot; for bookmark folders">
 <!--ENTITY config.openGroupBookmark.caption     "La voce &quot;Apri tutti in schede&quot; nel menu Segnalibri"-->
@@ -76,25 +63,11 @@
 <!ENTITY config.openGroupBookmark.replace     "sostituisce la scheda in uso con i segnalibri contenuti nella cartella selezionata">
 <!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping">
 
-<!ENTITY config.urlbar.caption       "Automatic New Tab Level for the Location Bar">
-<!ENTITY config.urlbar.none          "Lv.0 Nothing (Firefox default)">
-<!ENTITY config.urlbar.outer         "Lv.1 apre una nuova scheda se appartiene a un sito web differente">
-<!ENTITY config.urlbar.any           "Lv.2 Load into new tab always">
-<!ENTITY config.urlbar.asChild.caption "Structuring of opened tabs">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 Open as separate tab">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 Open as child tab if it is the same website">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 Open as child tab always">
-
 <!ENTITY config.dropLinksOnTab.caption "Il trascinamento di collegamenti o indirizzi su una scheda esistente">
 <!ENTITY config.dropLinksOnTab.ask     "Ask me always">
 <!ENTITY config.dropLinksOnTab.load    "carica il collegamento nella scheda (comportamento predefinito di Firefox)">
 <!ENTITY config.dropLinksOnTab.newTab  "apre il collegamento in una nuova sottoscheda">
 
-<!ENTITY config.jsopen.caption "Forza gli script che aprono nuove finestre">
-<!ENTITY config.jsopen.default "ad aprire una nuova finestra se questa è ridimensionata (comportamento predefinito di Firefox)">
-<!ENTITY config.jsopen.forcetab "ad aprirsi tutti in nuove schede (Raccomandato)">
-<!ENTITY config.jsopen.current  "Load into the Current Tab anyway">
-
 
 <!ENTITY config.tabs.autohide "Visualizzazione">
 
@@ -158,11 +131,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Show tree contents in tooltips on tabs">
 
-<!ENTITY config.useEffectiveTLD.caption  "Metodo di individuazione per lo stesso sito web">
-<!ENTITY config.useEffectiveTLD.enabled  "Per dominio(&quot;aaa.example.com&quot; e &quot;bbb.example.com&quot; sono lo stesso sito web)">
-<!ENTITY config.useEffectiveTLD.disabled "Per indirizzo (&quot;aaa.example.com&quot; e &quot;bbb.example.com&quot; sono siti web diversi)">
-
-
 
 
 
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index d77d78bb..f60a803f 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -47,21 +47,8 @@
 
 <!ENTITY config.tabs.tab "新しいタブ">
 
-<!ENTITY config.tabs.link.tab     "リンク">
-<!ENTITY config.tabs.urlbar.tab   "ロケーションバー">
 <!ENTITY config.tabs.bookmark.tab "ブックマーク">
 <!ENTITY config.tabs.dragdrop.tab "タブへのドラッグ＆ドロップ">
-<!ENTITY config.tabs.misc.tab     "その他">
-
-<!ENTITY config.link.caption "リンクから自動的にタブを開くレベル">
-<!ENTITY config.link.none    "Lv.0 なし（Firefox初期状態）">
-<!ENTITY config.link.outer   "Lv.1 異なるサイトへのリンクをタブで開く">
-<!ENTITY config.link.any     "Lv.2 すべてのリンクをタブで開く">
-
-<!ENTITY config.open_newwindow.caption "Webページのリンクから勝手に開かれたウィンドウの制御">
-<!ENTITY config.open_newwindow.window  "ウィンドウで開く">
-<!ENTITY config.open_newwindow.tab     "タブで開く（Firefox初期状態・推奨）">
-<!ENTITY config.open_newwindow.current "ウィンドウやタブを開かず、常に元のタブで読み込む">
 
 <!ENTITY config.openGroupBookmark.caption     "ブックマークフォルダの内容をタブで開く時">
 <!ENTITY config.openGroupBookmark.ask         "どうするか毎回尋ねる">
@@ -74,25 +61,11 @@
 <!ENTITY config.openGroupBookmark.replace     "現在のタブ1つだけをブックマークの内容で置き換える">
 <!ENTITY config.openGroupBookmark.underParent "グループ化用のダミーのタブを親にする">
 
-<!ENTITY config.urlbar.caption       "ロケーションバーから自動的にタブを開くレベル">
-<!ENTITY config.urlbar.none          "Lv.0 なし（Firefox初期状態）">
-<!ENTITY config.urlbar.outer         "Lv.1 異なるサイトを新しいタブで開く">
-<!ENTITY config.urlbar.any           "Lv.2 すべて新しいタブで開く">
-<!ENTITY config.urlbar.asChild.caption "開かれたタブのツリー化">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 ツリーにしない">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 同じサイトのタブを現在のタブの子として開く">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 すべて現在のタブの子として開く">
-
 <!ENTITY config.dropLinksOnTab.caption "リンクやURL、ブックマーク、ファイルをタブにドラッグ＆ドロップした時">
 <!ENTITY config.dropLinksOnTab.ask     "どうするか毎回尋ねる">
 <!ENTITY config.dropLinksOnTab.load    "ドロップ先のタブの中に読み込む（Firefox初期状態）">
 <!ENTITY config.dropLinksOnTab.newTab  "ドロップ先のタブのツリーに新しいタブを開く">
 
-<!ENTITY config.jsopen.caption "Webページのスクリプトで開かれるウィンドウの制御">
-<!ENTITY config.jsopen.default "大きさや位置を指定されたウィンドウはウィンドウとして開く（Firefox初期状態）">
-<!ENTITY config.jsopen.forcetab "スクリプトで開かれるウィンドウはすべてタブで開く（推奨）">
-<!ENTITY config.jsopen.current  "ウィンドウやタブを開かず、常に元のタブで読み込む">
-
 
 <!ENTITY config.tabs.autohide "自動的に隠す">
 
@@ -155,10 +128,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "タブのツールチップにツリーの内容を表示する">
 
-<!ENTITY config.useEffectiveTLD.caption  "同じサイトかどうかの判別方法">
-<!ENTITY config.useEffectiveTLD.enabled  "ドメイン名で判別する（aaa.example.comとbbb.example.comを同じサイトと見なす）">
-<!ENTITY config.useEffectiveTLD.disabled "ホスト名で判別する（aaa.example.comとbbb.example.comを別のサイトと見なす）">
-
 
 
 <!ENTITY selection.removeTabSubtree.label       "すべてのツリーを閉じる">
diff --git a/locale/pl/treestyletab/treestyletab.dtd b/locale/pl/treestyletab/treestyletab.dtd
index 8f7bd78f..4becfb5b 100644
--- a/locale/pl/treestyletab/treestyletab.dtd
+++ b/locale/pl/treestyletab/treestyletab.dtd
@@ -44,21 +44,8 @@
 
 <!ENTITY config.tabs.tab "Nowe karty">
 
-<!ENTITY config.tabs.link.tab     "Odnośniki">
-<!ENTITY config.tabs.urlbar.tab   "Pasek adresu">
 <!ENTITY config.tabs.bookmark.tab "Zakładki">
 <!ENTITY config.tabs.dragdrop.tab "Przeciąganie/Upuszczanie">
-<!ENTITY config.tabs.misc.tab     "Pozostałe">
-
-<!ENTITY config.link.caption "Otwieraj w nowej karcie witryny otwierane przez odnośnik">
-<!ENTITY config.link.none    "Nigdy (domyślne działanie Firefoksa)">
-<!ENTITY config.link.outer   "Jeśli jest to odnośnik do innej witryny">
-<!ENTITY config.link.any     "Zawsze">
-
-<!ENTITY config.open_newwindow.caption "Niespodziewanie otwierane okno z odnośników na stronie otwieraj jako:">
-<!ENTITY config.open_newwindow.window  "okno">
-<!ENTITY config.open_newwindow.tab     "kartę (domyślnie działanie Firefoksa)">
-<!ENTITY config.open_newwindow.current "otwieraj zawsze w aktywnej karcie">
 
 <!ENTITY config.openGroupBookmark.caption     "Działanie funkcji „Otwórz wszystkie w kartach” dla folderów z zakładkami">
 <!ENTITY config.openGroupBookmark.ask         "Zawsze pytaj">
@@ -71,25 +58,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Zastępuj aktywną kartę stronami z folderu">
 <!ENTITY config.openGroupBookmark.underParent "Umieszczaj karty pod pustą kartą dla lepszego grupowania">
 
-<!ENTITY config.urlbar.caption       "Otwieraj w nowej karcie witryny otwierane z paska adresu">
-<!ENTITY config.urlbar.none          "Nigdy (domyślnie działanie Firefoksa)">
-<!ENTITY config.urlbar.outer         "Jeśli jest to inna witryna niż aktywna">
-<!ENTITY config.urlbar.any           "Zawsze">
-<!ENTITY config.urlbar.asChild.caption "Struktura otwieranych kart">
-<!ENTITY config.urlbar.asChild.none  "Otwieraj jako osobną kartę">
-<!ENTITY config.urlbar.asChild.inner "Otwieraj jako kartę potomną jeśli jest to ta sama witryna">
-<!ENTITY config.urlbar.asChild.any   "Zawsze otwieraj jako kartę potomną">
-
 <!ENTITY config.dropLinksOnTab.caption "Działanie po przeciągnięciu odnośników, URL-i, zakładek lub plików do istniejącej karty">
 <!ENTITY config.dropLinksOnTab.ask     "Zawsze pytaj">
 <!ENTITY config.dropLinksOnTab.load    "Otwieraj odnośnik w nowej karcie (domyślne działanie Firefoksa)">
 <!ENTITY config.dropLinksOnTab.newTab  "Otwieraj odnośnik w nowej, potomnej karcie">
 
-<!ENTITY config.jsopen.caption "Okno otwierane przez skrypt na stronie otwieraj jako:">
-<!ENTITY config.jsopen.default "okno jeśli ma określone parametry (domyślnie działanie Firefoksa)">
-<!ENTITY config.jsopen.forcetab "kartę zamiast okna (zalecane)">
-<!ENTITY config.jsopen.current  "Otwieraj zawsze w aktywnej karcie">
-
 
 <!ENTITY config.tabs.autohide "Ukrywanie">
 
@@ -150,9 +123,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Wyświetlaj zawartość drzewa po umieszczeniu kursora nad jego folderem">
 
-<!ENTITY config.useEffectiveTLD.caption  "Metoda rozpoznawania „tej samej witryny”">
-<!ENTITY config.useEffectiveTLD.enabled  "Według domeny („aaa.example.com” i „bbb.example.com” będą rozpoznane jako te same witryny)">
-<!ENTITY config.useEffectiveTLD.disabled "Według hosta („aaa.example.com” i „bbb.example.com” będą rozpoznane jako różne witryny)">
 
 <!ENTITY selection.createSubtree.label          "Zbierz do nowego drzewa">
 <!ENTITY selection.createSubtree.accesskey      "Z">
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index 8b784707..6efc0964 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -47,21 +47,8 @@
 
 <!ENTITY config.tabs.tab "Новые вкладки">
 
-<!ENTITY config.tabs.link.tab     "Ссылки">
-<!ENTITY config.tabs.urlbar.tab   "Адресная строка ">
 <!ENTITY config.tabs.bookmark.tab "Закладки">
 <!ENTITY config.tabs.dragdrop.tab "Претаскивание во вкладки">
-<!ENTITY config.tabs.misc.tab     "Другие случаи">
-
-<!ENTITY config.link.caption "Автодействия для новых вкладок, открываемых из ссылок">
-<!ENTITY config.link.none    "Уровень 0. Отсутствует (в Firefox по умолчанию)">
-<!ENTITY config.link.outer   "Уровень 1. Открывать ссылки на другой сайт в новой вкладке">
-<!ENTITY config.link.any     "Уровень 2. Открывать все ссылки в новой вкладке">
-
-<!ENTITY config.open_newwindow.caption "Открытие высплывающих окон">
-<!ENTITY config.open_newwindow.window  "Открывать как окно">
-<!ENTITY config.open_newwindow.tab     "Открывать как вкладку (в Firefox по умочанию)">
-<!ENTITY config.open_newwindow.current "Всегда загружать в текущую вкладку">
 
 <!ENTITY config.openGroupBookmark.caption     "При операции  &quot;Открыть все в вкладках&quot; из папок закладок">
 <!ENTITY config.openGroupBookmark.ask         "Всегда спрашивать">
@@ -74,25 +61,11 @@
 <!ENTITY config.openGroupBookmark.replace     "Окрывать с заменой текущей вкладки">
 <!ENTITY config.openGroupBookmark.underParent "Создавать для вкладок 'титульную' родительскую вкладку">
 
-<!ENTITY config.urlbar.caption       "Автодействия для новых вкладок, открываемых из адресной строки">
-<!ENTITY config.urlbar.none          "Уровень 0. Отсутствует (в Firefox по умолчанию)">
-<!ENTITY config.urlbar.outer         "Уровень 1. Загружать в новой вкладке, если ведут на другой сайт">
-<!ENTITY config.urlbar.any           "Уровень 2. Загружать в новой вкладке всегда">
-<!ENTITY config.urlbar.asChild.caption "Группировка открываемых вкладок">
-<!ENTITY config.urlbar.asChild.none  "Уровень 0. Открывать как отдельные вкладки">
-<!ENTITY config.urlbar.asChild.inner "Уровень 1. Открывать как дочерние вкладки, если с того же сайта">
-<!ENTITY config.urlbar.asChild.any   "Уровень 2. Открывать как дочерние вкладки всегда">
-
 <!ENTITY config.dropLinksOnTab.caption "Действие при перетаскивании ссылок или URL-ов в имеющуюся вкладку">
 <!ENTITY config.dropLinksOnTab.ask     "Всегда спрашивать">
 <!ENTITY config.dropLinksOnTab.load    "Загрузить ссылку во вкладке (в Firefox по умолчанию)">
 <!ENTITY config.dropLinksOnTab.newTab  "Открыть ссылку в новой вкладке дочерней от текущей">
 
-<!ENTITY config.jsopen.caption "Открытие новых окон скриптами на страницах">
-<!ENTITY config.jsopen.default "Открывать как окно, когда используется специальная ширина, высота, и т.д. (в Firefox по умолчанию)">
-<!ENTITY config.jsopen.forcetab "Всегда открывать как вкладку вместо окна (рекомендуется)">
-<!ENTITY config.jsopen.current  "Загружать в текущую вкладку всегда">
-
 
 <!ENTITY config.tabs.autohide "Автоскрытие/показ панели">
 
@@ -153,10 +126,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "Показывать содержимое дерева в всплывающем окне вкладок">
 
-<!ENTITY config.useEffectiveTLD.caption  "Определать метод для &quot;одного и того же сайта&quot;">
-<!ENTITY config.useEffectiveTLD.enabled  "по домену (&quot;aaa.example.com&quot; и &quot;bbb.example.com&quot; как один и тот же сайт)">
-<!ENTITY config.useEffectiveTLD.disabled "по хосту (&quot;aaa.example.com&quot; и &quot;bbb.example.com&quot; как разные сайты)">
-
 
 
 
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index 792011fe..9bd6bbe0 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -47,21 +47,8 @@
 
 <!ENTITY config.tabs.tab "新标签">
 
-<!ENTITY config.tabs.link.tab     "从链接">
-<!ENTITY config.tabs.urlbar.tab   "从地址栏">
 <!ENTITY config.tabs.bookmark.tab "从书签">
 <!ENTITY config.tabs.dragdrop.tab "拖放到标签">
-<!ENTITY config.tabs.misc.tab     "其他">
-
-<!ENTITY config.link.caption "如何打开新链接？">
-<!ENTITY config.link.none    "Lv.0 当前页面打开（Firefox 默认）">
-<!ENTITY config.link.outer   "Lv.1 在新标签中打开外部网站的链接">
-<!ENTITY config.link.any     "Lv.2 在新标签中打开所有链接">
-
-<!ENTITY config.open_newwindow.caption "如果页面链接要求打开到新窗口的话？">
-<!ENTITY config.open_newwindow.window  "在新窗口中打开">
-<!ENTITY config.open_newwindow.tab     "在新标签中打开（Firefox 默认，推荐）">
-<!ENTITY config.open_newwindow.current "覆盖当前标签">
 
 <!ENTITY config.openGroupBookmark.caption     "如何“在标签页中打开书签组”？">
 <!ENTITY config.openGroupBookmark.ask         "总是询问">
@@ -74,25 +61,11 @@
 <!ENTITY config.openGroupBookmark.replace     "覆盖当前标签打开">
 <!ENTITY config.openGroupBookmark.underParent "将标签置于一伪标签下以便分组">
 
-<!ENTITY config.urlbar.caption       "如何打开地址栏输入的网址？">
-<!ENTITY config.urlbar.none          "Lv.0 当前页面打开（Firefox 默认）">
-<!ENTITY config.urlbar.outer         "Lv.1 与当前标签处于不同网站时在新标签中打开">
-<!ENTITY config.urlbar.any           "Lv.2 总是在新标签中打开">
-<!ENTITY config.urlbar.asChild.caption "如何放置新标签？">
-<!ENTITY config.urlbar.asChild.none  "Lv.0 打开成独立的标签">
-<!ENTITY config.urlbar.asChild.inner "Lv.1 与当前标签处于相同网站时在新子标签中打开">
-<!ENTITY config.urlbar.asChild.any   "Lv.2 总是在新子标签中打开">
-
 <!ENTITY config.dropLinksOnTab.caption "如何打开拖拽到现有标签的链接或URL？">
 <!ENTITY config.dropLinksOnTab.ask     "总是询问">
 <!ENTITY config.dropLinksOnTab.load    "在该标签中打开（Firefox 默认）">
 <!ENTITY config.dropLinksOnTab.newTab  "在此标签下新建子标签打开">
 
-<!ENTITY config.jsopen.caption "如何打开要求新窗口的网页脚本链接？">
-<!ENTITY config.jsopen.default "若已指定窗口宽度、高度等，则在新窗口中打开（Firefox 默认）">
-<!ENTITY config.jsopen.forcetab "任何情况下都在标签中打开 （推荐）">
-<!ENTITY config.jsopen.current  "覆盖当前标签打开">
-
 
 <!ENTITY config.tabs.autohide "自动隐藏">
 
@@ -154,11 +127,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "在树节点按钮的工具提示中显示树的分支内容">
 
-<!ENTITY config.useEffectiveTLD.caption  "“相同网站”的标准">
-<!ENTITY config.useEffectiveTLD.enabled  "相同域名（“aaa.example.com” 和 “bbb.example.com” 视为相同网站）">
-<!ENTITY config.useEffectiveTLD.disabled "相同主机（“aaa.example.com” 和 “bbb.example.com” 视为不同网站）">
-
-
 
 
 
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index ea7f0929..f42e9c34 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -48,21 +48,8 @@
 <!ENTITY config.tabs.tab "New Tabs">
 <!--ENTITY config.tabs.tab "分頁操作"-->
 
-<!ENTITY config.tabs.link.tab     "Links">
-<!ENTITY config.tabs.urlbar.tab   "Location Bar">
 <!ENTITY config.tabs.bookmark.tab "Bookmarks">
 <!ENTITY config.tabs.dragdrop.tab "Drag &amp; Drop to tabs">
-<!ENTITY config.tabs.misc.tab     "Other Cases">
-
-<!ENTITY config.link.caption "鏈結新分頁位階自動化">
-<!ENTITY config.link.none    "位階-0 無 (Firefox 預設)">
-<!ENTITY config.link.outer   "位階-1 用新分頁開啟通往不同網站的鏈結">
-<!ENTITY config.link.any     "位階-2 用新分頁開啟所有鏈結">
-
-<!ENTITY config.open_newwindow.caption "從網頁鏈結開啟新視窗的控制">
-<!ENTITY config.open_newwindow.window  "用新視窗開啟">
-<!ENTITY config.open_newwindow.tab     "用新分頁開啟（Firefox 預設）">
-<!ENTITY config.open_newwindow.current "直接開在目前瀏覽的分頁">
 
 <!ENTITY config.openGroupBookmark.caption     "按書籤資料夾的「全部開啟」時">
 <!--ENTITY config.openGroupBookmark.caption   "按書籤資料夾的「全部開啟」時"-->
@@ -76,25 +63,11 @@
 <!ENTITY config.openGroupBookmark.replace     "將目前瀏覽的分頁取代為書籤的內容">
 <!ENTITY config.openGroupBookmark.underParent "將各分頁開啟於一虛分頁之下以便分組">
 
-<!ENTITY config.urlbar.caption       "位址欄新分頁位階自動化">
-<!ENTITY config.urlbar.none          "位階-0 無 (Firefox 預設)">
-<!ENTITY config.urlbar.outer         "位階-1 用新分頁開啟通往不同網站的 URL">
-<!ENTITY config.urlbar.any           "位階-2 固定用新分頁開啟">
-<!ENTITY config.urlbar.asChild.caption "Structuring of opened tabs">
-<!ENTITY config.urlbar.asChild.none  "位階-0 開啟為各別分頁">
-<!ENTITY config.urlbar.asChild.inner "位階-1 如果同網站就開啟為子分頁">
-<!ENTITY config.urlbar.asChild.any   "位階-2 一律開啟為子分頁">
-
 <!ENTITY config.dropLinksOnTab.caption "拖曳鏈結或 URL 到現有的分頁時">
 <!ENTITY config.dropLinksOnTab.ask     "每次都問我">
 <!ENTITY config.dropLinksOnTab.load    "在拖曳目的地分頁載入鏈結（Firefox 預設）">
 <!ENTITY config.dropLinksOnTab.newTab  "用拖曳目的地分頁之下的新子分頁開啟鏈結">
 
-<!ENTITY config.jsopen.caption "從網頁的指令碼開啟新視窗的控制">
-<!ENTITY config.jsopen.default "當指定了大小和位置，則用新視窗開啟（Firefox 預設）">
-<!ENTITY config.jsopen.forcetab "在任何情况下用新分頁而非新視窗開啟（推薦）">
-<!ENTITY config.jsopen.current  "直接開在目前瀏覽的分頁">
-
 
 <!ENTITY config.tabs.autohide "自動隱藏">
 
@@ -157,10 +130,6 @@
 
 <!ENTITY config.tooltip.includeChildren        "於頁籤提示方塊中顯示該樹的內容">
 
-<!ENTITY config.useEffectiveTLD.caption  "「同類其他分頁」定義依據">
-<!ENTITY config.useEffectiveTLD.enabled  "依據網域(&quot;aaa.example.com&quot; 與 &quot;bbb.example.com&quot; 視為同類)">
-<!ENTITY config.useEffectiveTLD.disabled "依據主機(&quot;aaa.example.com&quot; 與 &quot;bbb.example.com&quot; 不算同類)">
-
 
 
 <!ENTITY selection.removeTabSubtree.label     "關閉所有選取的樹">