[tbb-commits] [torbutton/master] Bug 18238: remove unused Torbutton code and strings

Fri Jun 3 09:26:31 UTC 2016

commit 58d67d50eb41caf0493126a859646a476d6700f4
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue May 31 16:37:00 2016 -0400

    Bug 18238: remove unused Torbutton code and strings
    
    Remove unused entities.
    Remove unused "about.xul" and associated entities.
---
 src/chrome/content/about.xul          |  60 --------------------
 src/chrome/content/torbutton_util.js  |  20 -------
 src/chrome/locale/af/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ak/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/am/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ar/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/arn/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/ast/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/az/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/be/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/bg/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/bms/torbutton.dtd   |  93 -------------------------------
 src/chrome/locale/bn-IN/torbutton.dtd | 101 ---------------------------------
 src/chrome/locale/bn/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/bo/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/br/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/bs/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ca/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/cs/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/csb/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/cy/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/da/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/de/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/dz/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/el/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/en/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/eo/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/es/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/et/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/eu/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/fa/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/fi/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/fil/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/fo/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/fr/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/fur/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/fy/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ga/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/gl/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/gu/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/gun/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/ha/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/he/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/hi/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/hr/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ht/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/hu/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/hy/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/id/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/is/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/it/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/ja/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/jv/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ka/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/km/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/kn/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ko/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/ku/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/kw/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ky/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/lb/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/lg/torbutton.dtd    |  94 -------------------------------
 src/chrome/locale/ln/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/lo/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/lt/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/lv/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mg/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mi/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mk/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ml/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mn/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mr/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ms/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/mt/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/my/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/nah/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/nap/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/nb/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ne/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/nl/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/nn/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/nso/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/oc/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/or/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/pa/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/pap/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/pl/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/pms/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/ps/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/pt-BR/torbutton.dtd | 101 ---------------------------------
 src/chrome/locale/pt/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/ro/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ru/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/sco/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/sk/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/sl/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/so/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/son/torbutton.dtd   | 101 ---------------------------------
 src/chrome/locale/sq/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/sr/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/st/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/su/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/sv/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/sw/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ta/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/te/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/tg/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/th/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ti/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/tk/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/tr/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/uk/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ur/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/ve/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/vi/torbutton.dtd    | 102 ----------------------------------
 src/chrome/locale/wa/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/wo/torbutton.dtd    | 101 ---------------------------------
 src/chrome/locale/zh-CN/torbutton.dtd | 102 ----------------------------------
 src/chrome/locale/zh-HK/torbutton.dtd | 101 ---------------------------------
 src/chrome/locale/zh-TW/torbutton.dtd | 101 ---------------------------------
 src/chrome/locale/zu/torbutton.dtd    | 101 ---------------------------------
 121 files changed, 12102 deletions(-)

diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
deleted file mode 100644
index 79c6946..0000000
--- a/src/chrome/content/about.xul
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
-
-<dialog id="torbutton-about"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  buttons="accept"
-  title="&torbutton.about.title;"
-  width="500"
-  height="400"
-  align="center"
-  onload="torbutton_about_init();">
-
-  <script type="application/x-javascript" src="torbutton_util.js" />
-
-  <vbox>
-    <label style="text-align:center; color: blue; cursor:hand; text-decoration: underline;font-weight:bold; font-size:22px;"
-        value="&torbutton.button.label;"
-        onmouseover="event.target.style.cursor='pointer'"
-        onmouseout="event.target.style.cursor='default'"
-        onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/docs/torbutton/')"/>
-    <label style="text-align:center; font-size:18px; margin-top: 10px; margin-bottom:20px;">&torbutton.about.summary;</label>
-
-    <groupbox>
-      <caption label="&torbutton.about.version;" />
-      <label id="torbuttonVersion"/>
-    </groupbox>
-    
-    <groupbox>
-      <caption label="&torbutton.about.maintainer;" />
-      <label>Mike Perry</label>
-    </groupbox>
-    
-    <groupbox>
-      <caption label="&torbutton.about.code;" />
-      <label>JÃ©rÃ©my Bobbio, arno, Collin Jackson, Kory Kirk, Edward Pastuszenski, and Scott Squires</label>
-    </groupbox>
-
-<!--
-    Hrmm.. It is probably wrong to give the impression that these people do
-    continual review. Right now, no one does that :(. These two used to, but
-    we haven't heard much from them lately.
-    <groupbox>
-      <caption label="&torbutton.about.security_review;" />
-      <label>Gregory Fleischer, Kyle Williams, and many others.</label>
-    </groupbox>
--->
-
-    <label style="font-weight:bold; margin-top:50px;">
-      &torbutton.about.donate;<label id="donate link"
-        value="&torbutton.about.make_donation;"
-        style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
-        onmouseover="event.target.style.cursor='pointer'"
-        onmouseout="event.target.style.cursor='default'"
-        onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/donate/donate.html.en')"/>
-    </label>
-  </vbox>
-</dialog>
diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js
index 68276d0..e7b0197 100644
--- a/src/chrome/content/torbutton_util.js
+++ b/src/chrome/content/torbutton_util.js
@@ -269,23 +269,3 @@ function torbutton_get_property_string(propertyname)
     return propertyname;
 }
 
-function torbutton_about_init() {
-    try {
-        // Firefox 4 and later; Mozilla 2 and later
-        Components.utils.import("resource://gre/modules/AddonManager.jsm");
-        AddonManager.getAddonByID("torbutton at torproject.org",function(addon) {
-            var extensionVersion = document.getElementById("torbuttonVersion");
-            extensionVersion.setAttribute("value", addon.version);
-        });
-    } catch (ex) {
-        // Firefox 3.6 and before; Mozilla 1.9.2 and before
-        var em = Components.classes["@mozilla.org/extensions/manager;1"]
-                 .getService(Components.interfaces.nsIExtensionManager);
-        var addon = em.getItemForID("torbutton at torproject.org");
-        var extensionVersion = document.getElementById("torbuttonVersion");
-        extensionVersion.setAttribute("value", addon.version);
-    }
-
-}
-
-
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index b9f7205..43601b2 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ØªÙØ¶ÙŠÙ„Ø§Øª Ø²Ø± ØªÙˆØ±">
 <!ENTITY torbutton.prefs.tor_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ">
 <!ENTITY torbutton.prefs.recommended_settings "Ø§Ø³ØªØ®Ø¯Ù… Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ Ø§Ù„Ù…ØØ¨Ù‘Ø°Ø© Ù„Ù‡Ø°Ù‡ Ø§Ù„Ù†Ø³Ø®Ø© Ù…Ù† ÙØ§ÙŠØ±ÙÙƒØ³">
-<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªØ®Ø¯Ù… Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªØ®Ø¯Ù… Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Ø§Ø³ØªØ®Ø¯Ù… Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¨Ø±ÙˆÙƒØ³ÙŠ Ù…Ø®ØµØµØ©">
 <!ENTITY torbutton.prefs.proxy.host.http "Ø¨Ø±ÙˆÙƒØ³ÙŠ HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Ø¨Ø±ÙˆÙƒØ³ÙŠ Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Ø¨Ø±ÙˆÙƒØ³ÙŠ SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Ø§Ù„Ø¨ÙˆØ§Ø¨Ø©:">
-<!ENTITY torbutton.about.title "Ø¹Ù† Ø²Ø± ØªÙˆØ±">
-<!ENTITY torbutton.about.version "Ø§Ù„Ø¥ØµØ¯Ø§Ø± :">
-<!ENTITY torbutton.about.summary "ÙŠØÙ…ÙŠ Ø®ØµÙˆØµÙŠØ© ØªØµÙØÙƒ Ø¹Ø¨Ø± ØªÙˆØ±">
-<!ENTITY torbutton.about.code "Ø§Ù„Ù…Ø³Ø§Ù‡Ù…ÙˆÙ† ÙÙŠ ÙƒØªØ§Ø¨Ø© ÙˆØªØ·ÙˆÙŠØ± ØªØ¹Ù„ÙŠÙ…Ø§Øª Ø§Ù„Ø¨Ø±Ù…Ø¬Ø©:">
-<!ENTITY torbutton.about.maintainer "Ø§Ù„Ù…Ø´Ø±Ù Ø¹Ù„Ù‰ Ø§Ù„ØµÙŠØ§Ù†Ø©:">
-<!ENTITY torbutton.about.security_review "Ø§Ù„Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ù…Ù†ÙŠØ© :">
-<!ENTITY torbutton.about.donate "Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØØ¨ Ø§Ø³ØªØ®Ø¯Ø§Ù… ØªÙˆØ±ØŒ Ù‚Ø¯ ØªÙÙƒÙ‘Ø± ÙÙŠ">
-<!ENTITY torbutton.about.make_donation "Ø§Ù„ØªØ¨Ø±Ù‘Ø¹.">
 <!ENTITY torbutton.pref_connection.notice "Ø¹Ø·Ù‘Ù„ Ø²Ø± ØªÙˆØ± Ù„ØªØºÙŠÙŠØ± Ù‡Ø°Ù‡ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª.">
 <!ENTITY torbutton.pref_connection.more_info "Ù…Ø²ÙŠØ¯ Ù…Ù† Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª">
 <!ENTITY torbutton.pref_connection_more_info.title "Ø§Ù„ØªØ¹Ù„ÙŠÙ…Ø§Øª">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ø¯Ø§Ø¦Ø±Ø© ØªÙˆØ± Ø¬Ø¯ÙŠØ¯Ø© Ù„Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆÙ‚Ø¹">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Ø¨Ø¯Ù‘Ù„ ØØ§Ù„Ø© ØªÙØ¹ÙŠÙ„ ØªÙˆØ±">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®ØµÙˆØµÙŠØ© ÙˆØ§Ù„Ø£Ù…Ø§Ù†...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Ø¹Ù† Ø²Ø± ØªÙˆØ±...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨ÙƒØ© ØªÙˆØ±...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "ØªØÙ‚Ù‚ Ù…Ù† ØªØØ¯ÙŠØ«Ø§Øª Ù…ØªØµÙØ ØªÙˆØ±...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ù…Ø§Ù† Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Ù†Ø³Ø® Ø±Ø§Ø¨Ø· ØªÙˆØ±">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "ÙØªØ Ø¹Ù†ÙˆØ§Ù† ØªÙˆØ± ÙÙŠ ØµÙØØ© ØªØ¨ÙˆÙŠØ¨ Ø¬Ø¯ÙŠØ¯Ø©">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "ÙØªØ Ø¹Ù†ÙˆØ§Ù† ØªÙˆØ± ÙÙŠ Ù†Ø§ÙØ°Ø© Ø¬Ø¯ÙŠØ¯Ø©">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Ø²Ø± ØªÙˆØ±">
 <!ENTITY torbutton.button.tooltip "Ø§Ù†Ù‚Ø± Ù„Ø¨Ø¯Ø¡ Ø²Ø± ØªÙˆØ±">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø£Ù…Ø§Ù† ÙˆØ§Ù„Ø®ØµÙˆØµÙŠÙ‘Ø©">
-<!ENTITY torbutton.prefs.block_thread "Ø§Ù…Ù†Ø¹ Ù‚Ø±Ø§Ø¡Ø© Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ ØªÙˆØ± (Ø¶Ø±ÙˆØ±ÙŠ Ø¬Ø¯Ø§)">
-<!ENTITY torbutton.prefs.block_thwrite "Ø§Ù…Ù†Ø¹ ÙƒØªØ§Ø¨Ø© Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ ØªÙˆØ± (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.block_nthread "Ø§Ù…Ù†Ø¹ Ù‚Ø±Ø§Ø¡Ø© Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø£Ø«Ù†Ø§Ø¡ ØªÙˆÙ‚Ù ØªÙˆØ± (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ø§Ù…Ù†Ø¹ ÙƒØªØ§Ø¨Ø© Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø£Ø«Ù†Ø§Ø¡ ØªÙˆÙ‚Ù ØªÙˆØ± (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.clear_history "Ø§Ù…Ø³Ø Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø¹Ù†Ø¯ ØªØºÙŠØ± ØØ§Ù„Ø© ØªÙØ¹ÙŠÙ„ ØªÙˆØ± (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.clear_cache "Ø§Ù…Ù†Ø¹ Tor Ù…Ù† ØªØ®Ø²ÙŠÙ† Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø¨Ø´ÙƒÙ„ Ù…Ø¤Ù‚Øª Ø¹Ù„Ù‰ Ø§Ù„Ù‚Ø±Øµ ÙˆØ§Ù…Ø³Ø ÙƒÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ù…Ø¤Ù‚ØªØ© Ø¹Ù†Ø¯ ØªØ¨Ø¯ÙŠÙ„ ØØ§Ù„Ø© ØªÙˆØ±">
-<!ENTITY torbutton.prefs.block_cache "Ø§Ù…Ù†Ø¹ Ø§Ù„ÙˆÙ„ÙˆØ¬ Ø¥Ù„Ù‰ Ø¨ÙŠØ§Ù†Ø§Øª ØªÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ù‚Ø±Øµ Ùˆ Ø§Ù„Ø°Ø§ÙƒØ±Ø© Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ ØªÙˆØ±">
-<!ENTITY torbutton.prefs.cookie_jars "Ø§ØÙØ¸ Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) ØºÙŠØ± Ø§Ù„Ù…Ø±ØªØ¨Ø·Ø© Ø¨ØªØµÙØ ØªÙˆØ± ÙÙŠ ÙˆØ¹Ø§Ø¡ Ø¢Ù…Ù† ">
-<!ENTITY torbutton.prefs.cookie_protection "Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù†Ø§ÙØ°Ø© ØÙˆØ§Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØÙ…Ø§ÙŠØ© Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ§Ø¨Ø· Ù„Ø§Ø®ØªÙŠØ§Ø±">
-<!ENTITY torbutton.prefs.mmm_cookies "Ø³Ø£Ø¯ÙŠØ± Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø´ÙƒÙ„ ÙŠØ¯ÙˆÙŠ (Ø®Ø·Ø±)">
-<!ENTITY torbutton.prefs.clear_cookies "Ø§Ù…Ø³Ø Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) Ø¹Ù†Ø¯ ØªØ¨Ø¯ÙŠÙ„ ØØ§Ù„Ø© ØªÙÙŠÙŠÙ„ ØªÙˆØ±">
-<!ENTITY torbutton.prefs.disable_plugins "Ø¹Ø·Ù‘Ù„ Ø§Ù„Ù…Ù„ØÙ‚Ø§Øª Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ± (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ø§ØØ¬Ø² Ø¬Ø§ÙØ§Ø³ÙƒØ±Ø¨Øª Ø§Ù„Ø®Ø·Ø±Ø© (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.isolate_content "Ø§Ø¹Ø²Ù„ Ø§Ù„Ù…ØØªÙˆÙ‰ Ø§Ù„ØØ±ÙƒÙŠ Ø¹Ù† ØØ§Ù„Ø© ØªÙˆØ± (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.no_updates "Ø¹Ø·Ù„ Ø§Ù„ØªØØ¯ÙŠØ«Ø§Øª Ø£Ø«Ù†Ø§Ø¡ Ø§Ø³ØªØ®Ø¯Ø§Ù… ØªÙˆØ±">
-<!ENTITY torbutton.prefs.set_uagent "Ø§Ø¶Ø¨Ø· ÙˆÙƒØ¨Ù„ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù„Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ± (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.dynamic "Ø§Ù„Ù…ØØªÙˆÙ‰ Ø§Ù„Ø¯ÙŠÙ†Ø§Ù…ÙŠÙƒÙŠ">
-<!ENTITY torbutton.prefs.cookies "Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²)">
-<!ENTITY torbutton.prefs.cache "Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ù…Ø®Ø²Ù†Ø© Ø¨Ø´ÙƒÙ„ Ù…Ø¤Ù‚Øª">
-<!ENTITY torbutton.prefs.history "Ø§Ù„Ø³Ø¬Ù„">
-<!ENTITY torbutton.prefs.no_search "Ø§Ù…Ù†Ø¹ Ø§Ù‚ØªØ±Ø§ØØ§Øª Ø§Ù„Ø¨ØØ« Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ± (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.shutdown "Ø£ØºÙ„Ù‚ Ø§Ù„Ù…ØªØµÙØ">
-<!ENTITY torbutton.prefs.tor_shutdown "Ø§Ù…Ø³Ø Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) Ø¹Ù†Ø¯ Ø¥ØºÙ„Ø§Ù‚ Ø§Ù„Ù…ØªØµÙØ Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ±">
-<!ENTITY torbutton.prefs.all_shutdown "Ø§Ù…Ø³Ø Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) Ø¹Ù†Ø¯ Ø£ÙŠ Ø¥ØºÙ„Ø§Ù‚ Ù„Ù„Ù…ØªØµÙØ">
-<!ENTITY torbutton.prefs.no_shutdown "Ù„Ø§ ØªÙ…Ø³Ø Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) Ø¹Ù†Ø¯ Ø¥ØºÙ„Ø§Ù‚ Ø§Ù„Ù…ØªØµÙØ">
-<!ENTITY torbutton.prefs.disable_sessionstore "Ø¹Ø·Ù‘Ù„ ØÙØ¸ Ø§Ù„Ø¬Ù„Ø³Ø© (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.headers "Ø§Ù„ØªØ±ÙˆÙŠØ³Ø§Øª">
-<!ENTITY torbutton.prefs.refererspoofing "ØªØ²ÙŠÙŠÙ Ø§Ù„Ù…Ø±Ø¬Ø¹">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Ù…ØØ§ÙƒØ§Ø© Ø³Ø§Ø®Ø±Ø© Ø°ÙƒÙŠØ© Ù„Ù„ØªØÙˆÙŠÙ„ Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ ØªÙˆØ± (Ø³Ø®Ø±ÙŠØ© Ø§Ù„Ù…Ø¬Ø§Ù„ Ø§Ù„Ù…Ø±Ø¬Ø¹ÙŠ Ø§Ù„Ù…ØªÙ‚Ø§Ø·Ø¹)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ø¹Ø·Ù‘Ù„ ØªØ®Ø²ÙŠÙ† DOM Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ± (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.forms "Ø§Ù„Ø¥ÙƒÙ…Ø§Ù„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ">
-<!ENTITY torbutton.prefs.block_tforms "Ø§Ù…Ù†Ø¹ ØÙØ¸ ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø± Ùˆ ÙˆØ§Ù„Ø¥ÙƒÙ…Ø§Ù„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ø£Ø«Ù†Ø§Ø¡ Ø¹Ù…Ù„ Ø§Ù„ØªÙˆØ± (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.block_ntforms "Ø§Ù…Ù†Ø¹ ØÙØ¸ ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø± ÙˆØ§Ù„Ø¥ÙƒÙ…Ø§Ù„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ø£Ø«Ù†Ø§Ø¡ ØªØ¹Ø·Ù„ Ø§Ù„ØªÙˆØ± (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.tor "ØªÙˆØ±">
-<!ENTITY torbutton.prefs.non_tor "Ø§Ù„ØªÙˆØ± Ù…Ø¹Ø·Ù„">
-<!ENTITY torbutton.prefs.restore_tor "Ø®Ù„Ø§Ù„ Ø¨Ø¯Ø¡ Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù„Ø¬Ù„Ø³Ø©ØŒ Ø§Ø¶Ø¨Ø· ØØ§Ù„Ø© Ø§Ù„ØªÙˆØ± Ø¥Ù„Ù‰:">
-<!ENTITY torbutton.prefs.startup_tor "Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ Ø§Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„Ù…ØªØµÙØØŒ ØºÙŠÙ‘Ø± Ø¬Ø§Ù„Ø© ØªÙˆØ± Ø¥Ù„Ù‰:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ø£Ø¹Ø¯ ØªØÙ…ÙŠÙ„ ÙˆØ¹Ø§Ø¡ Ø§Ù„ÙƒØ¹ÙƒØ§Øª/Ø§Ù…Ø³Ø Ø§Ù„ÙƒØ¹ÙƒØ§Øª Ø¹Ù†Ø¯ Ø§Ù†Ù‡ÙŠØ§Ø± ÙÙŠØ±ÙÙƒØ³ (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ø§ØÙØ¸ Ø§Ù„ÙƒØ¹ÙƒØ§Øª Ø¹Ù† ØªÙØ¹ÙŠÙ„ ØªÙˆØ± ÙˆØ¹Ù†Ø¯ ØªØ¹Ø·ÙŠÙ„Ù‡ ÙÙŠ Ø£ÙˆØ¹ÙŠØ© Ù…ØÙ…ÙŠØ© (Ø®Ø·Ø±)">
-<!ENTITY torbutton.prefs.clear_http_auth "Ø§Ù…Ø³Ø Ø¬Ù„Ø³Ø§Øª Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ù„Ù€ HTTP (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.block_js_history "Ø§Ù…Ù†Ø¹ Ù†ÙØ§Ø° Ø¬Ø§ÙØ§Ø³ÙƒØ±Ø¨Øª Ø¥Ù„Ù‰ ØªØµÙØ Ø§Ù„ØªØ§Ø±ÙŠØ® (ØÙŽØ±ÙØ¬)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ø£Ø¹Ø¯ ØªØØ¬ÙŠÙ… Ø§Ù„Ù†ÙˆØ§ÙØ° Ø¥Ù„Ù‰ Ù…Ø¶Ø§Ø¹ÙØ§Øª 50 Ø¨ÙŠÙƒØ³Ù„ Ø¹Ù†Ø¯ ØªØºÙŠØ± Ø§Ù„ØØ§Ù„Ø© (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.close_tor "Ø£ØºÙ„Ù‚ ÙƒÙ„ Ù†ÙˆØ§ÙØ° ÙˆØªØ¨ÙˆÙŠØ¨Ø§Øª Ø§Ù„ØªÙˆØ± Ø¹Ù†Ø¯ ØªØºÙŠÙŠØ± Ø§Ù„ØØ§Ù„Ø© (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.close_nontor "Ø£ØºÙ„Ù‚ ÙƒÙ„ Ù†ÙˆØ§ÙØ° Ùˆ ØªØ¨ÙˆÙŠØ¨Ø§Øª ØºÙŠØ± Ø§Ù„ØªÙˆØ± Ø¹Ù†Ø¯ ØªØºÙŠÙŠØ± Ø§Ù„ØØ§Ù„Ø© (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.block_links "Ø§Ù…Ù†Ø¹ Ù†Ù‚Ø± Ø§Ù„Ø±ÙˆØ§Ø¨Ø· Ùˆ Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ…ÙŠÙ„ Ø§Ù„ØµÙØØ§Øª Ø¨ÙŠÙ† ØØ§Ù„Ø§Øª Ø§Ù„ØªÙˆØ± Ø§Ù„Ù…Ø®ØªÙ„ÙØ© (Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.jar_certs "ØÙØ¸ Ø¨ÙŠØ§Ù†Ø§Øª SSL ÙÙŠ Ù…Ù„ÙØ§Øª Ù…Ø®ØªÙ„ÙØ© Ù„Ø£Ø¬Ù„ Ø§Ù„ØªÙˆØ±/Ø§Ù„ØªÙˆØ± Ù…Ø¹Ø·Ù„ (Ù…ØØ¨Ù‘Ø°) ">
-<!ENTITY torbutton.prefs.jar_ca_certs "ØÙØ¸ Ø¨ÙŠØ§Ù†Ø§Øª CA ÙÙŠ Ù…Ù„ÙØ§Øª Ù…Ø®ØªÙ„ÙØ© Ù„Ø£Ø¬Ù„ Ø§Ù„ØªÙˆØ±/Ø§Ù„ØªÙˆØ± Ù…Ø¹Ø·Ù„ (Ù…ØØ¨Ù‘Ø°) ">
-<!ENTITY torbutton.prefs.locked_mode "Ø¹Ø·Ù‘Ù„ Ø§Ù„Ù…ÙØ§ØªÙŠØ ÙˆØ¥Ø®ØªØµØ§Ø±Ø§Øª Ø§Ù„Ù…ÙØ§ØªÙŠØ  Ù„ØªØ¬Ù†Ø¨ ØªØºÙŠÙŠØ± ØØ§Ù„Ø© Ø§Ù„ØªÙˆØ± Ø¨Ø§Ù„Ø®Ø·Ø£">
-<!ENTITY torbutton.prefs.startup_state "Ø®Ù„Ø§Ù„ Ø¹Ù…Ù„ÙŠØ§Øª Ø§Ù„Ø¨Ø¯Ø¡ Ø§Ù„Ø¹Ø§Ø¯ÙŠØ©ØŒ Ø§Ø¶Ø¨Ø· ØØ§Ù„Ø© ØªÙˆØ±:">
-<!ENTITY torbutton.prefs.shutdown_state "ØØ§Ù„Ø© Ø§Ù„Ø¥ÙŠÙ‚Ø§Ù">
-<!ENTITY torbutton.prefs.startup "Ø§Ù„Ø¨Ø¯Ø¡">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ø§Ù…Ù†Ø¹ Ø§Ù„Ù†ÙØ§Ø° Ø¥Ù„Ù‰ Ø§Ù„Ø´Ø¨ÙƒØ© Ù…Ù† Ù…Ø³Ø§Ø±Ø§Øª file:// (Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ø§Ù…Ù†Ø¹ ÙˆØµÙˆÙ„ Ø§Ù„ØªÙˆØ± Ù…Ø¹Ø·Ù„ Ø¥Ù„Ù‰ Ø§Ù„Ø´Ø¨ÙƒØ© Ù…Ù† Ø¹Ù†Ø§ÙŠÙ† file://">
 <!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ§Øª">
 <!ENTITY torbutton.prefs.test_settings "ÙØØµ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª">
-<!ENTITY torbutton.prefs.test_auto "Ø§ÙØØµ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙˆØ± Ø¨Ø¹Ø¯ Ø£ÙˆÙ„ ØªØ´ØºÙŠÙ„ ÙƒÙ„ Ù…Ø±Ø© ÙŠØªÙ… ØªØ´ØºÙŠÙ„ ÙÙŠØ±ÙÙƒØ³">
-<!ENTITY torbutton.prefs.disable_livemarks "Ø¥Ù„ØºØ§Ø¡ ØªØØ¯ÙŠØ« Ø§Ù„Ø¹Ù„Ø§Ù…Ø§Øª Ø§Ù„ØÙŠØ© Ø£Ø«Ù†Ø§Ø¡ Ø¥Ø³ØªØ¹Ù…Ø§Ù„  ØªÙˆØ±">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ù„Ø§ ØªØÙØ¸ Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) ÙÙŠ Ø§Ù„Ù‚Ø±Øµ Ø¥Ø°Ø§ ÙƒØ§Ù† Ø§Ù„ØªÙˆØ± Ù…ÙØ¹Ù„Ù‹Ø§">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ù„Ø§ ØªØÙØ¸ Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· (ÙƒÙˆÙƒÙŠØ²) ÙÙŠ Ø§Ù„Ù‚Ø±Øµ Ø¥Ù† ÙƒØ§Ù† ØªÙˆØ± Ù…Ø¹Ø·Ù„Ù‹Ø§">
-<!ENTITY torbutton.prefs.session_restore "ØÙØ¸ Ø§Ù„Ø¬Ù„Ø³Ø© ÙˆØ§Ø³ØªØ¹Ø§Ø¯Ø© Ù‡Ø°Ù‡  Ø§Ù„ØªØ¨ÙˆÙŠØ¨Ø§Øª:">
-<!ENTITY torbutton.prefs.nontor_tabs "ØªØ¨ÙˆÙŠØ¨Ø§Øª Ù…ØÙ…Ù„Ø© ÙÙŠ ÙˆØ¶Ø¹ Ø§Ù„ØªÙˆØ± Ù…Ø¹Ø·Ù„">
-<!ENTITY torbutton.prefs.tor_tabs "ØªØ¨ÙˆÙŠØ¨Ø§Øª Ù…ØÙ…Ù„Ø© ÙÙŠ ÙˆØ¶Ø¹ ØªÙˆØ± Ù…ÙØ¹Ù„">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ù„Ø§ ÙˆØ³ÙŠØ· Ù„:">
 <!ENTITY torbutton.prefs.no_proxy_warning "ØªØØ°ÙŠØ±: ØªØ¬Ù†Ø¨ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø£ÙŠ Ù…Ù† Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ø¶ÙŠÙ Ø§Ù„Ù…Ø°ÙƒÙˆØ±Ø© Ø£Ø¹Ù„Ø§Ù‡">
-<!ENTITY torbutton.prefs.spoofreresh "ØªØØ¯ÙŠØ« Ø§Ù„Ù…ØØ§ÙƒØ§Ø© Ø§Ù„Ø³Ø§Ø®Ø±Ø©">
-<!ENTITY torbutton.prefs.refereroptions "Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„Ù…Ø±Ø¬Ø¹ÙŠØ© Ø§Ù„Ø³Ø§Ø®Ø±Ø©">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Ù…ØØ§ÙƒØ§Ø© Ø³Ø§Ø®Ø±Ø© Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„Ø°ÙŠ ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ Ø§Ù„ØµÙØØ©">
-<!ENTITY torbutton.prefs.spoofdomain "Ù…ØØ§ÙƒØ§Ø© Ø³Ø§Ø®Ø±Ø© Ø§Ù„Ù…Ø¬Ø§Ù„ Ù…Ø«Ù„ Ø§Ù„Ù…Ø±Ø¬Ø¹ÙŠØ©">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§Ù„ØÙ…Ø§ÙŠØ© Ù„Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·">
 <!ENTITY torbutton.cookiedialog.lockCol "Ù…ØÙ…ÙŠØ©">
 <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§ÙØ©">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ÙƒÙ„ Ù„ÙƒÙ† Ø§Ø³ØªÙ…Ø± ÙÙŠ Ø§Ù„ØÙ…Ø§ÙŠØ©">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ… Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù„Ø§ ØªØÙ… Ù…Ù„ÙØ§Øª ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©">
-<!ENTITY torbutton.prefs.disable_livemarks "Ø¥Ù„ØºØ§Ø¡ ØªØØ¯ÙŠØ« Ø§Ù„Ø¹Ù„Ø§Ù…Ø§Øª Ø§Ù„ØÙŠØ© Ø£Ø«Ù†Ø§Ø¡ Ø¥Ø³ØªØ¹Ù…Ø§Ù„  ØªÙˆØ±">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ù…ØØ¨Ù‘Ø°)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙŠØ§Ø±ÙŠ)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ø¶Ø±ÙˆØ±ÙŠ Ø¬Ø¯Ø§)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Ø£Ø¹Ø¯ ØªÙˆØ¬ÙŠÙ‡ ØªØØ¯ÙŠØ«Ø§Øª Ø²Ø± ØªÙˆØ± Ø®Ù„Ø§Ù„ Ø´Ø¨ÙƒØ© Ø§Ù„ØªÙˆØ±">
-<!ENTITY torbutton.prefs.dodge_google_captcha "ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹ Ø§Ø³ØªØ®Ø¯Ù… Ù…ØØ±Ùƒ Ø¨ØØ« Ø¨Ø¯ÙŠÙ„ Ø¹Ù†Ø¯Ù…Ø§ ÙŠØªÙ… Ø¥Ø¸Ù‡Ø§Ø± ÙƒÙ„Ù…Ø© Ø§Ù„ØªØÙ‚Ù‚ Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù‚ÙˆÙ‚Ù„ (Google):">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Ø´ÙØ§ÙÙŠØ© ØªÙˆØ±ÙŠÙÙƒÙŠØ´Ù† (ØªØØªØ§Ø¬ Ù…ÙˆØ¬Ù‡ ØªÙˆØ± Ø£Ùˆ ØªØ±Ø§Ù†Ø³Ø¨ÙˆÙƒØ³ÙŠ Ù…Ø®ØµØµ)">
 <!ENTITY torbutton.prefs.priv_caption "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®ØµÙˆØµÙŠØ©">
 <!ENTITY torbutton.prefs.block_disk "Ù„Ø§ ØªØ³Ø¬Ù„ Ø³Ø¬Ù„ Ø§Ù„ØªØµÙØ Ø£Ùˆ Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ù…ÙˆØ§Ù‚Ø¹ Ø§Ù„Ø£Ù„ÙƒØªØ±ÙˆÙ†ÙŠØ© (ØªÙØ¹ÙŠÙ„ Ø§Ù„ØªØµÙØ Ø§Ù„Ø®ØµÙˆØµÙŠ)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
 <!ENTITY torbutton.prefs.sec_high "Ø¹Ø§Ù„Ù">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Ù…Ø¹Ø¶Ù… ØµÙŠØº Ø§Ù„Ø³Ù…Ø¹ÙŠØ§Øª ÙˆØ§Ù„Ù…Ø±Ø¦ÙŠØ§Øª Ù…Ø¹Ø·Ù„Ø©">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Ù…Ù† Ø§Ù„Ù…Ù…ÙƒÙ† Ø£Ù† Ø¨Ø¹Ø¶ Ø§Ù„Ø®Ø·ÙˆØ· ÙˆØ§Ù„Ø§ÙŠÙ‚ÙˆÙ†Ø§Øª Ù…Ø¹Ø±ÙˆØ¶Ø© Ø®Ø·Ø£">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Ù‚ÙŠÙ… Ù…Ø®ØµØµØ©">
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index 3130db7..be32e17 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "TordÃ¼ymÉ™si seÃ§imlÉ™ri">
 <!ENTITY torbutton.prefs.tor_settings "Proksi qurÄŸularÄ±">
 <!ENTITY torbutton.prefs.recommended_settings " Firefox -un versiyasÄ± Ã¼Ã§Ã¼n uyÄŸun proksi qurÄŸularÄ±ndan istifadÉ™ et">
-<!ENTITY torbutton.prefs.use_privoxy "Privoksi istifadÉ™ et">
 <!ENTITY torbutton.prefs.use_polipo "Polipo-nu istifadÉ™ et">
 <!ENTITY torbutton.prefs.custom_settings "Proksinin fÉ™rdi qurÄŸusundan istifadÉ™ et">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proksi:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "TordÃ¼ymÉ™si haqqÄ±nda">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Bu qurÄŸularÄ± dÉ™yiÅŸmÉ™k Ã¼Ã§Ã¼n TordÃ¼ymÉ™sini sÃ¶ndÃ¼r.">
 <!ENTITY torbutton.pref_connection.more_info "Daha Ã§ox mÉ™lumat">
 <!ENTITY torbutton.pref_connection_more_info.title "KÃ¶mÉ™k">
 <!ENTITY torbutton.pref_connection_more_info.text "TordÃ¼ymÉ™si hal hazÄ±rda yanÄ±lÄ±dÄ±r.   ÆgÉ™r Tordan baÅŸqa qurÄŸularÄ± dÉ™yiÅŸmÉ™k istÉ™yirsÉ™nsÉ™ zÉ™hmÉ™t olmasa TordÃ¼ymÉ™sini sÃ¶ndÃ¼rÃ¼n vÉ™ bura qayÄ±dÄ±n.   ÆgÉ™r Tor qurÄŸularÄ±nÄ± dÉ™yiÅŸmÉ™k istÉ™yirsÉ™nsÉ™ zÉ™hmÉ™t olmasa TordÃ¼ymÉ™si seÃ§imlÉ™ri pÉ™ncÉ™rÉ™sindÉ™n istifadÉ™ edin.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "SeÃ§imlÉ™r...">
 <!ENTITY torbutton.context_menu.preferences.key "A">
-<!ENTITY torbutton.context_menu.about "TordÃ¼ymÉ™si haqqÄ±nda...">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "TordÃ¼ymÉ™si">
 <!ENTITY torbutton.button.tooltip "TordÃ¼ymÉ™sini baÅŸlatmaq Ã¼Ã§Ã¼n kliklÉ™yin">
-<!ENTITY torbutton.prefs.sec_settings "TÉ™hlÃ¼kÉ™sizlik qurÄŸularÄ±">
-<!ENTITY torbutton.prefs.block_thread "Tor iÅŸlÉ™yÉ™ndÉ™ oxunanlarÄ± qadaÄŸan et (Ã§ox É™hÉ™miyyÉ™tli)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor iÅŸlÉ™yÉ™ndÉ™ yazÄ±lanlarÄ± qadaÄŸan et (mÉ™slÉ™hÉ™tdi)">
-<!ENTITY torbutton.prefs.block_nthread "Tor olmayanda oxunanlarÄ± qadaÄŸan et ( istÉ™kdÉ™n asÄ±lÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.block_nthwrite "Tor olmayanda yazÄ±lanlarÄ± qadaÄŸan et ( istÉ™kdÉ™n asÄ±lÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.clear_history "Tor - da pÉ™ncÉ™rÉ™ baÄŸlanarkÉ™n keÃ§miÅŸi sil ( Ä°stÉ™kdÉ™n aslÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.clear_cache "Tor diskinin keÅŸini qadaÄŸan et vÉ™ Tor -dakÄ± pÉ™ncÉ™rÉ™ baÄŸlanarkÉ™n bÃ¼tÃ¼n keÅŸlÉ™ri sil">
-<!ENTITY torbutton.prefs.block_cache "Tor olanda disk vÉ™ yaddaÅŸ keÅŸ giriÅŸinÉ™ qadaÄŸa qoy">
-<!ENTITY torbutton.prefs.cookie_jars "Tor olmayan kukilÉ™ri jarda saxla">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "KukilÉ™r istifadÉ™Ã§i tÉ™rÉ™findÉ™n idarÉ™ olunacaq (TÉ™hlÃ¼kÉ™lidir)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor -da pÉ™ncÉ™rÉ™lÉ™ri baÄŸlarkÉ™n kukilÉ™ri sil">
-<!ENTITY torbutton.prefs.disable_plugins "Tordan istifadÉ™ edÉ™rkÉ™n qoÅŸmalarÄ± sÃ¶ndÃ¼r (É™hÉ™miyyÉ™tlidir)">
-<!ENTITY torbutton.prefs.kill_bad_js "TÉ™hlÃ¼kÉ™li javascripti tut (É™hÉ™miyyÉ™tlidir)">
-<!ENTITY torbutton.prefs.isolate_content "Tor birlÉ™ÅŸmÉ™sindÉ™n dinamik mÉ™zmunu ayÄ±r (É™hÉ™miyyÉ™tlidir)">
-<!ENTITY torbutton.prefs.no_updates "Tordan istifadÉ™ edÉ™rkÉ™n yenilÉ™mÉ™ni sÃ¶ndÃ¼r">
-<!ENTITY torbutton.prefs.set_uagent "Tor istifadÉ™ etmÉ™k Ã¼Ã§Ã¼n istifadÉ™Ã§i alÉ™tini seÃ§ (É™hÉ™miyyÉ™tlidir)">
-<!ENTITY torbutton.prefs.dynamic "Dinamik mÉ™zmun">
-<!ENTITY torbutton.prefs.cookies "KukilÉ™r">
-<!ENTITY torbutton.prefs.cache "KeÅŸ">
-<!ENTITY torbutton.prefs.history "TarixÃ§É™">
-<!ENTITY torbutton.prefs.no_search "Torda olarkÉ™n tÉ™kliflÉ™r axtarÄ±ÅŸÄ±nÄ± sÃ¶ndÃ¼r (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.shutdown "SÃ¶ndÃ¼r">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor iÅŸlÉ™yÉ™rkÉ™n sÉ™yyah baÄŸlanÄ±rsa Torun kukilÉ™ri silinsin">
-<!ENTITY torbutton.prefs.all_shutdown "HÉ™r hansÄ± sÉ™yyah sÃ¶nÉ™rkÉ™n kukilÉ™ri sil">
-<!ENTITY torbutton.prefs.no_shutdown "SÃ¶nÉ™rkÉ™n kukilÉ™ri silmÉ™">
-<!ENTITY torbutton.prefs.disable_sessionstore "YaddaÅŸa verÉ™rkÉ™n sÃ¶ndÃ¼r (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.headers "BaÅŸlÄ±qlar">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tordan istifadÉ™ edÉ™rkÉ™n DOM-u sÃ¶ndÃ¼r (É™hÉ™miyyÉ™tlidir)">
-<!ENTITY torbutton.prefs.forms "Formalar">
-<!ENTITY torbutton.prefs.block_tforms "Torda olarkÉ™n formalarÄ± vÉ™ ÅŸifrÉ™ni yaddaÅŸa vermÉ™k qadaÄŸan olunur (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.block_ntforms "Tor olmayanda formalarÄ± vÉ™ ÅŸifrÉ™ni yaddaÅŸa vermÉ™k qadaÄŸan olunur (istÉ™kdÉ™n aslÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Tor olmayan">
-<!ENTITY torbutton.prefs.restore_tor "Sesiya yenilÉ™nÉ™ndÉ™n sonra Tor bÃ¶lmÉ™lÉ™rini belÉ™ seÃ§ ;">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox iÅŸlÉ™mÉ™yÉ™ndÉ™ kukilÉ™ri sil vÉ™  kuki tutumunu yenidÉ™n yÃ¼klÉ™( mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tor vÉ™ Tor olmayan kukilÉ™ri mÃ¼hafizÉ™ olunan tutumda saxla (tÉ™hlÃ¼kÉ™lidir)">
-<!ENTITY torbutton.prefs.clear_http_auth "Æsl HTTP sesiyalarÄ±nÄ± sil (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.block_js_history "Tor istifadÉ™ olunarkÉ™n tarixÃ§É™yÉ™ giriÅŸin qarÅŸÄ±sÄ±nÄ± al">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor istifadÉ™ edÉ™rkÉ™n pÉ™ncÉ™rÉ™ Ã¶lÃ§Ã¼lÉ™rini 50px - É™ qÉ™dÉ™r dÉ™yiÅŸ (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.close_tor "PÉ™ncÉ™rÉ™ baÄŸlanarkÉ™n bÃ¼tÃ¼n Tor pÉ™ncÉ™rÉ™lÉ™rini vÉ™ cÉ™dvÉ™llÉ™rini baÄŸla (istÉ™kdÉ™n aslÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.close_nontor " PÉ™ncÉ™rÉ™ baÄŸlanarkÉ™n bÃ¼tÃ¼n Tor olmayan pÉ™ncÉ™rÉ™lÉ™ri vÉ™ cÉ™dvÉ™llÉ™ri baÄŸla (istÉ™kdÉ™n aslÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.block_links "MÃ¼xtÉ™lif Tor bÃ¶lmÉ™lÉ™rindÉ™ki kiliklÉ™nÉ™n linklÉ™rÉ™ vÉ™ yenidÉ™n yÃ¼klÉ™nÉ™n sÉ™hifÉ™lÉ™rÉ™ qadaÄŸa qoy (istÉ™kdÉ™n aslÄ±dÄ±r)">
-<!ENTITY torbutton.prefs.jar_certs "SSL sertifikatlarÄ±nÄ± Tor vÉ™ Tor olmayan Ã¼Ã§Ã¼n mÃ¼xtÉ™lif tutumlarda saxla (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.jar_ca_certs "CA sertifikatlarÄ±nÄ± Tor vÉ™ Tor olmayan Ã¼Ã§Ã¼n mÃ¼xtÉ™lif tutumlarda saxla (mÉ™slÉ™hÉ™tdir)">
-<!ENTITY torbutton.prefs.locked_mode "TÉ™sÉ™adÃ¼fÃ¼ pÉ™ncÉ™rÉ™ yÄ±ÄŸÄ±lmasÄ±nÄ±n qarÅŸÄ±sÄ±nÄ± almaq Ã¼Ã§Ã¼n TezKeÃ§id dÃ¼ymÉ™sini sÃ¶ndÃ¼rÃ¼n">
-<!ENTITY torbutton.prefs.startup_state "Normal iÅŸÉ™ baÅŸlayarkÉ™n bu Tor bÃ¶lmÉ™sini seÃ§ :">
-<!ENTITY torbutton.prefs.shutdown_state "SÃ¶nmÉ™ nÃ¶vlÉ™ri">
-<!ENTITY torbutton.prefs.startup "YandÄ±rmaq">
-<!ENTITY torbutton.prefs.block_tor_file_net "// urls  - dÉ™n Torun ÅŸÉ™bÉ™kÉ™yÉ™ daxil olmasÄ±na icazÉ™ verilmir">
-<!ENTITY torbutton.prefs.block_nontor_file_net "// urls - dÉ™n Tor olmayan ÅŸÉ™bÉ™kÉ™yÉ™ daxil olmaÄŸa icazÉ™ verilmir">
 <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± yenidÉ™n yÃ¼klÉ™">
 <!ENTITY torbutton.prefs.test_settings "Test qurÄŸularÄ±">
-<!ENTITY torbutton.prefs.test_auto "Birinci dÉ™fÉ™ Firefox - u sÃ¶ndÃ¼rÃ¼b yandÄ±randan sonra mÉ™nim Tor qurÄŸularÄ±mÄ± test et">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor kuki diskinÉ™ yazma">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Tor olmayan diskÉ™ kuki yazma">
-<!ENTITY torbutton.prefs.session_restore "HÉ™r sesiyada bu cÉ™dvÉ™llÉ™r yaddaÅŸa verilib yenidÉ™n bÉ™rpa olunurmu :">
-<!ENTITY torbutton.prefs.nontor_tabs "CÉ™dvÉ™llÉ™r Tor olmayana yÃ¼klÉ™nib">
-<!ENTITY torbutton.prefs.tor_tabs "CÉ™dvÉ™llÉ™r Tora yÃ¼klÉ™nib">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Bunun Ã¼Ã§Ã¼n ProksilÉ™r yoxdu">
 <!ENTITY torbutton.prefs.no_proxy_warning "XÉ™bÉ™rdarlÄ±q : YuxarÄ±da istÉ™nilÉ™n hostnames-dÉ™n istifadÉ™ etmÉ™kdÉ™n boyun qaÃ§Ä±rÄ±n">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Tordan istifadÉ™ edÉ™rkÉ™n Livemark yenilÉ™yicisini sÃ¶ndÃ¼rÃ¼n">
-<!ENTITY torbutton.prefs.dtd_recommended "(mÉ™slÉ™hÉ™t gÃ¶rÃ¼lÉ™n)">
-<!ENTITY torbutton.prefs.dtd_optional "( mÉ™cburi olmayan)">
-<!ENTITY torbutton.prefs.dtd_crucial " (hÉ™lledici)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Tor daxilindÉ™ TordÃ¼ymÉ™si yÃ¶nÉ™ltmÉ™lÉ™ri">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha olanda avtomatik olaraq alternativ axtarÄ±ÅŸdan istifadÉ™ edin">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 271f389..6bee2cd 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÑ€Ð¾ÐºÑÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "ÐŸÐ¾Ñ€Ñ‚:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "ÐŸÐ¾Ð¼Ð¾Ñ‰">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "ÐÐ¾Ð²Ð° ÑÐ°Ð¼Ð¾Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Ð’ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ‚Ðµ">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 740060d..4a79cda 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Tor Button á€¥á€®á€¸á€…á€¬á€¸á€±á€•á€¸á€Šá‚Šá€”á€¹á€»á€•á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
 <!ENTITY torbutton.prefs.tor_settings "Proxy á€á€ºá€á€”á€¹á€Šá‚‡á€á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
 <!ENTITY torbutton.prefs.recommended_settings "á€¡á¾á€€á€¶á€»á€•á€³ á€±á€‘á€¬á€€á€¹á€á€¶á€±á€žá€¬ proxy á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€™á€á€™á€á Firefox version á€á€¼á€„á€¹ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy á€€á€á€¯ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
 <!ENTITY torbutton.prefs.use_polipo "Polipo á€€á€á€¯ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
 <!ENTITY torbutton.prefs.custom_settings "proxy á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€…á€á€á€¹á¾á€€á€á€³á€€á€¹á€»á€•á€³á€»á€•á€„á€¹á á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP á€•á€±á€›á€¬á€·á€…á€® :">
@@ -10,101 +8,21 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á€•á€±á€›á€¬á€·á€…á€®">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host :">
 <!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.about.title "Torbutton á€¡á€±á¾á€€á€¬á€„á€¹á€¸">
 <!ENTITY torbutton.pref_connection.notice "á„á€„á€¹á€¸á€á€ºá€á€”á€¹á€Šá‚‡á€á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€›á€”á€¹á€¡á€á€¼á€€á€¹ Torbutton á€€á€¯á€ á€•á€á€á€¹á€‘á€¬á€¸á€›á€”á€¹">
 <!ENTITY torbutton.pref_connection.more_info "á€•á€á€¯á€™á€¯á€á€»á€•á€Šá€¹á€·á€…á€¶á€¯á€±á€žá€¬ á€žá€á€„á€¹á€¸á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€žá€á€¯á‚•">
 <!ENTITY torbutton.pref_connection_more_info.title "á€€á€°á€Šá€®á€™á‚ˆá€›á€šá€°á€›á€”á€¹">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton á€€á€¯á€ á€œá€€á€¹á€›á€½á€á€á€¼á€„á€¹ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹á‹ Tor Proxy á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€² á€¡á€žá€¶á€¯á€¸á€»á€•á€³á‚á€¯á€á€„á€¹á€›á€”á€¹á€¡á€á€¼á€€á€¹ Torbutton á€€á€¯á€ á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á‚á€á€¯á€„á€¹á€±á€¡á€¬á€„á€¹ á€•á€á€á€¹á á€šá€á€¯á€±á€”á€›á€¬á€žá€á€¯á‚• á€»á€•á€”á€¹á€œá€¬á€•á€«á‹ Tor á€á€ºá€á€”á€¹á€Šá‚‡á€á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€œá€á€¯á€•á€«á€€ Torbutton á€¥á€®á€¸á€…á€¬á€¸á€±á€•á€¸á€Šá‚Šá€”á€¹á€»á€•á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€€á€á€¯ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€•á€«á‹">
-<!ENTITY torbutton.context_menu.toggle "Tor á€¡á€±á€»á€á€¡á€±á€”á€¡á€á€ºá€€á€¹á€»á€•á€™á‚ˆá€€á€á€¯ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€›á€”á€¹">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "á€¥á€®á€¸á€…á€¬á€¸á€±á€•á€¸ á€Šá‚Šá€”á€¹á€»á€•á€™á‚ˆá€™á€ºá€¬á€¸">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbutton á€¡á€±á¾á€€á€¬á€„á€¹á€¸">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbutton á€…á€á€„á€¹á€›á€”á€¹ á€€á€œá€…á€¹á€œá€¯á€•á€¹á€•á€«">
-<!ENTITY torbutton.prefs.sec_settings "á€œá€¶á€¯á€»á€á€¶á€³á€™á‚ˆá€¡á€á€¼á€€á€¹ á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.block_thread "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ history á€–á€á€¹á‚á‚ˆá€»á€á€„á€¹á€¸á€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ history á€±á€›á€¸á€»á€á€„á€¹á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_nthread "Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ history á€–á€á€¹á€»á€á€„á€¹á€¸á€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€á€¯á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_nthwrite "Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ history á€±á€›á€¸á€»á€á€„á€¹á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.clear_history "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³/á€™á€»á€•á€³ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€á€ºá€á€”á€¹á€á€¼á€„á€¹ history á€€á€¯á€ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.clear_cache "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³/á€™á€»á€•á€³ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€á€ºá€á€”á€¹á€á€¼á€„á€¹ Disk cache á€»á€•á€³á€œá€¯á€•á€¹á€™á‚ˆá‚á€½á€„á€¹á€· cache á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€™á‚ˆá€™á€ºá€¬á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.block_cache "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ disk á‚á€½á€„á€¹á€· memory cache á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.cookie_jars "Tor á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ cookies á€™á€ºá€¬á€¸á€€á€á€¯ á€€á€¬á€€á€¼á€šá€¹á€‘á€¬á€¸á€žá€Šá€¹á€· jar á€‘á€²á€á€¼á€„á€¹ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "á€™á€á€™á€á€˜á€¬á€žá€¬ cookies á€™á€ºá€¬á€¸á€€á€¯á€ á€…á€®á€…á€¥á€¹á€™á‚ˆá€»á€•á€³á€œá€¯á€•á€¹á€•á€«á€™á€Šá€¹á‹ (á€¡á‚á±á€›á€šá€¹ á€›á€½á€á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³/á€™á€»á€•á€³ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€á€ºá€á€”á€¹á€á€¼á€„á€¹ cookies á€™á€ºá€¬á€¸á€€á€¯á€ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.disable_plugins "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€›á€½á€á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ plugins á€™á€ºá€¬á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.kill_bad_js "á€¡á‚á±á€›á€šá€¹á€›á€½á€á€±á€žá€¬ javascript á€™á€ºá€¬á€¸á€€á€¯á€ hook á€á€ºá€á€á€¹á€»á€–á€„á€¹á€·á€‘á€á€”á€¹á€¸á€á€ºá€³á€•á€¹á€‘á€¬á€¸á€›á€”á€¹ á€œá€¯á€•á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.isolate_content "Tor á€¡á€±á€»á€á€¡á€±á€”á€á€¼á€„á€¹ dynamic content á€™á€ºá€¬á€¸á€€á€á€¯ á€žá€®á€¸á€»á€á€¬á€¸ á€á€²á€¼á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.no_updates "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ update á€¡á€žá€…á€¹á€‘á€Šá€·á€¹á€žá€¼á€„á€¹á€¸á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.set_uagent "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€¡á€á€¼á€€á€¹ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€žá€° á€€á€¯á€á€šá€¹á€…á€¬á€¸á€œá€½á€šá€¹á€€á€á€¯ á€žá€á€¹á€™á€½á€á€¹á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.dynamic "á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€±á€”á€±á€žá€¬ á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.cookies "Cookies á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆ á€™á€½á€á€¹á€á€™á€¹á€¸á€…á€¥á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.no_search "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ á€›á€½á€¬á€±á€–á€¼á€›á€”á€¹ á€¡á¾á€€á€¶á€»á€•á€³á€™á‚ˆá€™á€ºá€¬á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.shutdown "á€›á€•á€¹á€”á€¬á€¸á€•á€á€á€¹á€žá€á€™á€¹á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á‚á€¯á€á€„á€¹á€±á€žá€¬ browser á€€á€¯á€ á€•á€á€á€¹á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ Tor Cookies á€™á€ºá€¬á€¸á€€á€á€¯ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.all_shutdown "á€™á€Šá€¹á€žá€Šá€¹á€·  browser á€€á€¯á€ á€™á€†á€¯á€ á€•á€á€á€¹á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ Cookies á€™á€ºá€¬á€¸á€€á€á€¯ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.no_shutdown "á€•á€á€á€¹á€žá€á€™á€¹á€¸á€œá€½á€ºá€„á€¹ cookies á€™á€ºá€¬á€¸á€€á€¯á€ á€™á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€•á€«á‚á€½á€„á€¹á€·">
-<!ENTITY torbutton.prefs.disable_sessionstore "á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€±á€”á€…á€¥á€¹ Session á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.headers "á€±á€á€«á€„á€¹á€¸á€…á€Šá€¹á€¸á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ DOM á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€™á‚ˆá€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.forms "á€»á€–á€Šá€·á€¹á€…á€¼á€€á€¹á€•á€¶á€¯á€…á€¶á€€á€¼á€€á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.block_tforms "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ á€…á€€á€¬á€¸á€á€½á€€á€¹ á‚á€½á€„á€¹á€· á€»á€–á€Šá€·á€¹á€…á€¼á€€á€¹á€•á€¶á€¯á€…á€¶á€™á€ºá€¬á€¸ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€»á€á€„á€¹á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_ntforms "Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ á€…á€€á€¬á€¸á€á€½á€€á€¹ á‚á€½á€„á€¹á€· á€»á€–á€Šá€·á€¹á€…á€¼á€€á€¹á€•á€¶á€¯á€…á€¶á€™á€ºá€¬á€¸ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€»á€á€„á€¹á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.tor "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³">
-<!ENTITY torbutton.prefs.non_tor "Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³">
-<!ENTITY torbutton.prefs.restore_tor "Session á€»á€•á€”á€¹á€œá€Šá€¹á€…á€á€„á€¹á€œá€½á€ºá€„á€¹áŠ Tor á€¡á€±á€»á€á€¡á€±á€”á€€á€á€¯ á€žá€á€¹á€™á€½á€á€¹á€›á€”á€¹ :">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox á€™á€½á€¬á€¸á€šá€¼á€„á€¹á€¸á€›á€•á€¹á€á€”á€¹á‚•á€žá€¼á€¬á€¸á€œá€½á€ºá€„á€¹ cookie jar á€€á€¯á€ á€»á€•á€”á€¹á€œá€Šá€¹ á€á€„á€¹á€•á€á€¯á‚•á€šá€°á€›á€”á€¹/ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tor á‚á€½á€„á€¹á€· Tor á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ cookies á€™á€ºá€¬á€¸á€€á€¯á€ á€€á€¬á€€á€¼á€šá€¹á€‘á€¬á€¸á€±á€žá€¬ jars á€™á€ºá€¬á€¸á€‘á€²á€á€¼á€„á€¹ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTP á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆ á€…á€…á€¹á€±á€†á€¸á€±á€žá€¬ á€€á‚‘á€™á€ºá€¬á€¸á€€á€á€¯ á€›á€½á€„á€¹á€¸á€œá€„á€¹á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_js_history "Tor á€¡á€±á€»á€á€¡á€±á€”á€žá€á€¯á‚• history á€›á€½á€¬á€±á€–á€¼á€žá€¼á€¬á€¸á€œá€¬á€™á‚ˆ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€á€¼á€„á€¹á€·á€€á€á€¯ á€žá€®á€¸á€»á€á€¬á€¸ á€á€²á€¼á€»á€á€¬á€¸ á€‘á€¬á€¸á€›á€”á€¹ (á€¡á€±á€›á€¸á¾á€€á€®á€¸á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ windows á€€á€¯á€ 50 px á€žá€á€¯á‚• á€¡á€›á€¼á€šá€¹á€¡á€…á€¬á€¸ á€‘á€¬á€¸á€›á€½á€á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.close_tor "á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ Tor windows á€™á€ºá€¬á€¸á‚á€½á€„á€¹á€· tabs á€™á€ºá€¬á€¸ á€¡á€¬á€¸á€œá€¶á€¯á€¸á€€á€¯á€ á€•á€á€á€¹á€žá€á€™á€¹á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.close_nontor "á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ Tor á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ windows á€™á€ºá€¬á€¸á‚á€½á€„á€¹á€· tabs á€™á€ºá€¬á€¸ á€¡á€¬á€¸á€œá€¶á€¯á€¸á€€á€¯á€ á€•á€á€á€¹á€žá€á€™á€¹á€¸á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_links "á€™á€á€°á€Šá€®á€±á€žá€¬ Tor á€¡á€±á€»á€á€¡á€±á€”á€™á€ºá€¬á€¸á€á€¼á€„á€¹ á€á€ºá€á€á€¹á€†á€€á€¹á€œá€„á€¹á€·á€á€¹á€™á€ºá€¬á€¸á€€á€¯á€ á€€á€¯á€ á€€á€œá€…á€¹á€œá€¯á€•á€¹á€»á€á€„á€¹á€¸á‚á€½á€„á€¹á€· á€…á€¬á€™á€ºá€€á€¹á‚á€½á€¬á€™á€ºá€¬á€¸ á€»á€•á€”á€¹á€œá€Šá€¹ á€±á€ášá€šá€°á€»á€á€„á€¹á€¸á€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€›á€”á€¹ (á€±á€›á€¼á€¸á€á€ºá€šá€¹á‚á€¯á€á€„á€¹á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.jar_certs "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€±á€žá€¬ á€žá€á€¯á‚•á€™á€Ÿá€¯á€á€¹ Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€±á€žá€¬ á€¡á€±á€»á€á€¡á€±á€”á€á€¼á€„á€¹ SSL certs á€™á€ºá€¬á€¸á€€á€¯á€ á€žá€®á€¸á€»á€á€¬á€¸ jars á€™á€ºá€¬á€¸á€á€¼á€„á€¹ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€±á€žá€¬ á€žá€á€¯á‚•á€™á€Ÿá€¯á€á€¹ Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€±á€žá€¬ á€¡á€±á€»á€á€¡á€±á€”á€á€¼á€„á€¹ CA certs á€™á€ºá€¬á€¸á€€á€¯á€ á€žá€®á€¸á€»á€á€¬á€¸ jars á€™á€ºá€¬á€¸á€á€¼á€„á€¹ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€›á€”á€¹ (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.locked_mode "á€™á€±á€á€¬á€¹á€á€† á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€™á‚ˆ á€™á€»á€–á€…á€¹á€±á€…á€›á€”á€¹ Button á‚á€½á€„á€¹á€· Hotkeys á€™á€ºá€¬á€¸á€€á€á€¯ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.startup_state "á€•á€¶á€¯á€™á€½á€”á€¹ á€…á€á€„á€¹á€™á‚ˆá€™á€ºá€¬á€¸á€á€¼á€„á€¹ Tor á€¡á€±á€»á€á€¡á€±á€”á€€á€¯á€ á€žá€á€¹á€™á€½á€á€¹á€›á€”á€¹ :">
-<!ENTITY torbutton.prefs.shutdown_state "á€›á€•á€¹á€á€”á€¹á‚•á€•á€á€á€¹á€žá€á€™á€¹á€¸á€™á‚ˆ á€¡á€±á€»á€á€¡á€±á€”">
-<!ENTITY torbutton.prefs.startup "á€…á€á€„á€¹á€™á‚ˆ">
-<!ENTITY torbutton.prefs.block_tor_file_net "Network á€žá€¯á€á‚• Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€›á€”á€¹ file:// urls (á€¡á¾á€€á€¶á€»á€•á€³á€±á€‘á€¬á€€á€¹á€á€¶á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Network á€žá€á€¯á‚• Tor á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€›á€”á€¹ file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "á€™á€°á€œá€¡á€±á€»á€á€¡á€±á€”á€žá€á€¯á‚• á€»á€•á€”á€¹á€œá€Šá€¹ á€‘á€Šá€·á€¹á€žá€¼á€„á€¹á€¸á€›á€”á€¹">
 <!ENTITY torbutton.prefs.test_settings "á€á€ºá€á€”á€¹á€Šá€á‚‡á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ á€…á€™á€¹á€¸á€žá€•á€¹á€›á€”á€¹">
-<!ENTITY torbutton.prefs.test_auto "Firefox á€…á€á€„á€¹á€»á€•á€®á€¸ á€•á€‘á€™á€†á€¶á€¯á€¸ á€±á€»á€•á€¬á€„á€¹á€¸á€œá€²á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€™á‚ˆá€»á€•á€®á€¸á€œá€½á€ºá€„á€¹ á€™á€á€™á€á Tor á€á€ºá€á€”á€¹á€Šá€á‚‡á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ á€»á€•á€”á€¹á€œá€Šá€¹ á€…á€™á€¹á€¸á€žá€•á€¹á€›á€”á€¹">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor cookies á€™á€ºá€¬á€¸á€€á€á€¯ disk á€¡á€á€¼á€„á€¹á€¸á€žá€¯á€á‚• á€±á€›á€¸á€žá€¬á€¸á€»á€á€„á€¹á€¸ á€™á€»á€•á€³á€›á€”á€¹">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Tor á€™á€Ÿá€¯á€á€¹á€±á€žá€¬ cookies á€™á€ºá€¬á€¸á€€á€¯á€ disk á€¡á€á€¼á€„á€¹á€¸á€žá€á€¯á‚• á€±á€›á€¸á€žá€¬á€¸á€»á€á€„á€¹á€¸ á€™á€»á€•á€³á€›á€”á€¹">
-<!ENTITY torbutton.prefs.session_restore "session á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€™á‚ˆá€¡á€á€¼á€€á€¹ á€žá€á€™á€¹á€¸á€†á€Šá€¹á€¸á€›á€”á€¹ á€›á€”á€¹á‚á€½á€„á€¹á€· á€»á€•á€”á€¹á€œá€Šá€¹ á€á€„á€¹á€šá€°á€›á€”á€¹ tabs á€™á€ºá€¬á€¸ :">
-<!ENTITY torbutton.prefs.nontor_tabs "Tor á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€±á€žá€¬ á€á€„á€¹á€šá€°á€‘á€¬á€¸á€žá€Šá€¹á€· tabs á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.tor_tabs "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³ á€á€„á€¹á€šá€°á€‘á€¬á€¸á€žá€Šá€¹á€· tabs á€™á€ºá€¬á€¸">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "á„á€„á€¹á€¸á€á€á€¯á‚”á€¡á€á€¼á€€á€¹ proxy á€™á€›á€½á€á€•á€«:">
 <!ENTITY torbutton.prefs.no_proxy_warning "á€žá€á€á€±á€•á€¸á€á€ºá€€á€¹: á€¡á€‘á€€á€¹á€±á€–á€¬á€¹á€»á€•á€•á€« hostname á€™á€ºá€¬á€¸á€¡á€žá€¶á€¯á€¸á€™á€»á€•á€³á€›á€”á€¹">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -116,15 +34,4 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€±á€”á€…á€¥á€¹á€¡á€á€¼á€„á€¹á€¸ livemarks á€¡á€žá€…á€¹á€‘á€Šá€¹á€·á€žá€¼á€„á€¹á€¸á€™á‚ˆá€™á€ºá€¬á€¸á€€á€¯á€ á€•á€á€á€¹á€•á€„á€¹á€‘á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.dtd_recommended "(á€¡á¾á€€á€¶á€»á€•á€³á€•á€«á€žá€Šá€¹)">
-<!ENTITY torbutton.prefs.dtd_optional "(á€±á€”á€¬á€€á€¹á€‘á€•á€¹á€á€…á€¹á€”á€Šá€¹á€¸)">
-<!ENTITY torbutton.prefs.dtd_crucial "(á€¡á€±á€›á€¸á¾á€€á€®á€¸á€±á€žá€¬)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton Updates á€™á€ºá€¬á€¸á€¡á€¬á€¸ Tor á€™á€½á€á€†á€„á€¹á€·á€žá€¼á€¬á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha á‚á€½á€„á€¹á€·á€á€á€¯á€¸á€•á€«á€€ á€á€»á€á€¬á€¸ search engine á€á€…á€¹á€á€¯ á€¡á€œá€á€¯á€¡á€±á€œá€½á€ºá€¬á€€á€¹á€±á€»á€•á€¬á€„á€¹á€¸á€žá€¶á€¯á€¸á€›á€”á€¹">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index f5de8f0..b7d0233 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proksi postavke">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene opcije proksija za moju verziju Firefoxa">
-<!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Koristi standardne proksi postavke">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP proksi:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "O Torbutton-u">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "OnemoguÄ‡i Torbutton za promjenu ovih postavki.">
 <!ENTITY torbutton.pref_connection.more_info "ViÅ¡e Informacija">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ‡">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Prioriteti...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "O Torbutton-u...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita kolaÄiÄ‡a">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopiraj Tor link">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Otvori Tor link u novom tabu">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Otvori Tor link u novom prozoru">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a">
-<!ENTITY torbutton.prefs.sec_settings "Postavke sigurnosti">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati poÄetno">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 188aa83..0b11775 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PreferÃ¨ncies de Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³ del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utilitza la configuraciÃ³ recomanada de proxy per a la meva versiÃ³ de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Utilitza Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Utilitza Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utilitza una configuraciÃ³ del proxy personalitzada">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "AmfitriÃ³ SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Quant a Torbutton">
-<!ENTITY torbutton.about.version "VersiÃ³">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "No permetis que Torbutton canvii aquesta configuraciÃ³.">
 <!ENTITY torbutton.pref_connection.more_info "MÃ©s informaciÃ³">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton estÃ  activat.   Si voleu canviar la configuraciÃ³ del vostre proxy quan no funciona Tor, desactiveu Torbutton i torneu aquÃ.  Si voleu canviar la configuraciÃ³ de Tor, utilitzeu la finestra de preferÃ¨ncies de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nova identitat">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Commuta l'estat de Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PreferÃ¨ncies...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Sobre Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProtecciÃ³ de les galetes">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copia la direcciÃ³ URL de Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Obre la direcciÃ³ URL de Tor en una nova pestanya">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Obre la direcciÃ³ URL de Tor en una nova finestra">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "ConfiguraciÃ³ de seguretat">
-<!ENTITY torbutton.prefs.block_thread "Bloqueja la lectura a l'historial quan Tor estigui activat (vital)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloqueja l'escriptura a l'historial quan Tor estigui activat (recomanat)">
-<!ENTITY torbutton.prefs.block_nthread "Bloqueja la lectura a l'historial quan Tor no estigui activat (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloqueja l'escriptura a l'historial quan Tor no estigui activat (opcional)">
-<!ENTITY torbutton.prefs.clear_history "Esborra l'historial quan s'alterni Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquejar la memoria cau del disc i buidar tota la memoria cau quan s'alterni Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquejar l'accÃ©s al disc i a la memÃ²ria cau mentre Tor estigui activat">
-<!ENTITY torbutton.prefs.cookie_jars "Emmagatzemmar les galetes que no sÃ³n de Tor a un jar protegit">
-<!ENTITY torbutton.prefs.cookie_protection "Utilitza el diÃ leg the protecciÃ³ de galetes per escollir">
-<!ENTITY torbutton.prefs.mmm_cookies "Em farÃ© cÃ rrec de les galetes jo mateix">
-<!ENTITY torbutton.prefs.clear_cookies "Esborra les galetes quan s'alterni Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Desactivar altres plugins mentre Tor estigui activat (vital)">
-<!ENTITY torbutton.prefs.kill_bad_js "Bloquejar javascript perillÃ³s (vital)">
-<!ENTITY torbutton.prefs.isolate_content "AÃ¯llar contingut dinÃ mic mentre Tor estigui activat (vital)">
-<!ENTITY torbutton.prefs.no_updates "Desactivar actualitzacions mentre Tor estigui activat">
-<!ENTITY torbutton.prefs.set_uagent "Designa l'agent d'usuari quan Tor estigui activat (vital)">
-<!ENTITY torbutton.prefs.dynamic "Contingut dinÃ mic">
-<!ENTITY torbutton.prefs.cookies "Galetes">
-<!ENTITY torbutton.prefs.cache "MemÃ²ria cau">
-<!ENTITY torbutton.prefs.history "Historial">
-<!ENTITY torbutton.prefs.no_search "Desactivar suggeriments de recerca mentre Tor estigui activat (recommendat)">
-<!ENTITY torbutton.prefs.shutdown "Tancar">
-<!ENTITY torbutton.prefs.tor_shutdown "Esborra les galetes de Tor a l'hora de tancar un navegador amb Tor activat">
-<!ENTITY torbutton.prefs.all_shutdown "Esborra les galetes quan es tanqui qualsevol navegador">
-<!ENTITY torbutton.prefs.no_shutdown "No esborris les galetes a l'hora de tancar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Desactivar guardat de sessiÃ³ (recommendat)">
-<!ENTITY torbutton.prefs.headers "CapÃ§aleres">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Desactiva l'emmagatzematge DOM quan Tor estigui activat (vital)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Bloqueja el desat de form i contrasenya quan Tor estigui activat (recomanat)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloqueja el desat de form i contrassenya quan Tor no estigui activat (opcional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "No-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Quan s'inicii una sessiÃ³ recuperada, situa l'estat de Tor com a:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recarrega les galetes/esborra les galetes quan Firefox falli (recomanat)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Emmagatzema les galetes amb Tor activat i sense en pots protegits (perillÃ³s)">
-<!ENTITY torbutton.prefs.clear_http_auth "Esborra sessions d'autenticaciÃ³ HTTP (recomanat)">
-<!ENTITY torbutton.prefs.block_js_history "Impedeix l'accÃ©s a l'historial quan Tor no estigui activat (vital)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Dimensiona les finestres a mÃºltiples de 50px quan Tor estigui activat (recomanat)">
-<!ENTITY torbutton.prefs.close_tor "Tanca totes les finestres i pestanyes de Tor quan es desactivi (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Tanca totes les finestres i pestanyes fora de Tor quan aquest s'activi (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloqueja els clics als enllaÃ§os i actualitzacions de pÃ gina des de estats de Tor diferents (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Emmagatzema certificats SSL en pots separats per a Tor i fora de Tor (recomanat)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Emmagatzema certificats CA en pots separats per a Tor i fora de Tor (recomanat)">
-<!ENTITY torbutton.prefs.locked_mode "Desactiva el botÃ³ i les dreceres de teclat per a evitar l'activaciÃ³ accidental de Tor">
-<!ENTITY torbutton.prefs.startup_state "En una arrencada normal, l'estat de Tor inicial serÃ :">
-<!ENTITY torbutton.prefs.shutdown_state "Estat de tancada">
-<!ENTITY torbutton.prefs.startup "Arrencada">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloqueja l'accÃ©s de Tor a la xarxa des de direccions file:// (recomanat)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloqueja l'accÃ©s fora de Tor a la xarxa des de direccions file://">
 <!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats">
 <!ENTITY torbutton.prefs.test_settings "Test de configuraciÃ³">
-<!ENTITY torbutton.prefs.test_auto "Executa un test de configuraciÃ³ el primer cop que s'activi Tor per a cada arrencada de Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "No desis les galetes de Tor al disc">
-<!ENTITY torbutton.prefs.nontor_memory_jar "No desis les galetes fora de Tor al disc">
-<!ENTITY torbutton.prefs.session_restore "Fes que la sessiÃ³ desi i recuperi aquestes pestanyes:">
-<!ENTITY torbutton.prefs.nontor_tabs "Pestanyes sense Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Pestanyes amb Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No hi ha Proxys per a:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Alerta: eviteu utilitzar cap dels noms de l'equip d'aquÃ sobre.">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Desactiva les adreces d'interÃ¨s actives quan Tor estigui activat">
-<!ENTITY torbutton.prefs.dtd_recommended "(recomanat)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(vital)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirecciona les actualitzacions de Torbutton via Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Utilitza automÃ ticament un motor de cerca alternatiu quan aquest es presenti amb un Captcha de Google:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 2a6f104..0d4498f 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "NastavenÃ Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "NastavenÃ Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "PouÅ¾Ãt doporuÄenÃ¡ nastavenÃ proxy pro mou verzi Firefoxu">
-<!ENTITY torbutton.prefs.use_privoxy "PouÅ¾itÃ Proxy">
 <!ENTITY torbutton.prefs.use_polipo "PouÅ¾itÃ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "PouÅ¾Ãt vlastnÃ nastavenÃ proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "O Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "ZakÃ¡zat aplikaci Torbutton toto nastavenÃ mÄ›nit.">
 <!ENTITY torbutton.pref_connection.more_info "VÃce informacÃ">
 <!ENTITY torbutton.pref_connection_more_info.title "NÃ¡povÄ›da">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton je momentÃ¡lnÄ› zapnutÃ½.    Pokud chcete zmÄ›nit vaÅ¡e non-Tor proxy nastavenÃ, vypnÄ›te prosÃm Torbutton a vraÅ¥te se.    Pokud chcete zmÄ›nit vaÅ¡e Tor nastavenÃ, pouÅ¾ijte prosÃm okno nastavenÃ Torbutton">
 <!ENTITY torbutton.context_menu.new_identity "Nova identita">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.toggle "ZmÄ›nit Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "NastavenÃ...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "O Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana pÅ™ed cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "KopÃrovat Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "OtevÅ™Ãt Tor URL v novÃ© zÃ¡loÅ¾ce">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "OtevÅ™Ãt Tor URL v novÃ©m oknÄ›">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "KliknÄ›te pro inicializaci Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "BezpeÄnostnÃ nastavenÃ">
-<!ENTITY torbutton.prefs.block_thread "Blokovat ÄtenÃ historie pÅ™i pouÅ¾ÃvÃ¡nÃ Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokovat zÃ¡pis do historie pÅ™i pouÅ¾ÃvÃ¡nÃ Tor (doporuÄeno)">
-<!ENTITY torbutton.prefs.block_nthread "Blokovat ÄtenÃ historie bÄ›hem Non-Tor (volitelnÃ©)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokovat zÃ¡pis do historie pÅ™i pouÅ¾ÃvÃ¡nÃ Non-Tor (volitelnÃ©)">
-<!ENTITY torbutton.prefs.clear_history "Vymazat historii pÅ™i pÅ™epnutÃ Tor (volitelnÃ©)">
-<!ENTITY torbutton.prefs.clear_cache "Blokovat diskovou mezipamÄ›Å¥ a vymaÅ¾ ji pÅ™i pÅ™epnutÃ Tora">
-<!ENTITY torbutton.prefs.block_cache "Zablokovat pÅ™Ãstup k diskovÃ© a pamÄ›Å¥ovÃ© cache kdyÅ¾ beÅ¾Ã Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "Budu sÃ¡m spravovat moje cookies (nebezpeÄnÃ©)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "DynamickÃ½ obsah">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Historie">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Vypnout">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Hlava">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "FormulÃ¡Å™">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "PÅ¯vodnÃ nastavenÃ">
 <!ENTITY torbutton.prefs.test_settings "Test nastavenÃ">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(doporuÄeno)">
-<!ENTITY torbutton.prefs.dtd_optional "(volitelnÃ©)">
-<!ENTITY torbutton.prefs.dtd_crucial "(dÅ¯leÅ¾itÃ©)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index b66337f..4d6d577 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Dewisiadau Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Gosodiadau Procsi">
 <!ENTITY torbutton.prefs.recommended_settings "Defnyddiwch y gosodiadau procsi a argymhellir ar gyfer fy fersiwn o Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Defnyddiwch Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Defnyddiwch Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Defnyddiwch gosodiadau procsi addasiedig">
 <!ENTITY torbutton.prefs.proxy.host.http "Procsi HTTP:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Procsi Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Gwesteiwr SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porth">
-<!ENTITY torbutton.about.title "Amdan Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Analluoga Torbutton i newid y gosodiadau yma.">
 <!ENTITY torbutton.pref_connection.more_info "Mwy o gwybodaeth">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Dewisiadau">
 <!ENTITY torbutton.context_menu.preferences.key "p">
-<!ENTITY torbutton.context_menu.about "Amdan Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "p">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Gosodiadau Diogelwch">
-<!ENTITY torbutton.prefs.block_thread "Blociwch ddarllen hanes yn ystod Tor (hanfodol)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Hanes">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "Ar y cychwyn arferol, gosod cyflwr Tor i:">
-<!ENTITY torbutton.prefs.shutdown_state "Cyflwr cau i lawr">
-<!ENTITY torbutton.prefs.startup "Cychwyn">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS V5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(argymhellwyd)">
-<!ENTITY torbutton.prefs.dtd_optional "(dewisol)">
-<!ENTITY torbutton.prefs.dtd_crucial "(hanfodol)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index c2c5169..7a8d28a 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton-indstillinger">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-indstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Brug Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Brug Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Om Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Beskytter privatlivets fred for din Tor-browsing.">
-<!ENTITY torbutton.about.code "Personer som har bidraget med kode:">
-<!ENTITY torbutton.about.maintainer "Vedligeholder:">
-<!ENTITY torbutton.about.security_review "Gennemgang af sikkerhed:">
-<!ENTITY torbutton.about.donate "Hvis du kan lide at bruge Tor, sÃ¥ kan du overveje at">
-<!ENTITY torbutton.about.make_donation "foretage en donation.">
 <!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for at Ã¦ndre disse indstillinger.">
 <!ENTITY torbutton.pref_connection.more_info "Mere Information">
 <!ENTITY torbutton.pref_connection_more_info.title "HjÃ¦lp">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i Ã¸jeblikket aktiveret. Hvis du vil Ã¦ndre dine ikke-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage hertil. Hvis du vil Ã¦ndre dine Tor indstillinger, kan du benytte Torbuttons Indstillingsvindue.">
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Skift Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Indstillinger...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Om Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Hent bundt-opdatering Tor Browser Bundle ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "KopiÃ©r Tor-adresse">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ã…bn Tor-adresse i ny fane">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ã…bn Tor-adresse i nyt vindue">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Sikkerhedsindstillinger">
-<!ENTITY torbutton.prefs.block_thread "Bloker for historik lÃ¦sninger under Tor (afgÃ¸rende)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloker for historik skrivninger under Tor (anbefales)">
-<!ENTITY torbutton.prefs.block_nthread "Bloker for historik lÃ¦sninger uden for Tor (valgfrit)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloker for historik skrivninger uden for Tor (valgfrit)">
-<!ENTITY torbutton.prefs.clear_history "Ryd historien ved skift af Tor status (valgfrit)">
-<!ENTITY torbutton.prefs.clear_cache "Bloker Tor disk cache og ryd alt cache ved Ã¦ndring af Tor status">
-<!ENTITY torbutton.prefs.block_cache "Bloker disk og hukommelse cache adgang under Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Gem Ikke-Tor cookies i en beskyttet krukke">
-<!ENTITY torbutton.prefs.cookie_protection "Benyt dialogboks for Cookie-beskyttelse til at vÃ¦lge">
-<!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine cookies (farligt)">
-<!ENTITY torbutton.prefs.clear_cookies "Ryd cookies ved skift af Tor status">
-<!ENTITY torbutton.prefs.disable_plugins "Deaktiver plugins nÃ¥r Tor kÃ¸rer (afgÃ¸rende)">
-<!ENTITY torbutton.prefs.kill_bad_js '"Hook" farlige javascript (afgÃ¸rende)'>
-<!ENTITY torbutton.prefs.isolate_content "Isoler dynamisk indhold til Tor tilstand (afgÃ¸rende)">
-<!ENTITY torbutton.prefs.no_updates "Deaktiver opdateringer nÃ¥r Tor kÃ¸rer">
-<!ENTITY torbutton.prefs.set_uagent "Indstil bruger agent for Tor anvendelse (afgÃ¸rende)">
-<!ENTITY torbutton.prefs.dynamic "Dynamisk Indhold">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Historik">
-<!ENTITY torbutton.prefs.no_search "Deaktiver sÃ¸geforslag nÃ¥r Tor kÃ¸rer (anbefales)">
-<!ENTITY torbutton.prefs.shutdown "Luk ned">
-<!ENTITY torbutton.prefs.tor_shutdown "Ryd Tor cookies, nÃ¥r browseren lukkes mens Tor kÃ¸rer">
-<!ENTITY torbutton.prefs.all_shutdown "Ryd cookies under enhver browser nedlukning">
-<!ENTITY torbutton.prefs.no_shutdown "Ryd ikke mine cookies ved nedlukning">
-<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver Sessions Lagring (anbefales)">
-<!ENTITY torbutton.prefs.headers "Hoveder">
-<!ENTITY torbutton.prefs.refererspoofing "Forfalskning af henviser">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart forfalskning af henviser under brug af Tor (forfalsk henvisninger som gÃ¥r pÃ¥ tvÃ¦rs af domÃ¦ner)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM Lager nÃ¥r Tor kÃ¸rer (afgÃ¸rende)">
-<!ENTITY torbutton.prefs.forms "Formulare">
-<!ENTITY torbutton.prefs.block_tforms "Bloker kodeord+formulare for at gemme, nÃ¥r Tor kÃ¸rer (anbefales)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloker password+form for at gemme, uden for Tor (valgfri)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Ved session genoprettelses start, sÃ¦t Tor tilstanden til:">
-<!ENTITY torbutton.prefs.startup_tor "NÃ¥r browser opstartes, sÃ¥ angive Tor-tilstanden til:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "GenindlÃ¦s cookie jar/ryd cookies ved Firefox crash (anbefales)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Gem bÃ¥de Tor og Ikke-Tor cookies i beskyttede krukker (farlige)">
-<!ENTITY torbutton.prefs.clear_http_auth "Ryd HTTP auth sessioner (anbefales)">
-<!ENTITY torbutton.prefs.block_js_history "Isolere adgang til historik navigation til Tor tilstand (kritisk)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Skaler vinduer til mange pÃ¥ 50px nÃ¥r Tor bruges (Anbefalet)">
-<!ENTITY torbutton.prefs.close_tor "Luk alle Tor-vinduer og faner ved skift af Tor status (valgfrit)">
-<!ENTITY torbutton.prefs.close_nontor "Luk alle Ikke-Tor vinduer og faner ved skift af Tor status (valgfrit)">
-<!ENTITY torbutton.prefs.block_links "Bloker linkklik og sidegenindlÃ¦sninger fra forskellige Tor tilstande (valgfrit)">
-<!ENTITY torbutton.prefs.jar_certs "Gem SSL certifikater separat under Tor/uden for Tor (Anbefalet)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Gem CA certifikater separat under Tor/uden for Tor (anbefales)">
-<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knapper og Genvejstaster for at forhindre uheldige skift af status">
-<!ENTITY torbutton.prefs.startup_state "Ved normale opstart skal Tors status vÃ¦re:">
-<!ENTITY torbutton.prefs.shutdown_state "Nedluknings tilstand">
-<!ENTITY torbutton.prefs.startup "Opstart">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloker Tor adgang til netvÃ¦rket fra file:// URL'er (anbefalet)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloker Ikke-Tor adgang til netvÃ¦rket fra file:// URL'er">
 <!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
 <!ENTITY torbutton.prefs.test_settings "Test Indstillinger">
-<!ENTITY torbutton.prefs.test_auto "Test mine Tor indstillinger efter fÃ¸rste statusÃ¦ndring ved hver start af Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Gem ikke Tor Cookies til harddisken">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Gem ikke Ikke-Tor Cookies til harddisken">
-<!ENTITY torbutton.prefs.session_restore "Gem sessionen og gendanne disse faner:">
-<!ENTITY torbutton.prefs.nontor_tabs "Faner indlÃ¦st uden for Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Faner blev indlÃ¦st i Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ingen Proxies for:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UndgÃ¥ at bruge enhver vÃ¦rtsnavne ovenfor">
-<!ENTITY torbutton.prefs.spoofreresh "Genopfrisk forfalskning">
-<!ENTITY torbutton.prefs.refereroptions "Indstillinger for forfalskning af henviser ">
-<!ENTITY torbutton.prefs.nospoof "Forfalsk ikke henviser">
-<!ENTITY torbutton.prefs.spoofroot "Forfalsk den indeholdte mappe for siden">
-<!ENTITY torbutton.prefs.spoofdomain "Forfalsk domÃ¦net som henviser">
-<!ENTITY torbutton.prefs.spoofblank "GÃ¸r henviser tom">
 <!ENTITY torbutton.cookiedialog.title "HÃ¥ndtÃ©r Cookie-beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "VÃ¦rt">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pÃ¥nÃ¦r beskyttede">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver opdatering af livemarks, nÃ¥r Tor kÃ¸rer">
-<!ENTITY torbutton.prefs.dtd_recommended "(anbefalet)">
-<!ENTITY torbutton.prefs.dtd_optional "(Valg frit)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Vigtigt)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "VideredirigÃ©r Torbutton-opdateringer gennem Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Brug automatisk en anden sÃ¸gemaskine nÃ¥r du stilles overfor en Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Gennemsigtig Torifikation (KrÃ¦ver tilpasset transproxy eller Tor-router)">
 <!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ¦ns tredjeparts-cookies og andre registreringsdata">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 99ef7ba..5e4b0e3 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton-Einstellungen">
 <!ENTITY torbutton.prefs.tor_settings "Proxyserver-Einstellungen">
 <!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxyserver-Einstellungen fÃ¼r meine Firefox-Version">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden">
 <!ENTITY torbutton.prefs.use_polipo "Polipo verwenden">
 <!ENTITY torbutton.prefs.custom_settings "Individuelle Vermittlungsservereinstellungen verwenden">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Ãœber Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "SchÃ¼tzt die PrivatsphÃ¤re Ihres Tor-Navigierens.">
-<!ENTITY torbutton.about.code "Code-Beitragende:">
-<!ENTITY torbutton.about.maintainer "Hauptbetreuer:">
-<!ENTITY torbutton.about.security_review "SicherheitsÃ¼berprÃ¼fung:">
-<!ENTITY torbutton.about.donate "Wenn Sie Tor gerne benutzen, kÃ¶nnen Sie vielleicht etwas">
-<!ENTITY torbutton.about.make_donation "spenden.">
 <!ENTITY torbutton.pref_connection.notice "Torbutton deaktivieren, um diese Einstellungen zu Ã¤ndern.">
 <!ENTITY torbutton.pref_connection.more_info "Mehr Informationen">
 <!ENTITY torbutton.pref_connection_more_info.title "Hilfe">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal fÃ¼r diese Seite">
 <!ENTITY torbutton.context_menu.new_circuit_key "B">
-<!ENTITY torbutton.context_menu.toggle "Tor-Modus umschalten">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PrivatssphÃ¤re- und Sicherheits-Einstellungen...">
 <!ENTITY torbutton.context_menu.preferences.key "E">
-<!ENTITY torbutton.context_menu.about "Ãœber Torbutton â€¦">
-<!ENTITY torbutton.context_menu.about.key "Ãœ">
 <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Suche nach Tor-Browser-Aktualisierungen...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Tor-Adresse kopieren">
-<!ENTITY torbutton.context_menu.copyTor.key "k">
-<!ENTITY torbutton.context_menu.openTorTab "Tor-Adresse in neuem Reiter Ã¶ffnen">
-<!ENTITY torbutton.context_menu.openTorTab.key "R">
-<!ENTITY torbutton.context_menu.openTorWindow "Tor-Adresse in neuem Fenster Ã¶ffnen">
-<!ENTITY torbutton.context_menu.openTorWindow.key "F">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.privacy_security_settings "PrivatsphÃ¤re- und Sicherheits-Einstellungen">
-<!ENTITY torbutton.prefs.block_thread "Lesen von EintrÃ¤gen, der besuchten Seiten (Verlauf), wÃ¤hrend der Benutzung von Tor verhindern (wichtig)">
-<!ENTITY torbutton.prefs.block_thwrite "Schreiben von EintrÃ¤gen, der besuchten Seiten (Verlauf), wÃ¤hrend der Benutzung von Tor verhindern (empfohlen)">
-<!ENTITY torbutton.prefs.block_nthread "Lesen von EintrÃ¤gen, der besuchten Seiten (Verlauf), auÃŸerhalb der Benutzung von Tor verhindern (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Schreiben von EintrÃ¤gen, der besuchten Seiten (Verlauf), auÃŸerhalb der Benutzung von Tor verhindern (optional)">
-<!ENTITY torbutton.prefs.clear_history "Informationen zu besuchten Seiten (Verlauf), bei An- und Abschalten von Tor, lÃ¶schen (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Zugriff auf den Festplattenzwischenspeicher verhindern und Zwischenspeicherinformationen bei An- und Abschalten von Tor lÃ¶schen">
-<!ENTITY torbutton.prefs.block_cache "Den Zugriff auf Festplatten- und Zwischenspeicher verhindern, wÃ¤hrend Tor aktiviert ist">
-<!ENTITY torbutton.prefs.cookie_jars "Cookies, die nicht zu Tor gehÃ¶ren, in einer gesicherten jar-Datei speichern">
-<!ENTITY torbutton.prefs.cookie_protection "Den Cookie-Schutzdialog benutzen, um auszuwÃ¤hlen">
-<!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies manuell (gefÃ¤hrlich)">
-<!ENTITY torbutton.prefs.clear_cookies "Cookies beim An- und Abschalten von Tor lÃ¶schen">
-<!ENTITY torbutton.prefs.disable_plugins "Erweiterungen, wÃ¤hrend der Benutzung von Tor, deaktivieren (wichtig)">
-<!ENTITY torbutton.prefs.kill_bad_js "GefÃ¤hrliches JavaScript kontrollieren (wichtig)">
-<!ENTITY torbutton.prefs.isolate_content "Dynamisch generierte Daten wÃ¤hrend der Benutzung von Tor separieren (wichtig)">
-<!ENTITY torbutton.prefs.no_updates "Aktualisierungen wÃ¤hrend der Benutzung von Tor deaktivieren">
-<!ENTITY torbutton.prefs.set_uagent "Browser-Bezeichnung wÃ¤hrend der Benutzung von Tor umstellen (wichtig)">
-<!ENTITY torbutton.prefs.dynamic "Dynamisch generierte Inhalte">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Zwischenspeicher">
-<!ENTITY torbutton.prefs.history "Verlauf">
-<!ENTITY torbutton.prefs.no_search "SuchvorschlÃ¤ge wÃ¤hrend der Tor-Benutzung abschalten (empfohlen)">
-<!ENTITY torbutton.prefs.shutdown "Herunterfahren">
-<!ENTITY torbutton.prefs.tor_shutdown "Cookies beim Beenden des Browsers lÃ¶schen (wenn Tor aktiv ist)">
-<!ENTITY torbutton.prefs.all_shutdown "Cookies beim Beenden des Browsers lÃ¶schen (immer)">
-<!ENTITY torbutton.prefs.no_shutdown "Cookies beim Beenden des Browsers nicht lÃ¶schen">
-<!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (empfohlen)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Absender tarnen">
-<!ENTITY torbutton.prefs.spoofblank "Einen leeren Absender vortÃ¤uschen, wÃ¤hrend Tor benutzt wird (kann einige Seiten ruinieren)">
-<!ENTITY torbutton.prefs.smartspoof "Intelligente Absendertarnung wÃ¤hrend der Benutzung von Tor (VortÃ¤uschung verschiedener Domainabsender)">
-<!ENTITY torbutton.prefs.nospoof "Kein VortÃ¤uschen des Absenders, wÃ¤hrend Tor benutzt wird (sendet Absender normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Die DOM-Speicherung wÃ¤hrend der Benutzung von Tor deaktivieren (wichtig)">
-<!ENTITY torbutton.prefs.forms "Formulare">
-<!ENTITY torbutton.prefs.block_tforms "Speichern von PasswÃ¶rtern und Formularen, wÃ¤hrend der Benutzung von Tor, deaktivieren (empfohlen)">
-<!ENTITY torbutton.prefs.block_ntforms "Speichern von PasswÃ¶rtern und Formularen bei Nicht-Tor deaktivieren (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Nicht-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Tor-Modus bei Sitzungswiederherstellung einstellen auf:">
-<!ENTITY torbutton.prefs.startup_tor "Beim Browser-Start, Tor-Status einstellen auf:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Cookie-JAR-Datei neuladen / Cookies beim Absturz von Firefox lÃ¶schen (empfohlen)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Alle Cookies speichern (Verbindungen Ã¼ber Tor oder nicht) in geschÃ¼tzten JAR-Dateien (gefÃ¤hrlich)">
-<!ENTITY torbutton.prefs.clear_http_auth "Legitimierte HTTP-Sitzungen lÃ¶schen (empfohlen)">
-<!ENTITY torbutton.prefs.block_js_history "Den Zugriff zur Verlaufsnavigation isolieren (wichtig)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Die GrÃ¶ÃŸe des Fensters zu einem Vielfachen von 50px, wÃ¤hrend der Benutzung von Tor, verÃ¤nderen (empfohlen)">
-<!ENTITY torbutton.prefs.close_tor "Alle Tor-Fenster und Reiter beim Wechsel schlieÃŸen (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Alle Nicht-Tor-Fenster und Reiter beim Wechsel schlieÃŸen (optional)">
-<!ENTITY torbutton.prefs.block_links "Klicks auf Verweise und das Neuladen von Seiten von verschiedenen Tor-Modi sperren (optional)">
-<!ENTITY torbutton.prefs.jar_certs "SSL-Zertifikate in verschiedenen Dateien fÃ¼r Tor/Nicht-Tor speichern (empfohlen)">
-<!ENTITY torbutton.prefs.jar_ca_certs "CA-Zertifikate in verschiedenen Dateien fÃ¼r Tor/Nicht-Tor speichern (empfohlen)">
-<!ENTITY torbutton.prefs.locked_mode "Den Knopf und TastenkÃ¼rzel deaktivieren, um versehentliches Umschalten zu vermeiden.">
-<!ENTITY torbutton.prefs.startup_state "Tor-Modus bei normalen Start einstellen auf:">
-<!ENTITY torbutton.prefs.shutdown_state "Modus beim Beenden">
-<!ENTITY torbutton.prefs.startup "Inbetriebnahme">
-<!ENTITY torbutton.prefs.block_tor_file_net "Den Zugriff zum Netzwerk von Adressen mit Â»file://Â« sperren (empfohlen)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Den Zugriff, bei deaktiviertem Tor, zum Netzwerk von Adressen mit Â»file://Â« sperren">
 <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen">
 <!ENTITY torbutton.prefs.test_settings "Einstellungen testen">
-<!ENTITY torbutton.prefs.test_auto "Meine Einstellungen, nach dem ersten Umschalten, bei jedem Firefox-Start testen">
-<!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen der Livemarks wÃ¤hrend der Benutzung von Tor deaktivieren">
-<!ENTITY torbutton.prefs.tor_memory_jar "Im Tor-Modus keine Cookies auf die Festplatte schreiben">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Im Nicht-Tor-Modus keine Cookies auf die Festplatte schreiben">
-<!ENTITY torbutton.prefs.session_restore "Die Sitzungsverwaltung soll diese Reiter sichern und wiederherstellen:">
-<!ENTITY torbutton.prefs.nontor_tabs "Im Nicht-Tor-Modus geladene Reiter">
-<!ENTITY torbutton.prefs.tor_tabs "Im Tor-Modus geladene Reiter">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Keine Vermittlungsserver (Proxies) fÃ¼r: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Achtung: Vermeiden Sie es, oben irgendwelche Rechnernamen zu verwenden">
-<!ENTITY torbutton.prefs.spoofreresh "Tarnung aufrischen">
-<!ENTITY torbutton.prefs.refereroptions "Einstellungen der Absendertarnung">
-<!ENTITY torbutton.prefs.nospoof "Kein VortÃ¤uschen des Absenders, wÃ¤hrend Tor benutzt wird (sendet Absender normal)">
-<!ENTITY torbutton.prefs.spoofroot "Den enthaltenen Ordner auf der Seite tarnen">
-<!ENTITY torbutton.prefs.spoofdomain "Die Domain als Absender vortÃ¤uschen">
-<!ENTITY torbutton.prefs.spoofblank "Einen leeren Absender vortÃ¤uschen, wÃ¤hrend Tor benutzt wird (kann einige Seiten ruinieren)">
 <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "GeschÃ¼tzt">
 <!ENTITY torbutton.cookiedialog.domainCol "Rechner">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Alle, auÃŸer die geschÃ¼tzten Cookies entfernen">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schÃ¼tzen">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃ¼tzen">
-<!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen der Livemarks wÃ¤hrend der Benutzung von Tor deaktivieren">
-<!ENTITY torbutton.prefs.dtd_recommended "(empfohlen)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kritisch)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Aktualisierung von Torbutton nur Ã¼ber das Tor Netzwerk">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatisch eine andere Suchmaschine benutzen, wenn Google ein Captcha abfragen will:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparente-Torification (Erfordert eigenen Transproxy oder Tor-Router)">
 <!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ¤ren-Einstellungen">
 <!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kann Ã¼ber die NoScript-SchaltflÃ¤che in der Werkzeugleiste fÃ¼r jede Webseite einzeln aktiviert werden.">
 <!ENTITY torbutton.prefs.sec_high "hoch">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ist standardmÃ¤ÃŸig auf allen Webseiten deaktiviert.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Die meisten Audio- und Videoformate sind deaktiviert.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM ist der einzige Codec, der aktiviert bleibt.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Manche Schriftarten und Symbole kÃ¶nnten falsch angezeigt werden.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien sind gesperrt.">
 <!ENTITY torbutton.prefs.sec_custom "Eigene Werte">
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index d20db4b..4472c2f 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®">
 <!ENTITY torbutton.prefs.recommended_settings "Î§ÏÎ®ÏƒÎ· Ï„Ï‰Î½ Ï€ÏÎ¿Ï„ÎµÎ¹Î½ÏŒÎ¼ÎµÎ½Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î³Î¹Î± Ï„Î·Î½ Ï„ÏÎÏ‡Î¿Ï…ÏƒÎ± ÎÎºÎ´Î¿ÏƒÎ· Ï„Î¿Ï… Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Î§ÏÎ®ÏƒÎ· Ï„Î¿Ï… Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Î§ÏÎ®ÏƒÎ· Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®">
 <!ENTITY torbutton.prefs.proxy.host.http "Î”Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®Ï‚ HTTP :">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Î”Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®Ï‚ Gopher :">
 <!ENTITY torbutton.prefs.proxy.host.socks "ÎšÎµÎ½Ï„ÏÎ¹ÎºÏŒÏ‚ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ SOCKS :">
 <!ENTITY torbutton.prefs.proxy.port "Î˜ÏÏÎ± :">
-<!ENTITY torbutton.about.title "Î ÎµÏÎ¯ Torbutton">
-<!ENTITY torbutton.about.version "ÎˆÎºÎ´Î¿ÏƒÎ·">
-<!ENTITY torbutton.about.summary "Î ÏÎ¿ÏƒÏ„Î±Ï„ÎµÏÎµÎ¹ Ï„Î·Î½ Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎ® Î¶Ï‰Î® Ï„Î¿Ï… Tor Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ· ÏƒÎ±Ï‚.">
-<!ENTITY torbutton.about.code "Î£Ï…Î½Ï„ÎµÎ»ÎµÏƒÏ„ÎÏ‚ ÎšÏŽÎ´Î¹ÎºÎ±:">
-<!ENTITY torbutton.about.maintainer "Î£Ï…Î½Ï„Î·ÏÎ·Ï„Î®Ï‚:">
-<!ENTITY torbutton.about.security_review "Î‘Î½Î±Î¸ÎµÏŽÏÎ·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚:">
-<!ENTITY torbutton.about.donate "Î‘Î½ ÏƒÎ±Ï‚ Î±ÏÎÏƒÎµÎ¹ Î· Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Tor, Î¸Î± Î¼Ï€Î¿ÏÎ¿ÏÏƒÎµ Î½Î± Î»Î¬Î²ÎµÏ„Îµ Ï…Ï€ 'ÏŒÏˆÎ¹Î½">
-<!ENTITY torbutton.about.make_donation "ÎºÎ¬Î½Îµ Î¼Î¹Î± Î´Ï‰ÏÎµÎ¬.">
 <!ENTITY torbutton.pref_connection.notice "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿ Torbutton Î³Î¹Î± Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Î±Ï…Ï„ÎÏ‚ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚.">
 <!ENTITY torbutton.pref_connection.more_info "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚">
 <!ENTITY torbutton.pref_connection_more_info.title "Î’Î¿Î®Î¸ÎµÎ¹Î±">
 <!ENTITY torbutton.pref_connection_more_info.text "Î¤Î¿ Torbutton ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿.Î‘Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®, ÎµÎºÏ„ÏŒÏ‚ Ï„Î¿Ï… Tor, Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿ Torbutton ÎºÎ±Î¹ ÎµÏ€Î¹ÏƒÏ„ÏÎÏˆÏ„Îµ ÎµÎ´ÏŽ. Î‘Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î³Î¹Î± Ï„Î¿Î½ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® Tor, Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿ Ï€Î±ÏÎ¬Î¸Ï…ÏÎ¿ ÎµÏ€Î¹Î»Î¿Î³ÏŽÎ½ Ï„Î¿Ï… Torbutton">
 <!ENTITY torbutton.context_menu.new_identity "ÎÎÎ± Î¤Î±Ï…Ï„ÏŒÏ„Î·Ï„Î±">
 <!ENTITY torbutton.context_menu.new_identity_key "Î¤">
-<!ENTITY torbutton.context_menu.toggle "Î•Î½Î±Î»Î»Î±Î³Î® ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Î¿Ï… Tor">
-<!ENTITY torbutton.context_menu.toggle.key "Î•">
 <!ENTITY torbutton.context_menu.preferences "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚...">
 <!ENTITY torbutton.context_menu.preferences.key "Î•">
-<!ENTITY torbutton.context_menu.about "Î£Ï‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î¿ Torbutton">
-<!ENTITY torbutton.context_menu.about.key "Î ">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Î›Ï…ÏˆÎ· Ï„Î¿Ï… Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± Cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Î†Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… Tor URL ÏƒÎµ Î½ÎÎ¿ Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Î†Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… Tor URL ÏƒÎµ Î½ÎÎ¿ Î Î±ÏÎ¬Î¸Ï…ÏÎ¿">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚">
-<!ENTITY torbutton.prefs.block_thread "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ·Ï‚ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÎ¿Ï ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.block_thwrite "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.block_nthread "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ·Ï‚ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÎ¿Ï ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï‡ÏÎ®ÏƒÎ· ÎµÎºÏ„ÏŒÏ‚ Tor (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.block_nthwrite "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· ÎµÎºÏ„ÏŒÏ‚ Tor (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.clear_history "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï‡ÏÎ®ÏƒÎ·Ï‚ Î»Î±Î½Î¸Î¬Î½Î¿Ï…ÏƒÎ±Ï‚ Î´Î¯ÏƒÎºÎ¿Ï… ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.clear_cache "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï‡ÏÎ®ÏƒÎ·Ï‚ Î»Î±Î½Î¸Î¬Î½Î¿Ï…ÏƒÎ±Ï‚ Î´Î¯ÏƒÎºÎ¿Ï… ÎºÎ±Ï„Î¬ Ï„Î· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± Tor ÎºÎ±Î¹ ÎµÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· Ï„Î·Ï‚ ÏƒÏ„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Tor">
-<!ENTITY torbutton.prefs.block_cache "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Î»Î±Î½Î¸Î¬Î½Î¿Ï…ÏƒÎ±Ï‚ Î¼Î½Î®Î¼Î·Ï‚ ÎºÎ±Î¹ Î´Î¯ÏƒÎºÎ¿Ï… ÎºÎ±Ï„Î¬ Ï„Î· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· cookies ÎµÎºÏ„ÏŒÏ‚ Tor ÏƒÎµ Ï€ÏÎ¿ÏƒÏ„Î±Ï„ÎµÏ…Î¼ÎÎ½Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ jar">
-<!ENTITY torbutton.prefs.cookie_protection "Î•Ï€Î¹Î»Î¿Î³Î® Î¼ÎÏƒÏ‰ Ï„Î¿Ï… Î”Î¹Î±Î»ÏŒÎ³Î¿Ï… Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î±Ï‚ Cookies">
-<!ENTITY torbutton.prefs.mmm_cookies "Î§ÎµÎ¹ÏÏ‰Î½Î±ÎºÏ„Î¹ÎºÎ® Î´Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· cookies (ÎµÏ€Î¹ÎºÎ¯Î½Î´Ï…Î½Î¿)">
-<!ENTITY torbutton.prefs.clear_cookies "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· cookies ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Ï‡ÏÎ®ÏƒÎ·Ï‚ Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï€ÏÏŒÏƒÎ¸ÎµÏ„Ï‰Î½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¹ÏŽÎ½ ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.kill_bad_js "Î‘Î³Î³ÏÏÏ‰ÏƒÎ· ÎµÏ€Î¹ÎºÎ¯Î½Î´Ï…Î½Î¿Ï… ÎºÏŽÎ´Î¹ÎºÎ± JavaScript (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.isolate_content "Î‘Ï€Î¿Î¼ÏŒÎ½Ï‰ÏƒÎ· Î´Ï…Î½Î±Î¼Î¹ÎºÎ¿Ï Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿Ï… Î±Î½Î¬ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.no_updates "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÏ‰Î½ ÎºÎ±Ï„Î± Ï„Î· Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Tor">
-<!ENTITY torbutton.prefs.set_uagent "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ user agent Î³Î¹Î± Ï‡ÏÎ®ÏƒÎ·  Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.dynamic "Î”Ï…Î½Î±Î¼Î¹ÎºÏŒ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Î ÏÎ¿ÏƒÏ‰ÏÎ¹Î½Î® Î¼Î½Î®Î¼Î· cache">
-<!ENTITY torbutton.prefs.history "Î™ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ">
-<!ENTITY torbutton.prefs.no_search "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÏƒÏ…Î¼Î²Î¿Ï…Î»ÏŽÎ½ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.shutdown "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿">
-<!ENTITY torbutton.prefs.tor_shutdown "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· cookies Î±Ï€ÏŒ Tor ÎºÎ±Ï„Î¬ Ï„Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î¿Ï… Ï€ÎµÏÎ¹Î·Î³Î·Ï„Î® Î¼Îµ ÎµÎ½ÎµÏÎ³ÏŒ Ï„Î¿ Tor">
-<!ENTITY torbutton.prefs.all_shutdown "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· cookies Ï€Î¬Î½Ï„Î± ÎºÎ±Ï„Î¬ Ï„Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î¿Ï… Ï€ÎµÏÎ¹Î·Î³Î·Ï„Î®">
-<!ENTITY torbutton.prefs.no_shutdown "ÎÎ± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· cookies ÎºÎ±Ï„Î¬ Ï„Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿">
-<!ENTITY torbutton.prefs.disable_sessionstore "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚ (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.headers "ÎšÎµÏ†Î±Î»Î¯Î´ÎµÏ‚">
-<!ENTITY torbutton.prefs.refererspoofing "Î Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Î Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ· ÎµÏ…Ï†Ï…Î¿ÏÏ‚ Î±Î½Î±Ï†Î¿ÏÎÎ± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Tor (Ï€Î±ÏÎ±Ï€Î»Î±Î½ÎµÎ¯ ">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚ DOM ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.forms "ÎˆÎ½Ï„Ï…Ï€Î±">
-<!ENTITY torbutton.prefs.block_tforms "ÎœÏ€Î»Î¿ÎºÎ¬ÏÎ¹ÏƒÎ¼Î± ÎºÏ‰Î´Î¹ÎºÏŽÎ½ + Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Ï†Î¿ÏÎ¼ÏŽÎ½ ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.block_ntforms "ÎœÏ€Î»Î¿ÎºÎ¬ÏÎ¹ÏƒÎ¼Î± Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ + Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Ï†Î¿ÏÎ¼ÏŽÎ½ ÎµÎºÏ„ÏŒÏ‚ Tor (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "ÎœÎ· Tor">
-<!ENTITY torbutton.prefs.restore_tor "ÎŒÏ„Î±Î½ Î³Î¯Î½ÎµÏ„Î±Î¹ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Î¼Îµ Î±Ï€Î¿ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î·Ï‚ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚, Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· Ï„Î¿Ï… Tor ÏƒÎµ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·:">
-<!ENTITY torbutton.prefs.startup_tor "ÎšÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚ Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ·Ï‚, ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î·Ï‚ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… Tor ÏƒÎµ:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Î•Ï€Î±Î½Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· cookie jar/ ÎµÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· cookiew ÏƒÎµ Ï€ÎµÏÎ¯Ï€Ï„Ï‰ÏƒÎ· ÎºÎ±Ï„Î¬ÏÏÎµÏ…ÏƒÎ·Ï‚ Ï„Î¿Ï… Firefox (ÏƒÏ…Î½Î¯ÏƒÏ„Î±Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· cookies Î±Ï€ÏŒ ÎºÎ±Î¹ ÎµÎºÏ„ÏŒÏ‚ Tor ÏƒÎµ Ï€ÏÎ¿ÏƒÏ„Î±Ï„ÎµÏ…Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± jar (ÎµÏ€Î¹ÎºÎ¯Î½Î´Ï…Î½Î¿)">
-<!ENTITY torbutton.prefs.clear_http_auth "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Ï‰Î½  ÏƒÏ…Î½ÎµÎ´ÏÎ¹ÏŽÎ½ HTTP (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.block_js_history "Î‘Ï€Î¿Î¼ÏŒÎ½Ï‰ÏƒÎ· Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ·Ï‚ Î±Î½Î¬ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Tor (ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Î‘Î»Î»Î±Î³Î® Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Ï€Î±ÏÎ±Î¸ÏÏÏ‰Î½ ÏƒÎµ Ï€Î¿Î»Î»Î±Ï€Î»Î¬ÏƒÎ¹Î± Ï„Ï‰Î½ 50 Ï€Î¯Î¾ÎµÎ» ÎºÎ±Ï„Î¬ Ï„Î· Ï‡ÏÎ®ÏƒÎ· Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.close_tor "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Ï€Î±ÏÎ±Î¸ÏÏÏ‰Î½ ÎºÎ±Î¹ Ï„Ï‰Î½ ÎºÎ±ÏÏ„ÎµÎ»ÏŽÎ½ Tor ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.close_nontor "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Ï€Î±ÏÎ±Î¸ÏÏÏ‰Î½ ÎºÎ±Î¹ Ï„Ï‰Î½ ÎºÎ±ÏÏ„ÎµÎ»ÏŽÎ½ Ï‡Ï‰ÏÎ¯Ï‚ Tor ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.block_links "ÎœÏ€Î»Î¿ÎºÎ¬ÏÎ¹ÏƒÎ¼Î± ÎºÎ»Î¹Îº ÏƒÎµ Î´ÎµÏƒÎ¼Î¿ÏÏ‚ ÎºÎ±Î¹ Î±Î½Î±Î½ÎÏ‰ÏƒÎ·Ï‚ ÏƒÎµÎ»Î¯Î´Ï‰Î½ Î±Ï€ÏŒ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎÏ‚ ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ Tor (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.jar_certs "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŽÎ½ SSL ÏƒÎµ Î¾ÎµÏ‡Ï‰ÏÎ¹ÏƒÏ„Î¬ Î±ÏÏ‡ÎµÎ¯Î± jar Î³Î¹Î± Ï‡ÏÎ®ÏƒÎ· Î¼Îµ Tor/Ï‡Ï‰ÏÎ¯Ï‚ Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŽÎ½ CA ÏƒÎµ Î¾ÎµÏ‡Ï‰ÏÎ¹ÏƒÏ„Î¬ Î±ÏÏ‡ÎµÎ¯Î± jar Î³Î¹Î± Ï‡ÏÎ®ÏƒÎ· Î¼Îµ Tor/Ï‡Ï‰ÏÎ¯Ï‚ Tor (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.locked_mode "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎšÎ¿Ï…Î¼Ï€Î¹Î¿Ï ÎºÎ±Î¹ Î£Ï…Î½Ï„Î¿Î¼ÎµÏÏƒÎµÏ‰Î½ Ï€Î»Î®ÎºÏ„ÏÏ‰Î½ Î³Î¹Î± Î±Ï€Î¿Ï†Ï…Î³Î® Î±Ï€ÏÎ¿ÏƒÏ‡ÎµÎ´Î¯Î±ÏƒÏ„Î·Ï‚ ÎµÎ½Î±Î»Î»Î±Î³Î®Ï‚">
-<!ENTITY torbutton.prefs.startup_state "ÎŒÏ„Î±Î½ Î³Î¯Î½ÎµÎ¹ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ® ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·, Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· Ï„Î¿Ï… Tor ÏƒÎµ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·:">
-<!ENTITY torbutton.prefs.shutdown_state "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î´Î¹Î±ÎºÎ¿Ï€Î®Ï‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚">
-<!ENTITY torbutton.prefs.startup "Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·">
-<!ENTITY torbutton.prefs.block_tor_file_net "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… Tor ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Î±Ï€ÏŒ url Î¼Î¿ÏÏ†Î®Ï‚ file:// (ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Î¼Îµ Î¼Î· Tor Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· Î±Ï€ÏŒ Î´Î¹ÎµÏ…Î¸Î®Î½ÏƒÎµÎ¹Ï‚ Ï„Î·Ï‚ Î¼Î¿ÏÏ†Î®Ï‚ file://">
 <!ENTITY torbutton.prefs.restore_defaults "Î‘Ï€Î¿ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î±ÏÏ‡Î¹ÎºÏŽÎ½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½">
 <!ENTITY torbutton.prefs.test_settings "ÎˆÎ»ÎµÎ³Ï‡Î¿Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½">
-<!ENTITY torbutton.prefs.test_auto "ÎÎ± Î³Î¯Î½ÎµÏ„Î±Î¹ ÎÎ»ÎµÎ³Ï‡Î¿Ï‚ Ï„Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï„Î¿Ï… Tor Î¼ÎµÏ„Î¬ Ï„Î·Î½ Ï€ÏÏŽÏ„Î· ÎµÎ½Î±Î»Î»Î±Î³Î®, ÎºÎ¬Î¸Îµ Ï†Î¿ÏÎ¬ Ï€Î¿Ï… ÎµÎºÎºÎ¹Î½ÎµÎ¯ Î¿ Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "ÎÎ± Î¼Î·Î½ Î³ÏÎ¬Ï†Î¿Î½Ï„Î±Î¹ cookies Ï„Î¿Ï… Tor ÏƒÏ„Î¿Î½ Î´Î¯ÏƒÎºÎ¿">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ÎÎ± Î¼Î·Î½ Î±Ï€Î¿Î¸Î·ÎºÎµÏÎ¿Î½Ï„Î±Î¹ cookies ÏŒÏ‡Î¹ Ï„Î¿Ï… Tor ÏƒÏ„Î¿Î½ Î´Î¯ÏƒÎºÎ¿">
-<!ENTITY torbutton.prefs.session_restore "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Ï„Î·Ï‚ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚ ÎºÎ±Î¹ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬ Ï„Ï‰Î½ ÎµÎ¾Î®Ï‚ ÎºÎ±ÏÏ„ÎµÎ»ÏŽÎ½:">
-<!ENTITY torbutton.prefs.nontor_tabs "ÎšÎ±ÏÏ„ÎÎ»ÎµÏ‚ Ï€Î¿Ï… Ï†Î¿ÏÏ„ÏŽÎ½Î¿Î½Ï„Î±Î¹ ÏƒÎµ Î¼Î· Tor">
-<!ENTITY torbutton.prefs.tor_tabs "ÎšÎ±ÏÏ„ÎÎ»ÎµÏ‚ Ï€Î¿Ï… Ï†Î¿ÏÏ„ÏŽÎ½Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î¿ Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ Ï€Î»Î·ÏÎµÎ¾Î¿ÏÏƒÎ¹Î¿Î¹ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÎÏ‚ proxy Î³Î¹Î±:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Î•Î¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·: Î‘Ï€Î¿Ï†ÏÎ³ÎµÏ„Îµ Ï„Î·Î½  Ï‡ÏÎ®ÏƒÎ· hostnames Ï€Î¹Î¿ Ï€Î¬Î½Ï‰">
-<!ENTITY torbutton.prefs.spoofreresh "Î‘Î½Î±Î½ÎÏ‰ÏƒÎ· Ï€Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ·Ï‚">
-<!ENTITY torbutton.prefs.refereroptions "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Ï€Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ·Ï‚ Î±Î½Î±Ï†Î¿ÏÎÎ±">
-<!ENTITY torbutton.prefs.nospoof "ÎÎ± Î¼Î·Î½ Ï€Î±ÏÎ±Ï€Î»Î±Î½ÎµÎ¯Ï„Î±Î¹ Î¿ Î±Î½Î±Ï†Î¿ÏÎÎ±Ï‚">
-<!ENTITY torbutton.prefs.spoofroot "Î Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ· Ï„Î¿Ï… Î³Î¿Î½Î¹ÎºÎ¿Ï ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… Ï„Î·Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚">
-<!ENTITY torbutton.prefs.spoofdomain "Î Î±ÏÎ±Ï€Î»Î¬Î½Î·ÏƒÎ· Ï„Î·Ï‚ Ï€ÎµÏÎ¹Î¿Ï‡Î®Ï‚ Ï‰Ï‚ Î±Î½Î±Ï†Î¿ÏÎÎ±">
-<!ENTITY torbutton.prefs.spoofblank "Î¦Ï„Î¹Î¬Î¾Îµ ÎºÎµÎ½ÎÏ‚ Ï€Î±ÏÎ±Ï€Î¿Î¼Ï€ÎÏ‚">
 <!ENTITY torbutton.cookiedialog.title "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î±Ï‚ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Î ÏÎ¿ÏƒÏ„Î±Ï„ÎµÏ…Î¼ÎÎ½Î±">
 <!ENTITY torbutton.cookiedialog.domainCol "ÎŸÎ¹ÎºÎ¿Î´ÎµÏƒÏ€ÏŒÏ„Î·Ï‚">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Î‘Ï†Î±Î¯ÏÎµÏƒÎ· ÎŒÎ»Ï‰Î½ Î•ÎºÏ„ÏŒÏ‚ Î±Ï€ÏŒ Ï„Ï‰Î½ Î ÏÎ¿ÏƒÏ„Î±Ï„ÎµÏ…Î¼ÎÎ½Ï‰Î½">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÎÎÏ‰Î½ Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÎÎ± ÎœÎ· Î³Î¯Î½ÎµÏ„Î±Î¹ Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÎÎÏ‰Î½ Cookie">
-<!ENTITY torbutton.prefs.disable_livemarks "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Ï‰Î½ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÏ‰Î½ Livemark ÎºÎ±Ï„Î¬ Ï„Î· Î´Î¹Î¬ÏÎºÎµÎ¹Î± Ï„Î·Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï… Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(ÏƒÏ…Î½Î¯ÏƒÏ„Î±Ï„Î±Î¹)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ï€ÏÎ¿ÎµÏÎ±Î¹Ï„Î¹ÎºÏŒ)">
-<!ENTITY torbutton.prefs.dtd_crucial "(ÎºÏÎ¯ÏƒÎ¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Î‘Î½Î±Î´ÏÎ¿Î¼Î¿Î»ÏŒÎ³Î·ÏƒÎµ Ï„Î¹Ï‚ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Torbutton Î¼ÎÎµÏƒÏ‰ Ï„Î¿Ï… Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ Î¼Î¹Î± ÎµÎ½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÎ® Î¼Î·Ï‡Î±Î½Î® Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ ÏŒÏ„Î±Î½ Ï€Î±ÏÎ¿Ï…ÏƒÎ¹Î±ÏƒÏ„ÎµÎ¯ ÎµÎ½Î± Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Î”Î¹Î±Ï†Î±Î½Î®Ï‚ Torification  (Î‘Ï€Î±Î¹Ï„ÎµÎ¯ Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿  proxy Î® Tor Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î·Ï„Î®)">
 <!ENTITY torbutton.prefs.block_disk "ÎšÎ±Î¼Î¼Î¹Î± ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î· Ï„Î¿Ï… Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏ…Ï… Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ·Ï‚ Î® Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Î¹ÏƒÏ„Î¿ÏƒÎµÎ»Î¯Î´Î±Ï‚ (ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·ÏƒÎ· Ï„Î·Ï‚  ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎ®Ï‚ Ï€ÎµÏÎ¹Î®Î³Î·ÏƒÎ·Ï‚) ">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼Î¿Ï‚ Ï„Ï‰Î½ cookies Ï„ÏÎ¹Ï„Ï‰Î½ ÎºÎ±Î¹ Î±Î»Î»Ï‰Î½ Î´ÎµÎ´Î¿Î¼ÎµÎ½Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿Ï…Î¸Î·ÏƒÎ·Ï‚">
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 223302e..12364fc 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ€¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
 <!ENTITY torbutton.prefs.sec_high "High">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index 472f5b8..f4bd994 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Agordoj de Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Retperantâ€agordoj">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Uzi Privoxyâ€™on">
 <!ENTITY torbutton.prefs.use_polipo "Uzi Polipoâ€™n">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTPâ€peranto:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopherâ€peranto:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Pordo:">
-<!ENTITY torbutton.about.title "Pri Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Helpo">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nova idento">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "A">
 <!ENTITY torbutton.context_menu.preferences "Agordojâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "A">
-<!ENTITY torbutton.context_menu.about "Pri Torbuttonâ€¦">
-<!ENTITY torbutton.context_menu.about.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "P">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "A">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Sekurec-agordoj">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Toro">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "RestaÅri defaÅltojn">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 15c355e..31e2aca 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferencias de Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³n del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuraciÃ³n para proxy recomendada para mi versiÃ³n de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Usar Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar configuraciÃ³n de proxy personalizada">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Servidor SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!ENTITY torbutton.about.title "Acerca de Torbutton">
-<!ENTITY torbutton.about.version "VersiÃ³n: ">
-<!ENTITY torbutton.about.summary "Protege la privacidad de su navegaciÃ³n a travÃ©s de Tor.">
-<!ENTITY torbutton.about.code "Contribuidores al cÃ³digo: ">
-<!ENTITY torbutton.about.maintainer "Mantenedor:">
-<!ENTITY torbutton.about.security_review "RevisiÃ³n de la seguridad: ">
-<!ENTITY torbutton.about.donate "Si le gusta usar Tor, podrÃa considerar ">
-<!ENTITY torbutton.about.make_donation "hacer una donaciÃ³n.">
 <!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar estas preferencias.">
 <!ENTITY torbutton.pref_connection.more_info "MÃ¡s informaciÃ³n">
 <!ENTITY torbutton.pref_connection_more_info.title "Ayuda">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Cambiar estado de Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de privacidad y seguridad...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Acerca de Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraciÃ³n de red Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "G">
 <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualizaciÃ³n del Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "a">
 <!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar URL de Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "U">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir URL de Tor en una nueva pestaÃ±a">
-<!ENTITY torbutton.context_menu.openTorTab.key "p">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL de Tor en nueva ventana">
-<!ENTITY torbutton.context_menu.openTorWindow.key "v">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad">
-<!ENTITY torbutton.prefs.block_thread "Bloquear lecturas del historial al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrituras al historial al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear lecturas del historial al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrituras al historial al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_history "Borrar el historial al cambiar el estado de Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear cachÃ© de disco de Tor y limpiar toda la cachÃ© al cambiar el estado de Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquear el acceso a cachÃ© de disco y de memoria al usar Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies de navegaciÃ³n sin Tor en un archivo .jar protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Utilice el cuadro Protecciones de Cookie para elegir">
-<!ENTITY torbutton.prefs.mmm_cookies "GestionarÃ© manualmente mis cookies (peligroso)">
-<!ENTITY torbutton.prefs.clear_cookies "Borrar cookies al activar Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Deshabilitar plugins al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Bloquear javascript peligroso (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Bloquear contenido dinÃ¡mico para el estado activo de Tor (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Deshabilitar actualizaciones durante el uso de Tor">
-<!ENTITY torbutton.prefs.set_uagent "Establecer agente de usuario (user agent) para el uso de Tor (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Contenido dinÃ¡mico">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "CachÃ©">
-<!ENTITY torbutton.prefs.history "Historial">
-<!ENTITY torbutton.prefs.no_search "Deshabilitar sugerencias de bÃºsqueda al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.shutdown "Cierre">
-<!ENTITY torbutton.prefs.tor_shutdown "Borrar las cookies de navegaciÃ³n con Tor cuando se cierre el navegador con Tor activo">
-<!ENTITY torbutton.prefs.all_shutdown "Borrar cookies para cualquier cierre del navegador">
-<!ENTITY torbutton.prefs.no_shutdown "No borrar mis cookies al cerrar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesiones (recomendado)">
-<!ENTITY torbutton.prefs.headers "Cabeceras">
-<!ENTITY torbutton.prefs.refererspoofing "SimulaciÃ³n del remitente (referer, direcciÃ³n desde la que accedemos a otra)">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Simular smart referer al usar de Tor (suprime el remitente en cambios de dominio)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deshabilitar el almacenamiento DOM (LSOs/Flash Cookies/Supercookies) al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.forms "Formularios">
-<!ENTITY torbutton.prefs.block_tforms "Bloquear el guardado de contraseÃ±as y formularios de navegaciÃ³n con Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquear el guardado de contraseÃ±as y formularios de navegaciÃ³n sin Tor (opcional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Sin Tor">
-<!ENTITY torbutton.prefs.restore_tor "Durante un arranque con restauraciÃ³n de sesiÃ³n, establecer el estado de Tor a: ">
-<!ENTITY torbutton.prefs.startup_tor "Durante el arranque del navegador, establecer el estado de Tor a:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recargar archivo .jar de cookies/borrar cookies al fallar Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar juntas cookies de navegaciÃ³n con Tor y sin Tor en archivos .jar protegidos (peligroso)">
-<!ENTITY torbutton.prefs.clear_http_auth "Borrar sesiones de autentificaciÃ³n HTTP (recomendado)">
-<!ENTITY torbutton.prefs.block_js_history "Bloquear el acceso al historial de navegaciÃ³n para el estado activo de Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a mÃºltiplos de 50px al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor "Cerrar todas las ventanas y pestaÃ±as cargadas con Tor al cambiar el estado (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Cerrar todas las ventanas y pestaÃ±as cargadas sin Tor al cambiar el estado (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloquear los clics sobre enlaces y las recargas de pÃ¡gina provenientes de estados de Tor distintos al actual (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Almacenar certificados SSL en archivos .jar separados por estados Tor/sin Tor (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Almacenar certificados de Autoridades de Certificados (CAs) en archivos .jar separados por estados Tor/sin Tor (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Deshabilitar botÃ³n y atajos de teclado para prevenir cambios de estado accidentales">
-<!ENTITY torbutton.prefs.startup_state "Durante el arranque normal, establecer el estado de Tor a:">
-<!ENTITY torbutton.prefs.shutdown_state "Estado al cierre">
-<!ENTITY torbutton.prefs.startup "Arranque ">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear el acceso a la red con Tor desde URLs de archivo local file:// (recomendado) ">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear el acceso a la red sin Tor desde URLs de archivo local file:// ">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados ">
 <!ENTITY torbutton.prefs.test_settings "Probar configuraciÃ³n">
-<!ENTITY torbutton.prefs.test_auto "Probar mi configuraciÃ³n de Tor desde la primera activaciÃ³n cada vez que inicie Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "No escribir en el disco las cookies de navegaciÃ³n con Tor">
-<!ENTITY torbutton.prefs.nontor_memory_jar "No escribir en el disco las cookies de navegaciÃ³n sin Tor">
-<!ENTITY torbutton.prefs.session_restore "Hacer que session store (almacenamiento de sesiÃ³n de Firefox) guarde y restaure estas pestaÃ±as: ">
-<!ENTITY torbutton.prefs.nontor_tabs "PestaÃ±as cargadas sin Tor">
-<!ENTITY torbutton.prefs.tor_tabs "PestaÃ±as cargadas con Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Sin proxies para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite usar los nombres de servidor (host) citados arriba">
-<!ENTITY torbutton.prefs.spoofreresh "Simular refresco de pÃ¡gina">
-<!ENTITY torbutton.prefs.refereroptions "Opciones de simulaciÃ³n del referer (remitente, direcciÃ³n desde la que accede a la actual)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Simular la direcciÃ³n de la carpeta que contiene la pÃ¡gina">
-<!ENTITY torbutton.prefs.spoofdomain "Simular que el dominio de la pÃ¡gina es el referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
 <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirigir las actualizaciones de Torbutton a travÃ©s de Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Usar automÃ¡ticamente un motor de busqueda alternativo cuando se encuentre un captcha de Google ">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "bing.com">
-<!ENTITY torbutton.prefs.engine3 "yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "TorificaciÃ³n transparente (requiere un transproxy personalizado o un router Tor)">
 <!ENTITY torbutton.prefs.priv_caption "ParÃ¡metros de privacidad">
 <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegaciÃ³n o datos del sitio web (habilita Modo de NavegaciÃ³n Privada)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript puede habilitarse por sitios mediante el botÃ³n de barra de herramientas de NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "La mayorÃa de formatos de audio y vÃdeo estÃ¡n deshabilitados.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM es el Ãºnico codec que permanece habilitado.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Algunas fuentes e iconos pueden mostrarse de forma incorrecta.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web estÃ¡n bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index dfd7e0c..ed9793e 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbuttoni eelistused">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(soovitatud)">
-<!ENTITY torbutton.prefs.dtd_optional "(valikuline)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ã¼lioluline)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 43b5a18..a8b1aa2 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Hobespenak">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Ezarpenak">
 <!ENTITY torbutton.prefs.recommended_settings "Erabili nire Firefox bertsiorako proxy ezarpen gomendatuak">
-<!ENTITY torbutton.prefs.use_privoxy "Erabili Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Erabili Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Erabili proxy ezarpen pertsonalizatuak">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxya:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxya:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ostalaria:">
 <!ENTITY torbutton.prefs.proxy.port "Portua:">
-<!ENTITY torbutton.about.title "Torbuttoni buruz">
-<!ENTITY torbutton.about.version "Bertsioa:">
-<!ENTITY torbutton.about.summary "Zure Tor nabigazioaren pribatutasuna babesten du.">
-<!ENTITY torbutton.about.code "Kode Laguntzaileak:">
-<!ENTITY torbutton.about.maintainer "Mantentzailea:">
-<!ENTITY torbutton.about.security_review "Segurtasun Berrikuspena">
-<!ENTITY torbutton.about.donate "Tor erabiltzea gustoko baduzu, agian">
-<!ENTITY torbutton.about.make_donation "dohaintza kontutan hartu dezakezu.">
 <!ENTITY torbutton.pref_connection.notice "Torbutton ezgaitu ezarpen hauek aldatzeko">
 <!ENTITY torbutton.pref_connection.more_info "Informazio gehiago">
 <!ENTITY torbutton.pref_connection_more_info.title "Laguntza">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Aldatu Toren egoera">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Pribatutasun eta segurtasun ezarpenak...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbuttoni buruz...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopiatu Tor URLa">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ireki Tor URLa Fitxa berri batean">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "ireki Tor URLa Lehio berri batean">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
 <!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak">
-<!ENTITY torbutton.prefs.block_thread "Blokeatu historia irakurketak Tor bitartean (erabakigarria)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokeatu historia idazketak Tor bitartean (gomendatua)">
-<!ENTITY torbutton.prefs.block_nthread "Blokeatu historia irakurketak Ez-Tor bitartean (hautazkoa)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokeatu historia idazketak Ez-Tor bitartean (hautazkoa)">
-<!ENTITY torbutton.prefs.clear_history "Garbitu historia Tor aldatzerakoan (hautazkoa)">
-<!ENTITY torbutton.prefs.clear_cache "Blokeatu Tor katxe diska eta garbitu katxe osoa tor aldatzerakoan">
-<!ENTITY torbutton.prefs.block_cache "Blokeatu diska eta memoria katxera sartzea tor bitartean">
-<!ENTITY torbutton.prefs.cookie_jars "Gorde Ez-Tor cookieak babestutako jar batean">
-<!ENTITY torbutton.prefs.cookie_protection "Erabili Cookie Babes Elkarrizketa-koadroa aukeratzeko">
-<!ENTITY torbutton.prefs.mmm_cookies "Eskuz kudeatuko ditut nire cookieak (arriskutsua)">
-<!ENTITY torbutton.prefs.clear_cookies "Garbitu cookieak Tor aldatzerakoan">
-<!ENTITY torbutton.prefs.disable_plugins "Pluginak ezgaitu Tor erabiltzen den bitartean (erabakigarria)">
-<!ENTITY torbutton.prefs.kill_bad_js "Javascript arriskutsua lotu (erabakigarria)">
-<!ENTITY torbutton.prefs.isolate_content "Eduki dinamikoa Tor egoerara isolatu (erabakigarria)">
-<!ENTITY torbutton.prefs.no_updates "Ezgaitu eguneraketak Tor erabiltzen den bitartean">
-<!ENTITY torbutton.prefs.set_uagent "Ezarri erabiltzaile agentea Tor erabilerarentzako (erabakigarria)">
-<!ENTITY torbutton.prefs.dynamic "Eduki Dinamikoa">
-<!ENTITY torbutton.prefs.cookies "Cookieak">
-<!ENTITY torbutton.prefs.cache "Katxea">
-<!ENTITY torbutton.prefs.history "Historia">
-<!ENTITY torbutton.prefs.no_search "Ezgaitu bilaketa iradokizunak Tor bitartean (gomendatua)">
-<!ENTITY torbutton.prefs.shutdown "Itzali">
-<!ENTITY torbutton.prefs.tor_shutdown "Garbitu Tor cookieak Tor-gaitutako nabigatzaile bat itzali bitartean">
-<!ENTITY torbutton.prefs.all_shutdown "Garbitu cookieak edozein nabigatzaile itzaltzerakoan">
-<!ENTITY torbutton.prefs.no_shutdown "Ez garbitu nire cookieak itzaltzerakoan">
-<!ENTITY torbutton.prefs.disable_sessionstore "Ezagitu Saioa Gordetzea (gomendatua)">
-<!ENTITY torbutton.prefs.headers "Goiburuak">
-<!ENTITY torbutton.prefs.refererspoofing "Refereraren nortasuna ordeztu">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Adimentsuki ordeztu referera Tor erabiltzen den bitartean (zeharkako domeinu refererak ordezten ditu)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ezgaitu DOM Biltegiratzea Tor erabili bitartean (erabakigarria)">
-<!ENTITY torbutton.prefs.forms "Inprimakiak">
-<!ENTITY torbutton.prefs.block_tforms "Blokeatu pasahitz+inprimaki gordetzea Tor erabili bitartean (gomendatua)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokeatu pasahitz+inprimaki gordetzea Ez-Tor bitartean (gomendatua)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ez-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Leheneratutako saio abioan, ezarri Tor egoera honetara:">
-<!ENTITY torbutton.prefs.startup_tor "Nabigatzaile abioan, ezarri Tor egoera honetara:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Birkargatu cookie pitxerra/garbitu cookieak Firefoxek talka egiterakoan (gomendatua)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Gorde bai Tor bai Ez-Tor cookieak babestutako pitxerretan (arriskutsua)">
-<!ENTITY torbutton.prefs.clear_http_auth "Garbitu HTTP benekotasun saioak (gomendatutakoa)">
-<!ENTITY torbutton.prefs.block_js_history "Historia nabigaziora sartzea Tor piztuta dagoen bitartean soilik isolatu (erabakigarria)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Leihoak 50pxko hainbatera eraldatu Tor erabili bitartean (gomendatua)">
-<!ENTITY torbutton.prefs.close_tor "Itxi Tor leiho eta fitxa guztiak egoera aldatzerakoan (hautazkoa)">
-<!ENTITY torbutton.prefs.close_nontor "Itxi Ez-Tor leiho eta fitxa guztiak egoera aldatzerakoan (hautazkoa)">
-<!ENTITY torbutton.prefs.block_links "Blokeatu lotura klikak eta orri birkargatzeak Tor egoera ezberdinetatik (hautazkoa)">
-<!ENTITY torbutton.prefs.jar_certs "Gorde SSL ziurtagiriak pitxer ezberdinetan Tor/Ez-Torentzat (gomendatua)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Gorde CA ziurtagiriak pitxer ezberdinetan Tor/Ez-Torentzat (gomendatua)">
-<!ENTITY torbutton.prefs.locked_mode "Ezgaitu Botoia eta Laster-teklak nahigabeko egoera aldaketa sahiesteko">
-<!ENTITY torbutton.prefs.startup_state "Abio arruntean, ezarri Tor egoera honetara:">
-<!ENTITY torbutton.prefs.shutdown_state "Itzaltze egoera">
-<!ENTITY torbutton.prefs.startup "Abioa">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokeatu Torek "file://" URLetatik sarera sartzea (gomendatua)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokeatu Ez-Torek "file://" URLetatik sarera sartzea">
 <!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
 <!ENTITY torbutton.prefs.test_settings "Ezarpenak frogatu">
-<!ENTITY torbutton.prefs.test_auto "Frogatu nire Tor ezarpenak egoeraz aldatzen dudan lehen aldian Firefox abio bakoitzean">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ez idatzi Tor cookieak diskara">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ez idatzi Ez-Tor cookieak diskan">
-<!ENTITY torbutton.prefs.session_restore "Saioa gorde eta fitxa hauek leheneratu:">
-<!ENTITY torbutton.prefs.nontor_tabs "Fitxak Ez-Toren kargatuak">
-<!ENTITY torbutton.prefs.tor_tabs "Fitxak Toren kargatuak">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Proxyrik ez hauentzako:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Kontuz: Ez erabili ostalari-izenik gainean">
-<!ENTITY torbutton.prefs.spoofreresh "Ordezketa Freskatu">
-<!ENTITY torbutton.prefs.refereroptions "Referer Ordezketa Ezarpenak">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Ordeztu orriaren eduki karpeta">
-<!ENTITY torbutton.prefs.spoofdomain "Ordeztu domeinua referera bezala">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
 <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(gomendatua)">
-<!ENTITY torbutton.prefs.dtd_optional "(hautazkoa)">
-<!ENTITY torbutton.prefs.dtd_crucial "(erabakigarria)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton eguneraketan Tor zehar birzuzendu">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatikoki beste bilaketa motor bat erabili Google Captcha batekin aurkezten denean:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)">
 <!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak">
 <!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
 <!ENTITY torbutton.prefs.sec_high "Altua">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Balio pertsonalizatuak">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 23864a3..f8a5ae7 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø¯Ú©Ù…Ù‡ ØªÙØ±">
 <!ENTITY torbutton.prefs.tor_settings "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ">
 <!ENTITY torbutton.prefs.recommended_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù† ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªÙˆØµÙŠÙ‡ Ø´Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù†Ø³Ø®Ù‡ ÙØ§ÙŠØ±ÙØ§Ú©Ø³ Ù…Ù†">
-<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾Ø±Ø§ÙŠÙˆØ§Ú©Ø³ÛŒ (Privoxy)">
 <!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾ÙˆÙ„ÙŠÙ¾Ùˆ (Polipo)">
 <!ENTITY torbutton.prefs.custom_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù† ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø³ÙØ§Ø±Ø´ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾Ø±Ø§Ú©Ø³ÛŒ">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù¾Ø±Ø§Ú©Ø³ÛŒ HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Ù¾Ø±Ø§Ú©Ø³ÛŒ Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Ù…ÙŠØ²Ø¨Ø§Ù† SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Ø¯Ø±Ú¯Ø§Ù‡ (Port):">
-<!ENTITY torbutton.about.title "Ø¯Ø±Ø¨Ø§Ø±Û€ Ø¯Ú©Ù…Ù‡ ØªÙØ±">
-<!ENTITY torbutton.about.version "Ù†Ø³Ø®Ù‡ :">
-<!ENTITY torbutton.about.summary "Ù…ØØ§ÙØ¸Øª Ø§Ø² ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… ÙˆØ¨Ú¯Ø±Ø¯ÛŒ Ø¨Ø§ ØªÙØ±.">
-<!ENTITY torbutton.about.code "Ù‡Ù…Ú©Ø§Ø±Ø§Ù† Ú©Ø¯ :">
-<!ENTITY torbutton.about.maintainer "Ù†Ú¯Ù‡Ø¯Ø§Ø±Ù†Ø¯Ù‡ :">
-<!ENTITY torbutton.about.security_review "Ù†Ú©Ø§Øª Ø§Ù…Ù†ÛŒØªÛŒ :">
-<!ENTITY torbutton.about.donate "Ø§Ú¯Ø± Ù…Ø§ÛŒÙ„ Ø¨Ù‡ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ± Ù‡Ø³ØªÛŒØ¯ØŒ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ù…Ø¯Ù†Ø¸Ø± Ù‚Ø±Ø§Ø± Ø¯Ù‡ÛŒØ¯">
-<!ENTITY torbutton.about.make_donation "Ø§Ù‡Ø¯Ø§Ø¡ Ú©Ù…Ú© Ù†Ù‚Ø¯ÛŒ.">
 <!ENTITY torbutton.pref_connection.notice "ØºÙŠØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø¯Ú©Ù…Ù‡ ØªÙØ± Ø¬Ù‡Øª ØªØºÙŠÙŠØ± Ø¯Ø±Ø§ÙŠÙ† ØªÙ†Ø¸ÙŠÙ…Ø§Øª.">
 <!ENTITY torbutton.pref_connection.more_info "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨ÙŠØ´ØªØ±">
 <!ENTITY torbutton.pref_connection_more_info.title "Ø±Ø§Ù‡Ù†Ù…Ø§">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ø´Ø¨Ú©Ù‡ Ø¬Ø¯ÛŒØ¯ Tor Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ø³Ø§ÛŒØª">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Ø¯Ú©Ù…Ù‡ ÙØ¹Ø§Ù„/ØºÙŠØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† ØªÙØ±">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ØÙØ¸ ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ùˆ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø§Ù…Ù†ÛŒØªÛŒ">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Ø¯Ø±Ø¨Ø§Ø±Ù‡ ÙŠ Ø¯Ú©Ù…Ù‡ ØªÙØ±...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø¨Ú©Ù‡ ØªÙˆØ±">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ø¨Ø±Ø±Ø³ÛŒ Ø¨Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Tor Browser ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ØÙØ§Ø¸Øª Ú©ÙˆÚ©ÛŒ Ù‡Ø§...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Ú©Ù¾ÛŒ Ø¨Ù‡ Ù†Ø´Ø§Ù†ÛŒ Ø§ÙŠÙ†ØªØ±Ù†ØªÛŒ">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ù†Ø´Ø§Ù†ÛŒ Ø§ÙŠÙ†ØªØ±Ù†ØªÛŒ ØªÙØ± Ø¯Ø± ÙŠÚ© Ø¨Ø±Ú¯Ù‡ Ø¬Ø¯ÙŠØ¯ ">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ù†Ø´Ø§Ù†ÛŒ Ø§ÙŠÙ†ØªØ±Ù†ØªÛŒ ØªÙØ± Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯ÙŠØ¯ ">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Ø¯Ú©Ù…Ù‡ ØªÙØ±">
 <!ENTITY torbutton.button.tooltip "Ø¬Ù‡Øª Ø´Ø±ÙˆØ¹ Ø¯ÙƒÙ…Ù‡ ØªÙØ±Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯">
 <!ENTITY torbutton.prefs.privacy_security_settings "ØÙØ¸ ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ùˆ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø§Ù…Ù†ÛŒØªÛŒ">
-<!ENTITY torbutton.prefs.block_thread "Ø¬Ù„ÙˆÚ¯ÛŒØ±ÛŒ Ø§Ø²Ø®ÙˆØ§Ù†Ø¯Ù† ØªØ§Ø±ÛŒØ®Ú†Ù‡ (History) Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø§Ø¬Ø±Ø§ÛŒ ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.block_thwrite "Ø¬Ù„ÙˆÚ¯ÛŒØ±ÛŒ Ø§Ø² Ù†ÙˆØ´ØªÙ† ØªØ§Ø±ÛŒØ®Ú†Ù‡ (History) Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø§Ø¬Ø±Ø§ÛŒ ØªÙØ± (ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.block_nthread "Ø¬Ù„ÙˆÚ¯ÛŒØ±ÛŒ Ø§Ø² Ø®ÙˆØ§Ù†Ø¯Ù† ØªØ§Ø±ÛŒØ®Ú†Ù‡ (History) Ø¯Ø± Ø²Ù…Ø§Ù† ØºÙŠØ±ØªÙØ± (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ø¬Ù„ÙˆÚ¯ÛŒØ±ÛŒ Ø§Ø² Ù†ÙˆØ´ØªÙ† ØªØ§Ø±ÛŒØ®Ú†Ù‡ (History) Ø¯Ø± Ø²Ù…Ø§Ù† ØºÙŠØ±ØªÙØ± (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.clear_history "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† ØªØ§Ø±ÛŒØ®Ú†Ù‡ Ø¯Ø± Ø²Ù…Ø§Ù† ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† ØªÙØ± (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.clear_cache "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø°Ø®ÙŠØ±Ù‡â€ŒÚ¯Ø§Ù‡ Ø¯ÙŠØ³Ú© (Disk cache) ØªÙØ± Ùˆ Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† ØªÙ…Ø§Ù… Ø°Ø®ÙŠØ±Ù‡â€ŒÚ¯Ø§Ù‡ Ø¯Ø± Ø²Ù…Ø§Ù† ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† ØªÙØ±">
-<!ENTITY torbutton.prefs.block_cache "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø°Ø®ÙŠØ±Ù‡â€ŒÚ¯Ø§Ù‡ ØØ§ÙØ¸Ù‡ (Memory cache) Ùˆ Ø¯ÛŒØ³Ú© Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø§Ø¬Ø±Ø§ÛŒ ØªÙØ±">
-<!ENTITY torbutton.prefs.cookie_jars "Ø°Ø®ÛŒØ±Ù‡ Ú©Ø±Ø¯Ù† Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØºÛŒØ± ØªÙØ± Ø¯Ø± ÛŒÚ© ÙØ§ÛŒÙ„ ØÙØ§Ø¸Øª Ø´Ø¯Ù‡ jar">
-<!ENTITY torbutton.prefs.cookie_protection "Ø¨Ø±Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ø§Ø² Ù¾Ù†Ø¬Ø±Ù‡ ØÙØ§Ø¸Øª Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÙŠØ¯">
-<!ENTITY torbutton.prefs.mmm_cookies "Ø®ÙˆØ¯Ù… Ø¨Ù‡ Ø·ÙˆØ± Ø¯Ø³ØªÛŒ Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ Ø±Ø§ Ù…Ø¯ÙŠØ±ÙŠØª Ù…ÛŒâ€ŒÚ©Ù†Ù… (Ø®Ø·Ø±Ù†Ø§Ú©)">
-<!ENTITY torbutton.prefs.clear_cookies "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† ØªÙØ±">
-<!ENTITY torbutton.prefs.disable_plugins "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§ÙØ²ÙˆÙ†Ù‡â€ŒÙ‡Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ø¨Ù‡ Ø¯Ø§Ù… Ø§Ù†Ø¯Ø§Ø®ØªÙ† Ø¬Ø§ÙˆØ§Ø§Ø³Ú©Ø±ÛŒÙ¾Øªâ€ŒÙ‡Ø§ÛŒ Ø®Ø·Ø±Ù†Ø§Ú© (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.isolate_content "Ù…ØØ¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ù…ØØªÙˆØ§ÛŒ Ù¾ÙˆÛŒØ§ Ø¨Ù‡ ÙˆØ¶Ø¹ÛŒØª ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.no_updates "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ±">
-<!ENTITY torbutton.prefs.set_uagent "ØªØ¹ÙŠÙŠÙ† Ú©Ø§Ø±Ø¨Ø± Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.dynamic "Ù…ØØªÙˆØ§ÛŒ Ù¾ÙˆÛŒØ§">
-<!ENTITY torbutton.prefs.cookies "Ú©ÙˆÚ©ÛŒ Ù‡Ø§">
-<!ENTITY torbutton.prefs.cache "Ø°Ø®ÙŠØ±Ù‡â€ŒÚ¯Ø§Ù‡">
-<!ENTITY torbutton.prefs.history "ØªØ§Ø±ÛŒØ®Ú†Ù‡">
-<!ENTITY torbutton.prefs.no_search "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯Ù‡Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø¬Ø±Ø§ÛŒ ØªÙØ± (ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.shutdown "Ø®Ø§Ù…ÙˆØ´ Ú©Ø±Ø¯Ù†">
-<!ENTITY torbutton.prefs.tor_shutdown "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ú©ÙˆÚ©ÛŒ Ù‡Ø§ÛŒ ØªÙØ±Ø¯Ø±Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø³ØªÙ† Ù…Ø±ÙˆØ±Ú¯Ø±ÛŒ Ú©Ù‡ Ø¨Ø§ ØªÙØ± Ú©Ø§Ø± Ù…ÛŒâ€ŒÚ©Ù†Ø¯">
-<!ENTITY torbutton.prefs.all_shutdown "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ú©ÙˆÚ©ÛŒ Ù‡Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø³ØªÙ† Ù‡Ø± Ù…Ø±ÙˆØ±Ú¯Ø±ÛŒ">
-<!ENTITY torbutton.prefs.no_shutdown "Ù¾Ø§Ú© Ù†Ú©Ø±Ø¯Ù† Ú©ÙˆÚ©ÛŒ Ù‡Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø³ØªÙ†">
-<!ENTITY torbutton.prefs.disable_sessionstore "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø°Ø®ÛŒØ±Ù‡â€ŒØ³Ø§Ø²ÛŒ Ù†Ø´Ø³Øª (Session) Ù‡Ø§ (ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.headers "Ø³Ø±Ø¨Ø±Ú¯â€ŒÙ‡Ø§">
-<!ENTITY torbutton.prefs.refererspoofing "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ù‡ÙˆØ´Ù…Ù†Ø¯Ø§Ù†Ù‡ Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ± (Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡ Ù‡Ø§ÛŒ Ù…ÙŠØ§Ù† Ø¯Ø§Ù…Ù†Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ù…ÛŒ Ú©Ù†Ø¯)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "ØºÛŒØ±ØºØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§Ù†Ø¨Ø§Ø±Ù‡ DOM Ù‡Ù†Ú¯Ø§Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.forms "ÙØ±Ù…â€ŒÙ‡Ø§">
-<!ENTITY torbutton.prefs.block_tforms "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø°Ø®ÛŒØ±Ù‡ Ø§Ø³Ù… Ø±Ù…Ø² Ùˆ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙØ±Ù… Ù‡Ù†Ú¯Ø§Ù… Ø§Ø¬Ø±Ø§ÛŒ ØªÙØ± (ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.block_ntforms "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø°Ø®ÛŒØ±Ù‡ Ø§Ø³Ù… Ø±Ù…Ø² Ùˆ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙØ±Ù… Ù‡Ù†Ú¯Ø§Ù… ØºÛŒØ± ÙØ¹Ø§Ù„ Ø¨ÙˆØ¯Ù† ØªÙØ± (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.tor "ØªÙØ±">
-<!ENTITY torbutton.prefs.non_tor "ØºÛŒØ±ØªÙØ±">
-<!ENTITY torbutton.prefs.restore_tor "Ø¯Ø± ØµÙˆØ±Øª Ø¢ØºØ§Ø² Ø§Ø¬Ø±Ø§ÛŒ Ù…Ø±ÙˆØ±Ú¯Ø± Ø¨Ø§ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ù†Ø´Ø³Øª (Session) Ù‚Ø¨Ù„ÛŒØŒ ÙˆØ¶Ø¹ÛŒØª ØªÙØ± Ø±Ø§ Ø¯Ø± Ø§ÙŠÙ† ØØ§Ù„Øª Ù‚Ø±Ø§Ø± Ø¨Ø¯Ù‡:">
-<!ENTITY torbutton.prefs.startup_tor "Ù‡Ù†Ú¯Ø§Ù… Ø´Ø±ÙˆØ¹ Ù…Ø±ÙˆØ±Ú¯Ø±ØŒ ÙˆØ¶Ø¹ÙŠØª ØªÙØ± Ø±Ø§ Ø¯Ø± Ø§ÙŠÙ† ØØ§Ù„Øª Ù‚Ø±Ø§Ø± Ø¨Ø¯Ù‡:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ ÙØ§ÙŠÙ„ jar ØØ§ÙˆÛŒ Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ / Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù† ÙØ§ÙŠØ±ÙØ§Ú©Ø³ (ØªÙˆØµÙŠÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ù‡Ù… Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØªÙØ± Ùˆ Ù‡Ù… Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØºÙŠØ±ØªÙØ± Ø±Ø§ Ø¯Ø± ÙØ§ÙŠÙ„â€ŒÙ‡Ø§ÛŒ jar ØÙØ§Ø¸Øª Ø´Ø¯Ù‡ Ù‚Ø±Ø§Ø± Ø¨Ø¯Ù‡ (Ø®Ø·Ø±Ù†Ø§Ú©)">
-<!ENTITY torbutton.prefs.clear_http_auth "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø´Ø³Øª Ù‡Ø§ÛŒ Ø§ØØ±Ø§Ø²Ù‡ÙˆÛŒØª HTTP (ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.block_js_history "Ù…ØØ¯ÙˆØ¯ Ú©Ø±Ø¯Ù† Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ù…Ø±ÙˆØ± ØªØ§Ø±ÛŒØ®Ú†Ù‡ ØµÙØØ§Øª Ø¨Ù‡ ÙˆØ¶Ø¹ÛŒØª ØªÙØ± (Ø¨Ø³ÛŒØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.resize_on_toggle "ØªØºÛŒÛŒØ±Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø§Ø¨Ø¹Ø§Ø¯ Ù¾Ù†Ø¬Ø±Ù‡ Ø¨Ø§ Ù…Ø¶Ø±Ø¨Ù‡Ø§ÛŒ 50 Ù¾ÙŠÚ©Ø³Ù„ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ±(ØªÙˆØµÛŒÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.close_tor "Ø¨Ø³ØªÙ† Ù‡Ù…Ù‡ Ù¾Ù†Ø¬Ø±Ù‡ Ù‡Ø§ÛŒ ØªÙØ± Ùˆ Ø¨Ø±Ú¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ù†Ù‡Ø§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ø´Ø¯Ù† (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.close_nontor "Ø¨Ø³ØªÙ† Ù‡Ù…Ù‡ Ù¾Ù†Ø¬Ø±Ù‡ Ù‡Ø§ÛŒ ØºÛŒØ±ØªÙØ± Ùˆ Ø¨Ø±Ú¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ù†Ù‡Ø§ Ø¯Ø±Ù‡Ù†Ú¯Ø§Ù… ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ø´Ø¯Ù† (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.block_links "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ú©Ù„ÛŒÚ© Ù¾ÛŒÙˆÙ†Ø¯â€ŒÙ‡Ø§ Ùˆ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ ØµÙØØ§Øª Ø§Ø² ÙˆØ¶Ø¹ÛŒØª Ù‡Ø§ÛŒ Ù…ØªÙØ§ÙˆØª ØªÙØ± (Ø§Ø®ØªÛŒØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.jar_certs "Ø°Ø®ÙŠØ±Ù‡â€ŒØ³Ø§Ø²ÛŒ Ú¯ÙˆØ§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ SSL Ø¨Ø±Ø§ÛŒ ØªÙØ± Ùˆ ØºÙŠØ±ØªÙØ± Ø¯Ø± ÙØ§ÙŠÙ„â€ŒÙ‡Ø§ÛŒ jar Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ (ØªÙˆØµÙŠÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Ø°Ø®ÙŠØ±Ù‡â€ŒØ³Ø§Ø²ÛŒ Ú¯ÙˆØ§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ Ù…Ø±Ø§Ø¬Ø¹ Ú¯ÙˆØ§Ù‡ÛŒ (CA) Ø¨Ø±Ø§ÛŒ ØªÙØ± Ùˆ ØºÙŠØ±ØªÙØ± Ø¯Ø± ÙØ§ÙŠÙ„â€ŒÙ‡Ø§ÛŒ jar Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ (ØªÙˆØµÙŠÙ‡ Ø´Ø¯Ù‡)">
-<!ENTITY torbutton.prefs.locked_mode "ØºØ¨Ø±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø¯Ú©Ù…Ù‡ Ùˆ Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ù…ÛŒØ§Ù†Ø¨Ø± Ø¬Ù‡Øª Ø¬Ù„ÙˆÚ¯ÛŒØ±ÛŒ Ø§Ø² ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ Ø§Ø´ØªØ¨Ø§Ù‡ÛŒ">
-<!ENTITY torbutton.prefs.startup_state "Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¢ØºØ§Ø² Ø§Ø¬Ø±Ø§ÛŒ Ù…Ø±ÙˆØ±Ú¯Ø± Ø¨Ù‡ ØµÙˆØ±Øª Ø¹Ø§Ø¯Ù‘ÛŒØŒ ÙˆØ¶Ø¹ÛŒØª ØªÙØ± Ø±Ø§ Ø¯Ø± Ø§ÙŠÙ† ØØ§Ù„Øª Ù‚Ø±Ø§Ø± Ø¨Ø¯Ù‡:">
-<!ENTITY torbutton.prefs.shutdown_state "ÙˆØ¶Ø¹ÛŒØª Ø¨Ø³ØªÙ†">
-<!ENTITY torbutton.prefs.startup "Ø´Ø±ÙˆØ¹">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø¯Ø³ØªØ±Ø³ÛŒ ØªÙØ± Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ Ø§Ø² Ø·Ø±ÙŠÙ‚ Ù†Ø´Ø§Ù†ÛŒâ€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ø¨Ø§ file:// Ø¢ØºØ§Ø² Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ (ØªÙˆØµÙŠÙ‡ Ù…ÙŠ Ø´ÙˆØ¯)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ø¬Ù„ÙˆÚ¯ÙŠØ±ÛŒ Ø§Ø² Ø¯Ø³ØªØ±Ø³ÛŒ ØºÙŠØ±ØªÙØ± Ø¨Ù‡ Ø´Ø¨Ú©Ù‡ Ø§Ø² Ø·Ø±ÙŠÙ‚ Ù†Ø´Ø§Ù†ÛŒâ€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ø¨Ø§ file:// Ø¢ØºØ§Ø² Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯">
 <!ENTITY torbutton.prefs.restore_defaults "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù† ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¨Ù‡ ØØ§Ù„Øª Ù¾ÛŒØ´â€ŒÙØ±Ø¶">
 <!ENTITY torbutton.prefs.test_settings "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¢Ø²Ù…ÙˆØ¯Ù†  ">
-<!ENTITY torbutton.prefs.test_auto "Ø¨Ø§ Ø´Ø±ÙˆØ¹ ÙØ§ÛŒØ±ÙØ§Ú©Ø³ Ø¨Ø¹Ø¯ Ø§Ø² Ø§ÙˆÙ„ÙŠÙ† ÙØ¹Ø§Ù„/ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù†ØŒ ØªÙ†Ø¸ÛŒÙ…Ø§Øª ØªÙØ± Ø±Ø§ Ø¢Ø²Ù…Ø§ÛŒØ´ Ú©Ù†">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØªÙØ± Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ø¯ÛŒØ³Ú© Ù†Ù†ÙˆÛŒØ³">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØºÛŒØ± ØªÙØ± Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ø¯ÛŒØ³Ú© Ù†Ù†ÙˆÛŒØ³">
-<!ENTITY torbutton.prefs.session_restore "Ø¨Ø±Ú¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø²ÙŠØ± Ø±Ø§ Ø¯Ø± Ù†Ø´Ø³Øª Ø°Ø®ÙŠØ±Ù‡ Ùˆ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø´ÙˆÙ†Ø¯:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ø¨Ø±Ú¯Ù‡â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ø¯Ø± ØºÛŒØ±ØªÙØ± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯">
-<!ENTITY torbutton.prefs.tor_tabs "Ø¨Ø±Ú¯Ù‡â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ø¯Ø± ØªÙØ± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCK v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ø¹Ø¯Ù… Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾Ø±Ø§Ú©Ø³ÛŒ Ø¨Ø±Ø§ÛŒ:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ù‡Ø´Ø¯Ø§Ø±: Ø§Ø² Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø±Ø¯Ù† Ù‡Ø± Ú¯ÙˆÙ†Ù‡ Ù†Ø§Ù… Ù…ÙŠØ²Ø¨Ø§Ù† (hostname) Ø¯Ø± Ø¨Ø§Ù„Ø§ Ø¨Ù¾Ø±Ù‡ÙŠØ²ÙŠØ¯">
-<!ENTITY torbutton.prefs.spoofreresh "ØªØ§Ø²Ù‡ Ú©Ø±Ø¯Ù† Ù‡ÙˆÙŠØª Ø¬Ø¹Ù„ÛŒ">
-<!ENTITY torbutton.prefs.refereroptions "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ù¾ÙˆØ´Ù‡ ØØ§ÙˆÛŒ ØµÙØÙ‡">
-<!ENTITY torbutton.prefs.spoofdomain "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø¯Ø§Ù…Ù†Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Ù…Ø¯ÙŠØ±ÙŠØª ØÙØ§Ø¸Øª Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§">
 <!ENTITY torbutton.cookiedialog.lockCol "ØÙØ§Ø¸Øª Ø´Ø¯Ù‡">
 <!ENTITY torbutton.cookiedialog.domainCol "Ù…ÙŠØ²Ø¨Ø§Ù†">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù ØªÙ…Ø§Ù… Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØÙØ§Ø¸Øª Ù†Ø´Ø¯Ù‡">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙØ§Ø¸Øª Ø§Ø² Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù… ØÙØ§Ø¸Øª Ø§Ø² Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(ØªÙˆØµÙŠÙ‡ Ù…ÛŒ Ø´ÙˆØ¯)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙŠØ§Ø±ÛŒ)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ø¨Ø³ÙŠØ§Ø± Ù…Ù‡Ù…)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒâ€ŒÙ‡Ø§ÛŒ Ø¯Ú©Ù…Ù‡ ØªÙØ± Ø§Ø² Ø·Ø±ÙŠÙ‚ ØªÙØ±">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø±Ø¯Ù† Ø®ÙˆØ¯Ú©Ø§Ø± ÙŠÚ© Ù…ÙˆØªÙˆØ± Ø¬Ø³ØªØ¬ÙˆÛŒ Ø¯ÙŠÚ¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø±Ø®ÙˆØ±Ø¯ Ø¨Ø§ Ù¾ÙŠØ§Ù…â€ŒÙ‡Ø§ÛŒ Captcha Ø¯Ø± Ú¯ÙˆÚ¯Ù„:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Ø³Ø§Ø²Ú¯Ø§Ø±Ø³Ø§Ø²ÛŒ Ø¨Ø§ ØªÙØ± Ø¨Ù‡ ØµÙˆØ±Øª Ø´ÙØ§Ù (Ù†ÙŠØ§Ø² Ø¨Ù‡ Ø±Ù‡ÙŠØ§Ø¨ ØªÙØ± ÙŠØ§ Tor router Ùˆ ÙŠØ§ transproxy Ø³ÙØ§Ø±Ø´ÛŒ Ø¯Ø§Ø±Ø¯)">
 <!ENTITY torbutton.prefs.priv_caption "ØªÙ†Ø¸ÛŒÙ…Ø§Øª ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ">
 <!ENTITY torbutton.prefs.block_disk "Ø«Ø¨Øªâ€ŒÙ†ÙƒØ±Ø¯Ù† ØªØ§Ø±ÙŠØ®Ú†Ù‡ ÙŠØ§ Ø¯Ø§Ø¯Ù‡â€ŒÙ‡Ø§Ù‰ ÙˆØ¨â€ŒÚ¯Ø§Ù‡ (Ú¯Ø´Øª Ùˆ Ú¯Ø°Ø§Ø± â€ŒØ®ØµÙˆØµÙ‰ ÙØ¹Ø§Ù„ Ù…Ù‰â€ŒÙƒÙ†Ø¯)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "Ø¬Ø§ÙˆØ§ Ø§Ø³Ú©Ø±ÛŒÙ¾ Ø¨Ø±Ø§ÛŒ Ù‡Ø± ÙˆØ¨ Ø³Ø§ÛŒØª Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø¯Ú©Ù…Ù‡ NoScript Ù†ÙˆØ§Ø± Ø§Ø¨Ø²Ø§Ø± ÙØ¹Ø§Ù„ Ù…ÛŒ Ø´ÙˆØ¯.">
 <!ENTITY torbutton.prefs.sec_high "Ø²ÛŒØ§Ø¯">
 <!ENTITY torbutton.prefs.sec_all_js_desc "Ø¬Ø§ÙˆØ§ Ø§Ø³Ú©Ø±ÛŒÙ¾Øª Ø¨Ù‡ Ø·ÙˆØ± Ù¾ÛŒØ´ ÙØ±Ø¶ Ø¯Ø± ØªÙ…Ø§Ù…ÛŒ Ø³Ø§ÛŒØª Ù‡Ø§ ØºÛŒØ± ÙØ¹Ø§Ù„ Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Ø§Ú©Ø«Ø± ÙØ±Ù…Øª Ù‡Ø§ÛŒ ØµÙˆØªÛŒ Ùˆ ØªØµÙˆÛŒØ±ÛŒ ØºÛŒØ± ÙØ¹Ø§Ù„ Ù…ÛŒ Ø¨Ø§Ø´Ø¯.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM ØªÙ†Ù‡Ø§ Ú©Ø¯Ú©ÛŒ Ø§Ø³Øª Ú©Ù‡ ÙØ¹Ø§Ù„ Ø¨Ø§Ù‚ÛŒ Ù…ÛŒ Ù…Ø§Ù†Ø¯.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Ø¨Ø±Ø®ÛŒ Ø§Ø² ÙÙˆÙ†Øª Ù‡Ø§ Ùˆ Ø¢ÛŒÚ©ÙˆÙ† Ù‡Ø§ÛŒ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù†Ù…Ø§ÛŒØ´ Ù†Ø§Ø¯Ø±Ø³Øª Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ù†Ø¯.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ ÙÙˆÙ†ØªÛŒ Ú©Ù‡ Ø¯Ø± ÙˆØ¨ Ø³Ø§ÛŒØª Ø§Ø±Ø§Ø¦Ù‡ Ù…ÛŒ Ø´ÙˆÙ†Ø¯ Ù…Ø³Ø¯ÙˆØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª.">
 <!ENTITY torbutton.prefs.sec_custom "ØªÙ†Ø¸ÛŒÙ… Ø³ÙØ§Ø±Ø´ÛŒ">
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index c580ded..f3686e2 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Asetukset">
 <!ENTITY torbutton.prefs.tor_settings "VÃ¤lityspalvelin Asetukset">
 <!ENTITY torbutton.prefs.recommended_settings "KÃ¤ytÃ¤ suositeltuja vÃ¤lityspalvelin asetuksia minun Firefox versiolleni.">
-<!ENTITY torbutton.prefs.use_privoxy "KÃ¤ytÃ¤ PrivoxyÃ¤">
 <!ENTITY torbutton.prefs.use_polipo "KÃ¤ytÃ¤ Polipoa">
 <!ENTITY torbutton.prefs.custom_settings "Aseta vÃ¤lityspalvelinasetukset kÃ¤sin">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-vÃ¤lityspalvelin:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-vÃ¤lityspalvelin:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-palvelin:">
 <!ENTITY torbutton.prefs.proxy.port "Portti:">
-<!ENTITY torbutton.about.title "Tietoja Torbuttonista">
-<!ENTITY torbutton.about.version "Versio:">
-<!ENTITY torbutton.about.summary "Suojelee Tor-selailusi yksityisyyttÃ¤.">
-<!ENTITY torbutton.about.code "Ohjelmointiin osallistuneet:">
-<!ENTITY torbutton.about.maintainer "YllÃ¤pitÃ¤jÃ¤:">
-<!ENTITY torbutton.about.security_review "Turvallisuuskatselmus:">
-<!ENTITY torbutton.about.donate "Jos pidÃ¤t Torista, sinun on mahdollista">
-<!ENTITY torbutton.about.make_donation "antaa lahjoitus.">
 <!ENTITY torbutton.pref_connection.notice "Poista Torbutton kÃ¤ytÃ¶stÃ¤ muuttaaksesi asetuksia.">
 <!ENTITY torbutton.pref_connection.more_info "LisÃ¤Ã¤ tietoja">
 <!ENTITY torbutton.pref_connection_more_info.title "Apua">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton on tÃ¤llÃ¤hetkellÃ¤ kÃ¤ytÃ¶ssÃ¤. Jos haluat muuttaa vÃ¤lityspalvelinasetuksia joita kÃ¤ytÃ¤t silloin kun Torbutton ei ole kÃ¤ytÃ¶ssÃ¤, ota ensin Torbutton pois pÃ¤Ã¤ltÃ¤ (Tor Disabled) ja palaa sitten tÃ¤nne. Jos haluat muuttaa Tor asetuksia, kÃ¤ytÃ¤ Torbutton asetukset ikkunaa.">
 <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Vaihda Tor tilaa">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Asetukset...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Tietoja Torbuttonista...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Lataa Tor Browser Bundle -pÃ¤ivitys...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "L">
 <!ENTITY torbutton.context_menu.cookieProtections "EvÃ¤steiden suojaukset">
 <!ENTITY torbutton.context_menu.cookieProtections.key "E">
-<!ENTITY torbutton.context_menu.copyTor "Kopioi Tor-URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Avaa Tor-URL uuteen vÃ¤lilehteen">
-<!ENTITY torbutton.context_menu.openTorTab.key "R">
-<!ENTITY torbutton.context_menu.openTorWindow "Avaa Tor-URL uuteen ikkunaan">
-<!ENTITY torbutton.context_menu.openTorWindow.key "U">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi">
-<!ENTITY torbutton.prefs.sec_settings "Turvallisuus (asetukset)">
-<!ENTITY torbutton.prefs.block_thread "EstÃ¤ historiatietojen lukeminen Torin ollessa kÃ¤ytÃ¶ssÃ¤. (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.block_thwrite "EstÃ¤ historiatietojen tallentaminen Torin ollessa kÃ¤ytÃ¶ssÃ¤. (suositeltua)">
-<!ENTITY torbutton.prefs.block_nthread "EstÃ¤ historiatietojen lukeminen Torin ollessa pois kÃ¤ytÃ¶stÃ¤. (valinnaista)">
-<!ENTITY torbutton.prefs.block_nthwrite "EstÃ¤ historiatietojen tallentaminen Torin ollessa pois kÃ¤ytÃ¶stÃ¤. (valinnaista)">
-<!ENTITY torbutton.prefs.clear_history "TyhjennÃ¤ historiatiedot vaihdettaessa Tor-kÃ¤ytÃ¶n tilaa. (valinnaista)">
-<!ENTITY torbutton.prefs.clear_cache "EstÃ¤ Tor vÃ¤limuisti ja tyhjennÃ¤ kaikki vÃ¤limuistissa oleva Tor tilaa vaihdettaessa.">
-<!ENTITY torbutton.prefs.block_cache "EstÃ¤ levyn ja muistin vÃ¤limuistiin pÃ¤Ã¤sy Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
-<!ENTITY torbutton.prefs.cookie_jars "Talleta ei-Tor kÃ¤ytÃ¶naikaiset evÃ¤steet suojattuun hakemistoon.">
-<!ENTITY torbutton.prefs.cookie_protection "KÃ¤ytÃ¤ valintaan EvÃ¤steiden suojaukset -valintaikkunaa">
-<!ENTITY torbutton.prefs.mmm_cookies "Huolehdin evÃ¤steistÃ¤ itse manuaalisesti. (vaarallista)">
-<!ENTITY torbutton.prefs.clear_cookies "Poista evÃ¤steet vaihdettaessa Tor-kÃ¤ytÃ¶n tilaa.">
-<!ENTITY torbutton.prefs.disable_plugins "Poista lisÃ¤osat toiminnasta Torin ollessa kÃ¤ytÃ¶ssÃ¤ (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.kill_bad_js "EstÃ¤ javascript (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.isolate_content "EristÃ¤ dynaaminen sisÃ¤ltÃ¶ Tor tilaan (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.no_updates "EstÃ¤ pÃ¤ivitykset Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
-<!ENTITY torbutton.prefs.set_uagent "Aseta ohjelma Tor kÃ¤yttÃ¶Ã¤ varten (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.dynamic "Dynaaminen SisÃ¤ltÃ¶">
-<!ENTITY torbutton.prefs.cookies "EvÃ¤steet">
-<!ENTITY torbutton.prefs.cache "VÃ¤limuisti">
-<!ENTITY torbutton.prefs.history "Selaushistoria">
-<!ENTITY torbutton.prefs.no_search "EstÃ¤ selaimen hakuvinkit Tor tilassa (suositeltavaa)">
-<!ENTITY torbutton.prefs.shutdown "Sammuta">
-<!ENTITY torbutton.prefs.tor_shutdown "Poista Tor evÃ¤steet kun selain suljetaan Tor tilassa ">
-<!ENTITY torbutton.prefs.all_shutdown "Poista evÃ¤steet kun selain suljetaan olipa selain missÃ¤ tilassa tahansa.">
-<!ENTITY torbutton.prefs.no_shutdown "Ã„lÃ¤ poista evÃ¤steitÃ¤ lopettaessa">
-<!ENTITY torbutton.prefs.disable_sessionstore "EstÃ¤ istunnon (Session) tallennus (suositeltavaa)">
-<!ENTITY torbutton.prefs.headers "Tunnistetiedot">
-<!ENTITY torbutton.prefs.refererspoofing "Referer-tunnisteen vÃ¤Ã¤rentÃ¤minen">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "VÃ¤Ã¤rennÃ¤ referer-tunniste Ã¤lykkÃ¤Ã¤sti, kun Tor on kÃ¤ytÃ¶ssÃ¤ (lÃ¤hettÃ¤Ã¤ vÃ¤Ã¤rennetyn tunnisteen)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Poista DOM-sÃ¤ilytys kÃ¤ytÃ¶stÃ¤ kun Tor on kÃ¤ynnissÃ¤ (kriittinen)">
-<!ENTITY torbutton.prefs.forms "Lomakkeet">
-<!ENTITY torbutton.prefs.block_tforms "EstÃ¤ salasana+lomake tallennus Tor kÃ¤ytÃ¶n aikana (suositeltu)">
-<!ENTITY torbutton.prefs.block_ntforms "EstÃ¤ salasana+lomake tallennus kun Tor ei ole kÃ¤ytÃ¶ssÃ¤ (valinnainen)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ei-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Palautettaessa kaatunutta istuntoa, aseta Tor tilaksi:">
-<!ENTITY torbutton.prefs.startup_tor "Kun selain kÃ¤ynnistyy, aseta Torin tilaksi:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Lataa ja poista evÃ¤steet kun FF kaatuu (suositeltava)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tallenna sekÃ¤ Tor ettÃ¤ Ei-Tor evÃ¤steet suojattuun hakemistoon(vaarallista)">
-<!ENTITY torbutton.prefs.clear_http_auth "Poista HTTP tunnistetut istunnot (suositeltava)">
-<!ENTITY torbutton.prefs.block_js_history "EristÃ¤ pÃ¤Ã¤sy historia selailuun Tor tilassa (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Muuta ikkunoiden kokoa 50px vÃ¤lein Tor kÃ¤ytÃ¶n aikana (suositeltavaa)">
-<!ENTITY torbutton.prefs.close_tor "Sulje kaikki Tor ikkunat ja vÃ¤lilehdet kun Tor poistetaan kÃ¤ytÃ¶stÃ¤ (valinnainen)">
-<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki Ei-Tor ikkunat ja vÃ¤lilehdet kun Tor tila vaihdetaan (valinnainen)">
-<!ENTITY torbutton.prefs.block_links "EstÃ¤ linkki klikkaukset ja sivujen uudelleenlataukset eri Tor tilojen vÃ¤lillÃ¤ (suositeltavaa)">
-<!ENTITY torbutton.prefs.jar_certs "Talleta SSL sertifikaatit eri hakemistoihin Tor ja Ei-Tor tiloja varten (suositeltavaa) ">
-<!ENTITY torbutton.prefs.jar_ca_certs "Talleta CA sertifikaatit eri hakemistoihin Tor ja Ei-Tor tiloja varten (suositeltavaa)">
-<!ENTITY torbutton.prefs.locked_mode "EstÃ¤ Tor-button ja pikanÃ¤ppÃ¤imet vÃ¤lttÃ¤Ã¤ksesi Tor-tilan tahatonta vaihtamista">
-<!ENTITY torbutton.prefs.startup_state "Aseta Tor-tilaksi tavallisessa kÃ¤ynnistyksessÃ¤:">
-<!ENTITY torbutton.prefs.shutdown_state "Lopetustila">
-<!ENTITY torbutton.prefs.startup "KÃ¤ynnistys">
-<!ENTITY torbutton.prefs.block_tor_file_net "EstÃ¤ Tor- pÃ¤Ã¤sy nÃ¤ihin verkko-osoitteisiin file:// (suositellaan)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "EstÃ¤ pÃ¤Ã¤sy jos Tori ei ole pÃ¤Ã¤llÃ¤ nÃ¤ihin verkko-osoitteisiin ://">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset">
 <!ENTITY torbutton.prefs.test_settings "Testaa Asetukset">
-<!ENTITY torbutton.prefs.test_auto "Jokaisen Firefoxin kÃ¤ynnistyksen yhteydessÃ¤ testaa Tor-asetukset kun vaihdan Tor-tilaa ensimmÃ¤isen kerran ">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ã„lÃ¤ tallenna Tor-evÃ¤steitÃ¤ levylle">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ã„lÃ¤ tallenna Ei-Tor evÃ¤steitÃ¤ levylle">
-<!ENTITY torbutton.prefs.session_restore "Salli istunnon talletuksen tallettaa ja palauttaa seuraavat vÃ¤lilehdet:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ladatut Ei-Tor vÃ¤lilehdet ">
-<!ENTITY torbutton.prefs.tor_tabs "Ladatut Tor tilan vÃ¤lilehdet">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ei vÃ¤lityspalvelimia osoitteille:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Varoitus: VÃ¤ltÃ¤ yllÃ¤ olevia osoitteita">
-<!ENTITY torbutton.prefs.spoofreresh "VÃ¤Ã¤rennÃ¤ sivun pÃ¤ivitys">
-<!ENTITY torbutton.prefs.refereroptions "Referer-asetukset">
-<!ENTITY torbutton.prefs.nospoof "Ã„lÃ¤ vÃ¤Ã¤rennÃ¤ referer-tunnistetta">
-<!ENTITY torbutton.prefs.spoofroot "VÃ¤Ã¤rennÃ¤ referer-tunnisteeksi sivun kansion osoite">
-<!ENTITY torbutton.prefs.spoofdomain "VÃ¤Ã¤rennÃ¤ referer-tunnisteeksi verkkotunnus">
-<!ENTITY torbutton.prefs.spoofblank "VÃ¤Ã¤rennÃ¤ referer-tunniste tyhjÃ¤ksi">
 <!ENTITY torbutton.cookiedialog.title "Hallitse evÃ¤steiden suojauksia">
 <!ENTITY torbutton.cookiedialog.lockCol "Suojaus">
 <!ENTITY torbutton.cookiedialog.domainCol "Palvelin">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evÃ¤steet">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ã„lÃ¤ suojaa uusia evÃ¤steitÃ¤">
-<!ENTITY torbutton.prefs.disable_livemarks "EstÃ¤ vÃ¤lilehtipÃ¤ivitykset Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
-<!ENTITY torbutton.prefs.dtd_recommended "(suositeltu)">
-<!ENTITY torbutton.prefs.dtd_optional "(valinnainen)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kriittinen)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Uudelleenohjaa Torbutton pÃ¤ivitykset Tor:in kautta">
-<!ENTITY torbutton.prefs.dodge_google_captcha "KÃ¤ytÃ¤ automaattisesti vaihtoehtoista hakukonetta jos Google kysyy Captcha:a">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "KÃ¤ytÃ¤ Toria lÃ¤pinÃ¤kyvÃ¤sti (edellyttÃ¤Ã¤ mukautetun transproxyn tai Tor-reitittimen kÃ¤yttÃ¶Ã¤)">
 <!ENTITY torbutton.prefs.block_disk "Ã„lÃ¤ sÃ¤ilytÃ¤ selaushistoriaa tai verkkosivuston tietoa (kÃ¤ynnistÃ¤Ã¤ yksityisen selauksen)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "EstÃ¤ kolmannen osapuolen evÃ¤steet ja muut seurantatiedot">
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index ddc9137..b08a854 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PrÃ©fÃ©rences de Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ParamÃ¨tres du proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramÃ¨tres du proxy recommandÃ©s pour ma version de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Utiliser Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utiliser des paramÃ¨tres de proxy personnalisÃ©s">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP :">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher :">
 <!ENTITY torbutton.prefs.proxy.host.socks "HÃ´te SOCKS :">
 <!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.about.title "Ã€ propos de Torbutton">
-<!ENTITY torbutton.about.version "Version :">
-<!ENTITY torbutton.about.summary "ProtÃ¨ge l'anonymat de votre navigation avec Tor.">
-<!ENTITY torbutton.about.code "Contributeurs au code :">
-<!ENTITY torbutton.about.maintainer "Mainteneur :">
-<!ENTITY torbutton.about.security_review "Mise Ã  jour de sÃ©curitÃ© :">
-<!ENTITY torbutton.about.donate "Si vous aimez Tor, vous devriez considÃ©rer">
-<!ENTITY torbutton.about.make_donation "faire une donation.">
 <!ENTITY torbutton.pref_connection.notice "DÃ©sactiver Torbutton pour modifier ces paramÃ¨tres.">
 <!ENTITY torbutton.pref_connection.more_info "Plus d'informations">
 <!ENTITY torbutton.pref_connection_more_info.title "Aide">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Activer/DÃ©sactiver Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Ã€ propos de Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "ParamÃ¨tres du rÃ©seau Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "VÃ©rifier les mises Ã  jour du Navigateur Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copier l'URL Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ouvrir l'URL Tor dans un nouvel onglet">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ouvrir l'URL Tor dans une nouvelle fenÃªtre">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©">
-<!ENTITY torbutton.prefs.block_thread "Bloquer la lecture de l'historique pendant l'utilisation de Tor (indispensable)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquer l'Ã©criture Ã  historique pendant l'utilisation de Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquer la lecture de l'historique en mode non-Tor (facultatif)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquer l'Ã©criture Ã  l'historique en mode non-Tor (facultatif)">
-<!ENTITY torbutton.prefs.clear_history "Vider l'historique Ã  l'activation/dÃ©sactivation de Tor (facultatif)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquer la mÃ©moire tampon du disque Tor et vider tous les caches Ã  l'activation/dÃ©sactivation de Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquer la mÃ©moire tampon du disque et l'accÃ¨s Ã  la mÃ©moire tampon pendant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Conserver les cookies non-Tor dans une boite Ã  cookies sÃ©curisÃ©e">
-<!ENTITY torbutton.prefs.cookie_protection "Choisir parmi la boÃ®te de dialogue des Protections de cookies">
-<!ENTITY torbutton.prefs.mmm_cookies "Je gÃ©rerai mes cookies manuellement (dangereux)">
-<!ENTITY torbutton.prefs.clear_cookies "Supprimer les cookies Ã  l'activation/dÃ©sactivation de Tor">
-<!ENTITY torbutton.prefs.disable_plugins "DÃ©sactiver les plugins pendant l'utilisation de Tor (indispensable)">
-<!ENTITY torbutton.prefs.kill_bad_js "Intercepter les Ã©lÃ©ments javascript dangereux (indispensable)">
-<!ENTITY torbutton.prefs.isolate_content "Isoler les contenus dynamiques lorsque Tor fonctionne (indispensable)">
-<!ENTITY torbutton.prefs.no_updates "DÃ©sactiver les mises Ã  jours durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.set_uagent "AltÃ©rer la version de navigateur communiquÃ©e pendant l'utilisation de Tor (indispensable)">
-<!ENTITY torbutton.prefs.dynamic "Contenu dynamique">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Historique">
-<!ENTITY torbutton.prefs.no_search "DÃ©sactiver les suggestions de recherche pendant l'utilisation de Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.shutdown "ArrÃªt">
-<!ENTITY torbutton.prefs.tor_shutdown "Supprimer les cookies Tor Ã  l'arrÃªt du navigateur lorsque Tor est utilisÃ©">
-<!ENTITY torbutton.prefs.all_shutdown "Supprimer les cookies Ã  chaque fermeture du navigateur">
-<!ENTITY torbutton.prefs.no_shutdown "Ne pas supprimer mes cookies Ã  la fermeture">
-<!ENTITY torbutton.prefs.disable_sessionstore "DÃ©sactiver la fonction de sauvegarde de session (recommandÃ©)">
-<!ENTITY torbutton.prefs.headers "EntÃªtes">
-<!ENTITY torbutton.prefs.refererspoofing "AltÃ©ration d'adresse rÃ©fÃ©rente">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "AltÃ©ration intelligente de l'adresse rÃ©fÃ©rente lorsque Tor est actif (altÃ¨re les rÃ©ferences aux domaines externes)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "DÃ©sactiver le stockage DOM pendant l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.forms "Formulaires">
-<!ENTITY torbutton.prefs.block_tforms "Bloquer la sauvegarde de mot de passe+formulaire pendant l'utilisation de Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (facultatif)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Lors d'une restauration de session, mettre Tor en Ã©tat:">
-<!ENTITY torbutton.prefs.startup_tor "Au dÃ©marrage, mettre Tor dans l'Ã©tat :">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recharger la cookie jar et supprimer cookies lors d'un plantage de Firefox (recommandÃ©)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Stocker les cookies Tor et non-Tor dans des boites Ã  cookies sÃ©curisÃ©es (dangereux)">
-<!ENTITY torbutton.prefs.clear_http_auth "Supprimer les sessions HTTP authentifiÃ©es (recommandÃ©)">
-<!ENTITY torbutton.prefs.block_js_history "Isoler l'accÃ¨s Ã  l'historique de navigation lors de la navigation Tor (indispensable)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner la fenÃªtre sur un multiple de 50px lors de l'utilisation de Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenÃªtres et onglets Ã  l'activation/dÃ©sactivation (facultatif)">
-<!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenÃªtres et onglets Non-Tor Ã  l'activation/dÃ©sactivation (optionnel)">
-<!ENTITY torbutton.prefs.block_links "Bloquer les liens cliquables et le rechargement des pages dans les diffÃ©rents Ã©tats de Tor (facultatif)">
-<!ENTITY torbutton.prefs.jar_certs "Sauver les certificats SSL dans des jars sÃ©parÃ©s Tor/Non-Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Sauver les certificats CA dans des jars sÃ©parÃ©s Tor/Non-Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.locked_mode "DÃ©sactiver le bouton et les raccourcis pour Ã©viter un arrÃªt accidentel">
-<!ENTITY torbutton.prefs.startup_state "Au dÃ©marrage, mettre Tor dans l'Ã©tat:">
-<!ENTITY torbutton.prefs.shutdown_state "Ne pas lancer Tor">
-<!ENTITY torbutton.prefs.startup "DÃ©marrage">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloquer l'accÃ¨s Tor au rÃ©seau Ã  partir d'urls file:// (recommandÃ©)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquer l'accÃ¨s non-Tor au rÃ©seau Ã  partir d'urls file://">
 <!ENTITY torbutton.prefs.restore_defaults "Valeurs par dÃ©faut">
 <!ENTITY torbutton.prefs.test_settings "Tester les paramÃ¨tres">
-<!ENTITY torbutton.prefs.test_auto "Tester mes paramÃ¨tres Tor lors de la premiÃ¨re activation/dÃ©sactivation suivant chaque dÃ©marrage de Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne pas Ã©crire les cookies de Tor sur le disque">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne pas Ã©crire les cookies Non-Tor sur le disque">
-<!ENTITY torbutton.prefs.session_restore "Permettre Ã  la session de sauver et restaurer ces onglets:">
-<!ENTITY torbutton.prefs.nontor_tabs "Onglets chargÃ©s en mode Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Onglets chargÃ©s en mode Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Pas de Proxy pour: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Attention: Ã‰vitez d'utiliser les noms d'hÃ´tes ci-dessus">
-<!ENTITY torbutton.prefs.spoofreresh "Actualiser l'altÃ©ration">
-<!ENTITY torbutton.prefs.refereroptions "Options d'altÃ©ration de l'adresse rÃ©fÃ©rente">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "AltÃ©rer le dossier contenant la page">
-<!ENTITY torbutton.prefs.spoofdomain "Utiliser le domaine comme adresse rÃ©fÃ©rente">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ´te">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protÃ©gÃ©s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommandÃ©)">
-<!ENTITY torbutton.prefs.dtd_optional "(optionnel)">
-<!ENTITY torbutton.prefs.dtd_crucial "(essentiel)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Obtenir les mises Ã  jour de Torbutton via Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Utiliser automatiquement un autre moteur de recherche quand un captcha Google est prÃ©sent.">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "bing.com">
-<!ENTITY torbutton.prefs.engine3 "yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy spÃ©cialisÃ© ou un routeur Tor)">
 <!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de vie privÃ©e">
 <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites webs (active le Mode de Navigation PrivÃ©e)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut Ãªtre activÃ© selon le site via le bouton de barre d'outils NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Haut">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut sur tous les sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "La plupart des formats audio et vidÃ©o sont dÃ©sactivÃ©s.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM est le seul codec qui reste permis.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Certaines polices de caractÃ¨res et icÃ´nes peuvent Ãªtre affichÃ©es de faÃ§on incorrecte.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractÃ¨res fournis par des sites Web sont bloquÃ©s.">
 <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisÃ©es">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index cf56f33..6b251a9 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Axustes do proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Porto:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Axuda">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nova identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 46e01d1..92958cb 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "àªŸà«‹àª°àª¬àªŸàª¨ àªªà«àª°àª¾àª¥àª®àª¿àª•àª¤àª¾àª“">
 <!ENTITY torbutton.prefs.tor_settings "àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“">
 <!ENTITY torbutton.prefs.recommended_settings "àª®àª¾àª°à«€ àª«àª¾àª¯àª°àª«à«‹àª•à«àª¸ àª†àªµà«ƒàª¤à«àª¤àª¿ àª®àª¾àªŸà«‡ àª¸à«‚àªšàªµà«‡àª² àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“ àªµàª¾àªªàª°à«‹">
-<!ENTITY torbutton.prefs.use_privoxy "àªªà«àª°à«‹àª•à«àª¸à«€ àªµàª¾àªªàª°à«‹">
 <!ENTITY torbutton.prefs.use_polipo "àªªà«‹àª²àª¿àªªà«‹ àªµàª¾àªªàª°à«‹">
 <!ENTITY torbutton.prefs.custom_settings "àªªà«‹àª¤àª¾àª¨à«€ àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“ àªµàª¾àªªàª°à«‹">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP àªªà«àª°à«‹àª•à«àª¸à«€:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher àªªà«àª°à«‹àª•à«àª¸à«€:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS àª¯àªœàª®àª¾àª¨:">
 <!ENTITY torbutton.prefs.proxy.port "àªªà«‹àª°à«àªŸ:">
-<!ENTITY torbutton.about.title "àªŸà«‹àª°àª¬àªŸàª¨ àªµàª¿àª¶à«‡">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "àª† àª—à«‹àª àªµàª£à«€àª“ àª¬àª¦àª²àªµàª¾ àª®àª¾àªŸà«‡ àªŸà«‹àª°àª¬àªŸàª¨ àª¨àª¿àª·à«àª•à«àª°àª¿àª¯ àª•àª°à«‹.">
 <!ENTITY torbutton.pref_connection.more_info "àªµàª§à« àª®àª¾àª¹àª¿àª¤à«€">
 <!ENTITY torbutton.pref_connection_more_info.title "àª®àª¦àª¦">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "àªŸà«‹àª° àª¸à«àª¥àª¿àª¤àª¿ àª¬àª¦àª²à«‹">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "àªªà«àª°àª¾àª¥àª®àª¿àª•àª¤àª¾àª“...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "àªŸà«‹àª°àª¬àªŸàª¨ àªµàª¿àª¶à«‡...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "àªŸà«‹àª°àª¬àªŸàª¨">
 <!ENTITY torbutton.button.tooltip "àªŸà«‹àª°àª¬àªŸàª¨ àª¶àª°à« àª•àª°àªµàª¾ àª•à«àª²àª¿àª• àª•àª°à«‹">
-<!ENTITY torbutton.prefs.sec_settings "àª¸àª²àª¾àª®àª¤à«€ àª—à«‹àª àªµàª£à«€àª“">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "àª¬àª¦àª²àª¾àª¤à«€ àªµàª¿àª—àª¤à«‹">
-<!ENTITY torbutton.prefs.cookies "àª•à«‚àª•à«€àª“">
-<!ENTITY torbutton.prefs.cache "àª•à«…àª¶">
-<!ENTITY torbutton.prefs.history "àªˆàª¤àª¿àª¹àª¾àª¸">
-<!ENTITY torbutton.prefs.no_search "àªŸà«‹àª° àªµàª–àª¤à«‡ àª¶à«‹àª§ àª¸à«‚àªšàª¨à«‹ àª¨àª¿àª·à«àª•à«àª°àª¿àª¯ àª•àª°à«‹ (àª¸à«‚àªšàªµà«‡àª²)">
-<!ENTITY torbutton.prefs.shutdown "àª¬àª‚àª§ àª•àª°à«‹">
-<!ENTITY torbutton.prefs.tor_shutdown "àªŸà«‹àª°-àª¸àª•à«àª°àª¿àª¯ àª¬à«àª°àª¾àª‰àªàª° àª¬àª‚àª§ àª•àª°àª¤à«€ àªµàª–àª¤à«‡ àª•à«‚àª•à«€àª“ àª¸àª¾àª« àª•àª°à«‹">
-<!ENTITY torbutton.prefs.all_shutdown "àª•à«‹àªˆ àªªàª£ àª¬à«àª°àª¾àª‰àªàª° àª¬àª‚àª§ àª•àª°àª¤à«€ àªµàª–àª¤à«‡ àª•à«‚àª•à«€àª“ àª¸àª¾àª« àª•àª°à«‹">
-<!ENTITY torbutton.prefs.no_shutdown "àª¬àª‚àª§ àª•àª°àª¤à«€ àªµàª–àª¤à«‡ àª®àª¾àª°à«€ àª•à«‚àª•à«€àª“ àª¸àª¾àª« àª¨ àª•àª°à«‹">
-<!ENTITY torbutton.prefs.disable_sessionstore "àª¸àª¤à«àª°àª¨à«‡ àª¸àª‚àª—à«àª°àª¹ àª•àª°àªµàª¾àª¨à«àª‚ àª¨àª¿àª·à«àª•à«àª°àª¿àª¯ àª•àª°à«‹ (àª¸à«‚àªšàªµà«‡àª²)">
-<!ENTITY torbutton.prefs.headers "àª¶à«€àª°à«àª·àª•à«‹">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "àªŸà«‹àª° àªµàªªàª°àª¾àª¶ àªµàª–àª¤à«‡ DOM àª¸àª‚àª—à«àª°àª¹ àª¨àª¿àª·à«àª•à«àª°àª¿àª¯ àª•àª°à«‹ (àªœàª°à«àª°à«€)">
-<!ENTITY torbutton.prefs.forms "àª«à«‹àª°à«àª®à«àª¸">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "àªŸà«‹àª°">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "àª¸àª¾àª®àª¾àª¨à«àª¯ àª¶àª°à«‚àª†àª¤ àªµàª–àª¤à«‡, àªŸà«‹àª° àª¸à«àª¥àª¿àª¤àª¿ àª† àªªàª° àª—à«‹àª àªµà«‹:">
-<!ENTITY torbutton.prefs.shutdown_state "àª¬àª‚àª§ àª•àª°àªµàª¾àª¨à«€ àª¸à«àª¥àª¿àª¤àª¿">
-<!ENTITY torbutton.prefs.startup "àª¶àª°à«àª†àª¤">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "àª®à«‚àª³àªà«‚àª¤ àªªàª¾àª›à«àª‚ àª²àª¾àªµà«‹">
 <!ENTITY torbutton.prefs.test_settings "àªšàª•àª¾àª¸àª£à«€ àª—à«‹àª àªµàª£à«€àª“">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "àª† àª®àª¾àªŸà«‡ àªªà«àª°à«‹àª•à«àª¸à«€ àª¨àª¹à«€:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(àª¸à«‚àªšàªµà«‡àª²)">
-<!ENTITY torbutton.prefs.dtd_optional "(àªµà«ˆàª•àª²à«àªªàª¿àª•)">
-<!ENTITY torbutton.prefs.dtd_crucial "(àªœàª°à«‚àª°à«€)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 12523f3..1255385 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "×”×’×“×¨×•×ª Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "×”×’×“×¨×•×ª ×¤×¨×•×§×¡×™">
 <!ENTITY torbutton.prefs.recommended_settings '×”×©×ª×ž×© ×‘×”×’×“×¨×•×ª ×¤×¨×•×§×¡×™ ×ž×•×ž×œ×¦×•×ª ×¢×‘×•×¨ ×’×¨×¡×ª ×”"×¤×™×™×¨×¤×•×§×¡" ×©×œ×™'>
-<!ENTITY torbutton.prefs.use_privoxy "×”×©×ª×ž×© ×‘×¤×¨×™×‘×•×§×¡×™">
 <!ENTITY torbutton.prefs.use_polipo "×”×©×ª×ž×© ×‘×¤×•×œ×™×¤×•">
 <!ENTITY torbutton.prefs.custom_settings "×”×©×ª×ž×© ×‘×”×’×“×¨×•×ª ×¤×¨×•×§×¡×™ ×ž×•×’×“×¨×•×ª ×ž×¨××©">
 <!ENTITY torbutton.prefs.proxy.host.http "×¤×¨×•×§×¡×™ HTTP:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "×ž××¨×— SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "×¤×•×¨×˜:">
-<!ENTITY torbutton.about.title "××•×“×•×ª Torbutton">
-<!ENTITY torbutton.about.version "×’×¨×¡×”:">
-<!ENTITY torbutton.about.summary "×ž×’×Ÿ ×¢×œ ×”×¤×¨×˜×™×•×ª ×©×œ ×’×œ×™×©×ª ×”-Tor ×©×œ×š">
-<!ENTITY torbutton.about.code "×”×©×ª×ª×£ ×‘×›×ª×™×‘×ª ×§×•×“:">
-<!ENTITY torbutton.about.maintainer "×ž×ª×—×–×§:">
-<!ENTITY torbutton.about.security_review "×¡×™×§×•×¨ ××‘×˜×—×”">
-<!ENTITY torbutton.about.donate "×× ××ª×” ××•×”×‘ ×œ×”×©×ª×ž×© ×‘Tor, ××•×œ×™ ×›×“××™ ×©×ª×©×§×•×œ">
-<!ENTITY torbutton.about.make_donation "×œ×ª×¨×•×">
 <!ENTITY torbutton.pref_connection.notice "×”×©×‘×ª ××ª Torbutton ×¢×œ ×ž× ×ª ×œ×©× ×•×ª ×”×’×“×¨×•×ª ××œ×•">
 <!ENTITY torbutton.pref_connection.more_info "×ž×™×“×¢ × ×•×¡×£">
 <!ENTITY torbutton.pref_connection_more_info.title "×¢×–×¨×”">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton ×¤×•×¢×œ ×›×¢×ª. ×× ×‘×¨×¦×•× ×š ×œ×©× ×•×ª ××ª ×”×’×“×¨×•×ª ×”×¤×¨×•×§×¡×™ ×©××™× × ×©×œ Tor, ×× × ×”×©×‘×ª ××ª Torbutton ×•×—×–×•×¨ ×”× ×”. ×× ×‘×¨×¦×•× ×š ×œ×©× ×•×ª ××ª ×”×’×“×¨×•×ª Tor, ×× × ×”×©×ª×ž×© ×‘×—×œ×•×Ÿ ×”×”×’×“×¨×•×ª ×©×œ Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "×–×”×•×ª ×—×“×©×”">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "×œ×”×—×œ×™×£ ×ž×¢×ž×“ ×˜×•×¨">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "×”×’×“×¨×•×ª">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "××•×“×•×ª Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "×”×’× ×•×ª ×§×•×§×™×–">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "×”×¢×ª×§ ××ª ×”-URL ×©×œ Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "×¤×ª×— ××ª ×”××ª×¨ ×©×œ Tor ×‘×›×¨×˜×™×¡×™×™×” ×—×“×©×”">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "×¤×ª×— ××ª ×”××ª×¨ ×©×œ Tor ×‘×—×œ×•×Ÿ ×—×“×©">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "×œ×—×¥ ×‘×›×“×™ ×œ××ª×—×œ ××ª Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "×”×’×“×¨×•×ª ××‘×˜×—×”">
-<!ENTITY torbutton.prefs.block_thread "×—×¡×•× ×§×¨×™××•×ª ×”×™×¡×˜×•×¨×™×” ×‘×ž×”×œ×š ×”×©×™×ž×•×© ×‘-Tor (×ž×›×¨×™×¢)">
-<!ENTITY torbutton.prefs.block_thwrite "×—×¡×•× ×›×ª×™×‘×•×ª ×‘×”×™×¡×˜×•×¨×™×” ×‘×–×ž×Ÿ ×”×¨×¦×ª Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.block_nthread "×—×¡×•× ×§×¨×™××ª ×”×™×¡×˜×•×¨×™×” ×‘×–×ž×Ÿ ×’×œ×™×©×” ×¨×’×™×œ×” (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.block_nthwrite "×—×¡×•× ×›×ª×™×‘×•×ª ×”×™×¡×˜×•×¨×™×” ×‘×–×ž×Ÿ ×’×œ×™×©×” ×¨×’×™×œ×” (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.clear_history "× ×§×” ×”×™×¡×˜×•×¨×™×” ×‘×˜×•×¨ Toggle (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.clear_cache "×—×¡×•× ××ª ×ž×˜×ž×•×Ÿ ×“×™×¡×§ Tor ×•×œ× ×§×•×ª ××ª ×›×œ ×”×ž×˜×ž×•×Ÿ Toggle Tor">
-<!ENTITY torbutton.prefs.block_cache "×—×¡×•× ×’×™×©×” ×œ×“×™×¡×§ ×•×œ×ž×˜×ž×•×Ÿ ×‘×–×ž×Ÿ ×©×™×ž×•×© ×‘-Tor">
-<!ENTITY torbutton.prefs.cookie_jars " ××—×¡×Ÿ ×§×•×§×™×– ×¨×’×™×œ×™× ×‘×”×’× ×”">
-<!ENTITY torbutton.prefs.cookie_protection "×‘×—×¨ ×‘×ª×¤×¨×™×˜ ×”×’× ×ª ×”×§×•×§×™×– ×¢×œ ×ž× ×ª ×œ×‘×—×•×¨">
-<!ENTITY torbutton.prefs.mmm_cookies "×× ×™ ×× ×”×œ ×™×“× ×™×ª ××ª ×”×§×•×§×™×– ×©×œ×™ (×ž×¡×•×›×Ÿ)">
-<!ENTITY torbutton.prefs.clear_cookies "× ×§×” ×¢×•×’×™×•×ª ×¢×œ Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "×”×©×‘×ª ×¤×œ××’×™× ×™× ×‘×–×ž×Ÿ ×©×™×ž×•×© ×‘-Tor (×ž×”×•×ª×™)">
-<!ENTITY torbutton.prefs.kill_bad_js "××ª×¨ ×¡×§×¨×™×¤×˜×™× ×ž×¡×•×›× ×™× (×ž×”×•×ª×™)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "×”×©×‘×ª ×¢×“×›×•× ×™× ×‘×–×ž×Ÿ ×©×™×ž×•×© ×‘-Tor">
-<!ENTITY torbutton.prefs.set_uagent "×”×’×“×¨×ª ×¡×•×›×Ÿ ×ž×©×ª×ž×© ×¢×‘×•×¨ ×©×™×ž×•×© Tor (×—×™×•× ×™)">
-<!ENTITY torbutton.prefs.dynamic "×ª×•×›×Ÿ ×“×™× ××ž×™">
-<!ENTITY torbutton.prefs.cookies "×§×•×§×™×–">
-<!ENTITY torbutton.prefs.cache "×ž×˜×ž×•×Ÿ">
-<!ENTITY torbutton.prefs.history "×”×™×¡×˜×•×¨×™×”">
-<!ENTITY torbutton.prefs.no_search "×”×©×‘×ª ×”×¦×¢×•×ª ×—×™×¤×•×© ×‘-Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.shutdown "×›×™×‘×•×™">
-<!ENTITY torbutton.prefs.tor_shutdown "×ž×—×§ ×§×•×§×™×– ×©×œ Tor ×‘×¡×’×™×¨×ª×•">
-<!ENTITY torbutton.prefs.all_shutdown "× ×§×” ×§×•×§×™×– ×‘×ž×”×œ×š ×¡×’×™×¨×” ×©×œ ×›×œ ×“×¤×“×¤×Ÿ">
-<!ENTITY torbutton.prefs.no_shutdown "××œ ×ª× ×§×” ××ª ×”×§×•×§×™×– ×©×œ×™ ×‘×–×ž×Ÿ ×¡×’×™×¨×ª ×”×“×¤×“×¤×Ÿ">
-<!ENTITY torbutton.prefs.disable_sessionstore "×‘×™×˜×•×œ ×©×ž×™×¨×ª ×ž×•×©×‘ (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.headers "×›×•×ª×¨×•×ª">
-<!ENTITY torbutton.prefs.refererspoofing "×–×™×•×£ Referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "×œ×–×™×™×£ referer ×—×›× ×‘×ž×”×œ×š ×©×™×ž×•×© ×˜×•×¨ (×ž×©×™×™×›×™ ×ž×–×™×™×£ ×¦×•×œ×‘ ×“×•×ž×™×™×Ÿ)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "×‘×˜×œ ××—×¡×•×Ÿ DOM ×‘×ž×”×œ×š ×©×™×ž×•×© ×‘Tor (×—×™×•× ×™)">
-<!ENTITY torbutton.prefs.forms "×˜×¤×¡×™×">
-<!ENTITY torbutton.prefs.block_tforms "×—×¡×•× ×©×ž×™×¨×” ×©×œ ×¡×™×¡×ž××•×ª ×•×˜×¤×¡×™× ×‘×ž×”×œ×š Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.block_ntforms "×—×¡×•× ×©×ž×™×¨×” ×©×œ ×¡×™×¡×ž××•×ª ×•×˜×¤×¡×™× ×‘×ž×”×œ×š ×©×™×ž×•×© ×©××™× ×• ×©×œ Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "×œ× ×©×œ Tor">
-<!ENTITY torbutton.prefs.restore_tor "×‘×”×¤×¢×œ×ª ×ž×¤×’×© ×ž×©×•×—×–×¨, ×§×‘×¢ ×ž×“×™× ×™×•×ª Tor:">
-<!ENTITY torbutton.prefs.startup_tor "×‘×”×¤×¢×œ×ª ×”×“×¤×“×¤×Ÿ, ×§×‘×¢ ××ª ×”×ž×¦×‘ ×©×œ Tor ×œ:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "×¨×¢× ×Ÿ ×¦× ×¦× ×ª ×¢×•×’×™×•×ª / ×¢×•×’×™×•×ª ×‘×¨×•×¨×•×ª ×¢×œ ×¤×™×™×¨×¤×•×§×¡ ×œ×§×¨×•×¡ (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "××—×¡×Ÿ ×©×ª×™ ×¢×•×’×™×•×ª Tor ×•Non- Tor ×‘×¦× ×¦× ×•×ª ×ž×•×’× ×•×ª (×ž×¡×•×›×Ÿ)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "×ž×‘×•×“×“ ××ª ×”×’×™×©×” ×œ× ×™×•×•×˜ ×œ×”×™×¡×˜×•×¨×™×ª ×ž×“×™× ×™×•×ª Tor (×—×™×•× ×™)">
-<!ENTITY torbutton.prefs.resize_on_toggle "×©×™× ×•×™ ×’×•×“×œ ×—×œ×•× ×•×ª ×œ×›×¤×•×œ×•×ª ×©×œ 50 ×¤×™×§×¡×œ×™× ×‘×ž×”×œ×š ×©×™×ž×•×© ×‘Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.close_tor "×¡×’×•×¨ ××ª ×›×œ ×”×—×œ×•× ×•×ª ×•×œ×©×•× ×™×•×ª Tor ×¢×œ Toggle (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.close_nontor "×¡×’×•×¨ ××ª ×›×œ ×”×—×œ×•× ×•×ª Non- Tor ×•×›×¨×˜×™×¡×™×•×ª Toggle (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.block_links "×—×¡×•× ×œ×—×™×¦×•×ª ×§×™×©×•×¨ ×•×©×—×–×•×¨ ×“×¤×™× ×ž×”×ž×“×™× ×•×ª ×©×•× ×•×ª Tor (××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.jar_certs "×—× ×•×ª SSL ×¡×•×›×¨×™×•×ª ×‘×¦× ×¦× ×•×ª × ×¤×¨×“×•×ª Tor / ×•Non- Tor (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "×”×©×‘×ª ×›×¤×ª×•×¨ ×•×ž×§×©×™ ×§×™×¦×•×¨ ×›×“×™ ×œ×ž× ×•×¢ Toggle ×ž×§×¨×™">
-<!ENTITY torbutton.prefs.startup_state "×‘×”×¤×¢×œ×” ×¨×’×™×œ×”, ×§×‘×¢ ×ž×“×™× ×™×•×ª Tor:">
-<!ENTITY torbutton.prefs.shutdown_state "×ž×¦×‘ ×›×™×‘×•×™">
-<!ENTITY torbutton.prefs.startup "×”×¤×¢×œ×”">
-<!ENTITY torbutton.prefs.block_tor_file_net "×—×¡×•× ×’×™×©×ª Tor ×œ×¨×©×ª ×ž×›×ª×•×‘×•×ª file:// (×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "×—×¡×•× ×’×™×©×” ×œ× ×©×œ Tor ×œ×¨×©×ª ×ž×›×ª×•×‘×•×ª file://">
 <!ENTITY torbutton.prefs.restore_defaults "×—×–×¨×” ×œ×‘×¨×™×¨×ª ×ž×—×“×œ">
 <!ENTITY torbutton.prefs.test_settings "×‘×—×Ÿ ×”×’×“×¨×•×ª">
-<!ENTITY torbutton.prefs.test_auto "×‘×“×•×§ ××ª ×”×’×“×¨×•×ª Tor ×©×œ×™ ××—×¨×™ ×”×¤×¢× ×”×¨××©×•× ×” ×©×× ×™ Toggle ×¢×œ ×›×œ ×”×ª×—×œ×” ×©×œ ×¤×™×™×¨×¤×•×§×¡">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "××œ ×ª×›×ª×•×‘ ×§×•×§×™×– ×©×œ Tor ×œ×“×™×¡×§ ×”×§×©×™×—">
-<!ENTITY torbutton.prefs.nontor_memory_jar "××œ ×ª×›×ª×•×‘ ×§×•×§×™×– ×œ× ×©×œ Tor ×œ×“×™×¡×§ ×”×§×©×™×—">
-<!ENTITY torbutton.prefs.session_restore "×©×ž×•×¨ ×•×©×—×–×¨ ××ª ×”×œ×©×•× ×™×•×ª ×”×‘××•×ª:">
-<!ENTITY torbutton.prefs.nontor_tabs "×›×¨×˜×™×¡×™×•×ª ×˜×¢×•× ×•×ª ×œ× ×‘-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "×›×¨×˜×™×¡×™×•×ª ×˜×¢×•× ×•×ª ×‘-Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "××™×Ÿ ×¤×¨×•×§×¡×™× ×¢×‘×•×¨:">
 <!ENTITY torbutton.prefs.no_proxy_warning "××–×”×¨×”: ×”×™×ž× ×¢ ×ž×©×™×ž×•×© ×‘×©×ž×•×ª ×ž××¨×—×™× ×œ×¢×™×œ">
-<!ENTITY torbutton.prefs.spoofreresh "×¨×¢× ×Ÿ ×–×™×•×£">
-<!ENTITY torbutton.prefs.refereroptions "××¤×©×¨×•×™×•×ª ×–×™×•×£ ×”×ž×¤× ×”">
-<!ENTITY torbutton.prefs.nospoof "×œ× ×œ×–×™×™×£ ×›×’×•×¨× ×ž×¤× ×”">
-<!ENTITY torbutton.prefs.spoofroot "×–×™×™×£ ××ª ×”×ª×™×§×™×™×” ×”×ž×›×™×œ×” ××ª ×”×“×¤×™×">
-<!ENTITY torbutton.prefs.spoofdomain "×–×™×™×£ ×”×ª×—×•× ×›×’×•×¨× ×ž×¤× ×”">
-<!ENTITY torbutton.prefs.spoofblank "×”×›×Ÿ ×ª×–×›×™×¨ ×¨×™×§">
 <!ENTITY torbutton.cookiedialog.title "× ×”×œ ×”×’× ×•×ª ×§×•×§×™×–">
 <!ENTITY torbutton.cookiedialog.lockCol "×ž×•×’×Ÿ">
 <!ENTITY torbutton.cookiedialog.domainCol "×ž××¨×—">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "×ž×—×§ ××ª ×›×œ ×”×§×•×§×™×– ×”×œ× ×ž×•×’× ×™×">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "×”×’×Ÿ ×¢×œ ×§×•×§×™×– ×—×“×©×™×">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "××œ ×ª×’×Ÿ ×¢×œ ×§×•×§×™×– ×—×“×©×™×">
-<!ENTITY torbutton.prefs.disable_livemarks "×‘×˜×œ ×¢×“×›×•× ×™ ×¡×™×ž×Ÿ ×—×™×™× ×‘×ž×”×œ×š ×©×™×ž×•×© ×‘Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(×ž×•×ž×œ×¥)">
-<!ENTITY torbutton.prefs.dtd_optional "(××•×¤×¦×™×•× ×œ×™)">
-<!ENTITY torbutton.prefs.dtd_crucial "(×ž×”×•×ª×™)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "×”×•×¨×“ ×¢×“×›×•× ×™× ×œ-Torbutton ×“×¨×š Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "×”×©×ª×ž×© ×‘××•×¤×Ÿ ××•×˜×•×ž×˜×™ ×‘×ž× ×•×¢ ×—×™×¤×•×© ×—×œ×•×¤×™ ×›××©×¨ ×ž×•×¦×’ ×¢× Captcha Google:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "×”×¤×¢×œ×ª ×˜×•×¨ ×‘×¦×•×¨×” ×‘×œ×ª×™ × ×¨××™×ª (×“×•×¨×©  transproxy ××• Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 5dc00ee..56f12ac 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤ªà¥à¤°à¤¿à¥žà¥à¤°à¤¨à¥à¤¸à¥‡à¤¸">
 <!ENTITY torbutton.prefs.tor_settings "à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¥€à¤‚à¤—">
 <!ENTITY torbutton.prefs.recommended_settings "à¤®à¥‡à¤°à¥‡ à¥žà¤¾à¤¯à¤° à¥žà¤¾à¤•à¥à¤¸ à¤•à¤¥à¤¨ à¤•à¥‡ à¤²à¤¿à¤¯à¥‡ à¤¸à¥à¤à¤¾à¤¯à¥€ à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡ ">
-<!ENTITY torbutton.prefs.use_privoxy "à¤ªà¥à¤°à¤¿à¤µà¥‹à¤•à¥à¤¸à¥€ à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "à¤µà¥à¤¯à¤µà¤¾à¤¹à¤¾à¤°à¤¿à¤• à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "à¤—à¥‹à¥žà¤° à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ ">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS à¤†à¤¤à¤¿à¤¥à¥‡à¤¯ :">
 <!ENTITY torbutton.prefs.proxy.port "à¤ªà¥‹à¤°à¥à¤Ÿ/à¤¦à¥à¤µà¤¾à¤° :">
-<!ENTITY torbutton.about.title "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‡ à¤¬à¤¾à¤°à¥‡ à¤®à¥‡">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "à¤‡à¤¨ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤•à¥‹ à¤¬à¤¦à¤²à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤¯à¥‡ à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‹ à¤…à¤¸à¤®à¤°à¥à¤¥ à¤•à¤°à¥‡ ">
 <!ENTITY torbutton.pref_connection.more_info "à¤…à¤§à¤¿à¤• à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€ à¤•à¥‡ à¤²à¤¿à¤ ">
 <!ENTITY torbutton.pref_connection_more_info.title "à¤¸à¤¹à¤¾à¤¯à¤¤à¤¾">
 <!ENTITY torbutton.pref_connection_more_info.text "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤…à¤à¥€ à¤¸à¤®à¤°à¥à¤¥à¤•à¥ƒà¤¤ à¤¹à¥ˆ à¥¤ à¤…à¤—à¤° à¤†à¤ª à¤†à¤ªà¤¨à¥‡ à¤…à¤¨à¥à¤¯ (à¤Ÿà¥‹à¤° à¤•à¥‡ à¤…à¤²à¤¾à¤µà¤¾) à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤•à¥‹ à¤¬à¤¦à¤²à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆ à¤¤à¥‹ à¤Ÿà¥‹à¤° à¤•à¥‹ à¤…à¤¸à¤®à¤°à¥à¤¥ à¤•à¤°à¤•à¥‡ à¤‡à¤§à¤° à¤ªà¥à¤°à¤¤à¤¿à¤—à¤®à¤¨ à¤•à¤°à¥‡ à¥¤ à¤…à¤—à¤° à¤†à¤ª à¤…à¤ªà¤¨à¥‡ à¤Ÿà¥‹à¤° à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤•à¥‹ à¤¬à¤¦à¤²à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆ à¤¤à¥‹ à¤•à¥ƒà¤ªà¤¿à¤¯à¤¾ à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‡ à¤ªà¥à¤°à¤¿à¥žà¤°à¥‡à¤¨à¥à¤¸ à¤–à¤¿à¥œà¤•à¥€ à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡ à¥¤">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T/à¤¤">
 <!ENTITY torbutton.context_menu.preferences "à¤ªà¥à¤°à¤¿à¥žà¤°à¥‡à¤¨à¥à¤¸à¤¸ ...">
 <!ENTITY torbutton.context_menu.preferences.key "P/à¤ª">
-<!ENTITY torbutton.context_menu.about "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‡ à¤¬à¤°à¥‡ à¤®à¥‡ ...">
-<!ENTITY torbutton.context_menu.about.key "A/à¤…">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A/à¤…">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P/à¤ª">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨">
 <!ENTITY torbutton.button.tooltip "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‹ à¤†à¤°à¤‚à¤à¤¿à¤¤ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤¯à¥‡ à¤•à¥à¤²à¤¿à¤• à¤•à¤°à¥‡">
-<!ENTITY torbutton.prefs.sec_settings "à¤¸à¥à¤°à¤•à¥à¤·à¤¾ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—">
-<!ENTITY torbutton.prefs.block_thread "à¤Ÿà¥‹à¤° à¤šà¤²à¤¤à¥‡ à¤¸à¤®à¤¯ à¤…à¤ªà¤¨à¥‡ à¤¬à¥à¤°à¤¾à¤‰à¤¸à¤° à¤•à¥‡ à¤‡à¤¤à¤¿à¤¹à¤¾à¤¸ à¤°à¥‡à¤•à¤¾à¤°à¥à¤¦ à¤•à¥‹ à¤¬à¤¨à¥à¤¦ à¤•à¤°à¥‡ (à¤…à¤¤à¤¿à¤¯à¤¨à¥à¤¤ à¤®à¤¹à¤¤à¥à¤µà¤ªà¥‚à¤°à¥à¤£)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "à¤Ÿà¥‹">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index bd37ad5..4e5df23 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton postavke">
 <!ENTITY torbutton.prefs.tor_settings "Proxy postavke">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene proxy postavke za moju inaÄicu Firefoxa">
-<!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ‘ene proxy postavke">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS domaÄ‡in:">
 <!ENTITY torbutton.prefs.proxy.port "PrikljuÄak:">
-<!ENTITY torbutton.about.title "O Torbuttonu">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "OnemoguÄ‡ite Torbutton da biste promijenili ove postavke.">
 <!ENTITY torbutton.pref_connection.more_info "ViÅ¡e informacija">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ‡">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ‡en. Ukoliko Å¾elite promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄ‡ite Torbutton i vratite se ovdje. Ukoliko Å¾elite promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Promijeni Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "P">
 <!ENTITY torbutton.context_menu.preferences "Postavke...">
 <!ENTITY torbutton.context_menu.preferences.key "p">
-<!ENTITY torbutton.context_menu.about "O Torbuttonu...">
-<!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tite kolaÄiÄ‡a">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Z">
-<!ENTITY torbutton.context_menu.copyTor "Kopiraj Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "k">
-<!ENTITY torbutton.context_menu.openTorTab "Otvori Tor URL u novoj kartici">
-<!ENTITY torbutton.context_menu.openTorTab.key "k">
-<!ENTITY torbutton.context_menu.openTorWindow "Otvori Tor URL u novom prozoru">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona">
-<!ENTITY torbutton.prefs.sec_settings "Sigurnosne postavke">
-<!ENTITY torbutton.prefs.block_thread "Zabrani Äitanje povijesti kad je Tor omoguÄ‡en (kljuÄno)">
-<!ENTITY torbutton.prefs.block_thwrite "Zabrani zapisivanje povijesti kad je Tor omoguÄ‡en (preporuÄeno)">
-<!ENTITY torbutton.prefs.block_nthread "Zabrani Äitanje povijesti kad Tor nije omoguÄ‡en (opcionalno)">
-<!ENTITY torbutton.prefs.block_nthwrite "Zabrani zapisivanje povijesti kad Tor nije omoguÄ‡en (opcionalno)">
-<!ENTITY torbutton.prefs.clear_history "ObriÅ¡i povijest kod promjene Tor statusa (opcionalno)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 6979247..34d59a9 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton beÃ¡llÃtÃ¡sok">
 <!ENTITY torbutton.prefs.tor_settings "Proxy beÃ¡llÃtÃ¡sok">
 <!ENTITY torbutton.prefs.recommended_settings "Az ajÃ¡nlott proxy beÃ¡llÃtÃ¡sok hasznÃ¡lata a Firefox verziÃ³mhoz">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy hasznÃ¡lata">
 <!ENTITY torbutton.prefs.use_polipo "Polipo hasznÃ¡lata">
 <!ENTITY torbutton.prefs.custom_settings "EgyÃ©ni proxy beÃ¡llÃtÃ¡sok hasznÃ¡lata">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ã¡llomÃ¡snÃ©v:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "A Torbutton nÃ©vjegye">
-<!ENTITY torbutton.about.version "VerziÃ³:">
-<!ENTITY torbutton.about.summary "VÃ©di a szemÃ©lyes adatokat a Tor bÃ¶ngÃ©szÃ©s sorÃ¡n.">
-<!ENTITY torbutton.about.code "ProgramkÃ³d hozzÃ¡jÃ¡rulÃ³k:">
-<!ENTITY torbutton.about.maintainer "KarbantartÃ³:">
-<!ENTITY torbutton.about.security_review "BiztonsÃ¡gi Ã¡ttekintÃ©s:">
-<!ENTITY torbutton.about.donate "Ha tetszik a Tor hasznÃ¡lata, talÃ¡n megfontolja,">
-<!ENTITY torbutton.about.make_donation "hogy adomÃ¡nyozzon.">
 <!ENTITY torbutton.pref_connection.notice "Tiltsa le a Torbutton-t ezen beÃ¡llÃtÃ¡sok megvÃ¡ltoztatÃ¡sÃ¡hoz">
 <!ENTITY torbutton.pref_connection.more_info "TovÃ¡bbi informÃ¡ciÃ³k">
 <!ENTITY torbutton.pref_connection_more_info.title "SÃºgÃ³">
 <!ENTITY torbutton.pref_connection_more_info.text "A Torbutton jelenleg engedÃ©lyezett. Ha szeretnÃ© megvÃ¡ltoztatni a Tor nÃ©lkÃ¼li proxy beÃ¡llÃtÃ¡sokat, kapcsolja ki Torbutton-t Ã©s tÃ©rjen vissza ide. Ha szeretnÃ© megvÃ¡ltoztatni a Tor beÃ¡llÃtÃ¡sait, hasznÃ¡lja inkÃ¡bb a Torbutton BeÃ¡llÃtÃ¡sok ablakÃ¡t.">
 <!ENTITY torbutton.context_menu.new_identity "Ãšj szemÃ©lyazonossÃ¡g">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.toggle "Tor Ã¡llapot vÃ¡ltÃ¡sa">
-<!ENTITY torbutton.context_menu.toggle.key "V">
 <!ENTITY torbutton.context_menu.preferences "BeÃ¡llÃtÃ¡sok...">
 <!ENTITY torbutton.context_menu.preferences.key "B">
-<!ENTITY torbutton.context_menu.about "A Torbutton nÃ©vjegye...">
-<!ENTITY torbutton.context_menu.about.key "N">
 <!ENTITY torbutton.context_menu.networksettings "HÃ¡lÃ³zati beÃ¡llÃtÃ¡sok megnyitÃ¡sa">
 <!ENTITY torbutton.context_menu.networksettings.key "M">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor BÃ¶ngÃ©szÅ‘ csomag frissÃtÃ©sÃ©nek letÃ¶ltÃ©se">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SÃ¼ti vÃ©delem">
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
-<!ENTITY torbutton.context_menu.copyTor "Tor URL mÃ¡solÃ¡sa">
-<!ENTITY torbutton.context_menu.copyTor.key "M">
-<!ENTITY torbutton.context_menu.openTorTab "Tor URL megnyitÃ¡sa Ãºj fÃ¼lÃ¶n">
-<!ENTITY torbutton.context_menu.openTorTab.key "f">
-<!ENTITY torbutton.context_menu.openTorWindow "Tor URL megnyitÃ¡sa Ãºj ablakban">
-<!ENTITY torbutton.context_menu.openTorWindow.key "a">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz">
-<!ENTITY torbutton.prefs.sec_settings "BiztonsÃ¡gi beÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.block_thread "Az elÅ‘zmÃ©nyek olvasÃ¡sÃ¡nak tiltÃ¡sa a Tor hasznÃ¡lat sorÃ¡n (kritikus)">
-<!ENTITY torbutton.prefs.block_thwrite "Az elÅ‘zmÃ©nyek rÃ¶gzÃtÃ©sÃ©nek tiltÃ¡sa a Tor hasznÃ¡lat sorÃ¡n (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.block_nthread "Az elÅ‘zmÃ©nyek olvasÃ¡sÃ¡nak tiltÃ¡sa a Tor nÃ©lkÃ¼li hasznÃ¡lat sorÃ¡n (opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.block_nthwrite "Az elÅ‘zmÃ©nyek rÃ¶gzÃtÃ©sÃ©nek tiltÃ¡sa a Tor nÃ©lkÃ¼li hasznÃ¡lat sorÃ¡n (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.clear_history "Az elÅ‘zmÃ©nyek tÃ¶rlÃ©se a Tor Ã¡llapot vÃ¡ltÃ¡sakor (opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.clear_cache "Blokkolja a Tor lemez gyorsÃtÃ³tÃ¡rat, Ã©s tÃ¶rÃ¶lje az Ã¶sszes gyorsÃtÃ³tÃ¡rat a Tor Ã¡llapotvÃ¡ltÃ¡sakor">
-<!ENTITY torbutton.prefs.block_cache "Blokkolja a lemez Ã©s memÃ³ria gyorsÃtÃ³tÃ¡r hozzÃ¡fÃ©rÃ©st a Tor kapcsolat alatt">
-<!ENTITY torbutton.prefs.cookie_jars "TÃ¡rolja a Tor-nÃ©lkÃ¼li kapcsolat sÃ¼tijeit egy vÃ©dett sÃ¼tisdobozban">
-<!ENTITY torbutton.prefs.cookie_protection "HasznÃ¡lja a SÃ¼ti vÃ©delem ablakot a kivÃ¡lasztÃ¡shoz">
-<!ENTITY torbutton.prefs.mmm_cookies "KÃ©zzel kezelem a sÃ¼tijeimet (veszÃ©lyes)">
-<!ENTITY torbutton.prefs.clear_cookies "SÃ¼tik tÃ¶rlÃ©se a Tor be-kikapcsolÃ¡sakor">
-<!ENTITY torbutton.prefs.disable_plugins "A kiegÃ©szÃtÅ‘k letiltÃ¡sa a Tor hasznÃ¡lat sorÃ¡n (kritikus)">
-<!ENTITY torbutton.prefs.kill_bad_js "VeszÃ©lyes javascript megfogÃ¡sa (kritikus)">
-<!ENTITY torbutton.prefs.isolate_content "Dinamikus tartalom izolÃ¡lÃ¡sa a Tor Ã¡llapothoz (kritikus)">
-<!ENTITY torbutton.prefs.no_updates "FrissÃtÃ©sek tiltÃ¡sa a Tor hasznÃ¡lat alatt">
-<!ENTITY torbutton.prefs.set_uagent "BÃ¶ngÃ©szÅ‘ azonosÃtÃ¡s beÃ¡llÃtÃ¡sa Tor hasznÃ¡lat alatt (kritikus)">
-<!ENTITY torbutton.prefs.dynamic "Dinamikus tartalom">
-<!ENTITY torbutton.prefs.cookies "SÃ¼tik">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "ElÅ‘zmÃ©nyek">
-<!ENTITY torbutton.prefs.no_search "KeresÃ©si javaslatok tiltÃ¡sa Tor kapcsolat alatt (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.shutdown "LeÃ¡llÃtÃ¡s">
-<!ENTITY torbutton.prefs.tor_shutdown "A Tor sÃ¼tik tÃ¶rlÃ©se a Tor-kÃ©pes bÃ¶ngÃ©szÅ‘bÅ‘l kilÃ©pÃ©skor">
-<!ENTITY torbutton.prefs.all_shutdown "TÃ¶rÃ¶lje a sÃ¼tiket bÃ¡rmilyen bÃ¶ngÃ©szÅ‘ kilÃ©pÃ©skor">
-<!ENTITY torbutton.prefs.no_shutdown "KilÃ©pÃ©skor ne tÃ¶rÃ¶lje a sÃ¼tijeimet">
-<!ENTITY torbutton.prefs.disable_sessionstore "Munkafolyamat mentÃ©sÃ©nek tiltÃ¡sa (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.headers "FejlÃ©cek">
-<!ENTITY torbutton.prefs.refererspoofing "HivatkozÃ³ oldal hamisÃtÃ¡s">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Intelligens hivatkozÃ³ oldal hazudÃ¡s a Tor hasznÃ¡lat alatt (kereszt domain hivatkozÃ¡st hazudik)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "DOM tÃ¡rolÃ¡s tiltsa a Tor hasznÃ¡lat alatt (kritikus)">
-<!ENTITY torbutton.prefs.forms "Å°rlapok">
-<!ENTITY torbutton.prefs.block_tforms "A jelszavak Ã©s Å±rlapok mentÃ©sÃ©nek tiltÃ¡sa Tor kapcsolat sorÃ¡n (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.block_ntforms "A jelszavak Ã©s Å±rlapok mentÃ©sÃ©nek tiltÃ¡sa Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n (opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Tor-nÃ©lkÃ¼li">
-<!ENTITY torbutton.prefs.restore_tor "Munkamenet helyreÃ¡llÃtÃ¡sa sorÃ¡n a kÃ¶vetkezÅ‘ Tor Ã¡llapot beÃ¡llÃtÃ¡sa:">
-<!ENTITY torbutton.prefs.startup_tor "A bÃ¶ngÃ©szÅ‘ indÃtÃ¡sakor Ã¡llÃtsa be a kÃ¶vetkezÅ‘ Tor Ã¡llapotot:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "A SÃ¼tisdoboz ÃºjratÃ¶ltÃ©se/sÃ¼tik tÃ¶rlÃ©se a Firefox Ã¶sszeomlÃ¡sakor (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "A Tor kapcsolat Ã©s a Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n beszerzett sÃ¼tik vÃ©dett dobozokban tÃ¡rolÃ¡sa (veszÃ©lyes)">
-<!ENTITY torbutton.prefs.clear_http_auth "A HTTP auth session-Ã¶k tÃ¶rlÃ©se (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.block_js_history "Az ElÅ‘zmÃ©nyekben navigÃ¡lÃ¡s elvÃ¡lasztÃ¡sa a kÃ¼lÃ¶nbÃ¶zÅ‘ Tor Ã¡llapotokban (kritikus)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ablakok Ã¡tmÃ©retezÃ©se az 50px tÃ¶bbszÃ¶rÃ¶sÃ©re a a Tor hasznÃ¡lat alatt (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.close_tor "VÃ¡ltÃ¡skor az Ã¶sszes Tor kapcsolattal rendelkezÅ‘ ablak Ã©s fÃ¼l bezÃ¡rÃ¡sa (opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.close_nontor "VÃ¡ltÃ¡skor az Ã¶sszes Tor nÃ©lkÃ¼li kapcsolattal rendelkezÅ‘ ablak Ã©s fÃ¼l bezÃ¡rÃ¡sa (opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.block_links "A kÃ¼lÃ¶nbÃ¶zÅ‘ Tor Ã¡llapotok kÃ¶zti oldalletÃ¶ltÃ©s Ã©s link kattintÃ¡s tiltÃ¡sa (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.jar_certs "Az SSL tanÃºsÃtvÃ¡nyok kÃ¼lÃ¶n dobozban tÃ¡rolÃ¡sa a Tor kapcsolat Ã©s a Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.jar_ca_certs "A hitelesÃtÃ©s szolgÃ¡ltatÃ³ tanÃºsÃtvÃ¡nyok tanÃºsÃtvÃ¡nyok kÃ¼lÃ¶n dobozban tÃ¡rolÃ¡sa a Tor kapcsolat Ã©s a Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.locked_mode "A gombok Ã©s gyorsbillentyÅ±k tiltÃ¡sa a vÃ©letlen Ã¡llapotvÃ¡ltÃ¡s megakadÃ¡lyozÃ¡sÃ¡hoz">
-<!ENTITY torbutton.prefs.startup_state "NormÃ¡l indÃtÃ¡s esetÃ©n Ã¡llÃtsa be a kÃ¶vetkezÅ‘ Tor Ã¡llapotot:">
-<!ENTITY torbutton.prefs.shutdown_state "LeÃ¡llÃ¡si Ã¡llapot">
-<!ENTITY torbutton.prefs.startup "IndulÃ¡s">
-<!ENTITY torbutton.prefs.block_tor_file_net "Tiltsa a Tor kapcsolat sorÃ¡n a hozzÃ¡fÃ©rÃ©st a hÃ¡lÃ³zatrÃ³l a file:// cÃmekrÅ‘l (ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Tiltsa a Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n a hozzÃ¡fÃ©rÃ©st a hÃ¡lÃ³zatrÃ³l a file:// cÃmekrÅ‘l ">
 <!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa">
 <!ENTITY torbutton.prefs.test_settings "BeÃ¡llÃtÃ¡sok tesztelÃ©se">
-<!ENTITY torbutton.prefs.test_auto "Teszteltje a Tor-beÃ¡llÃtÃ¡sokat, minden Firefox indulÃ¡st kÃ¶vetÅ‘ elsÅ‘ Tor Ã¡llapot vÃ¡ltÃ¡skor">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne Ãrja a lemezre a sÃ¼tiket a Tor kapcsolat sorÃ¡n">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne Ãrja a lemezre a sÃ¼tiket a Tor nÃ©lkÃ¼li kapcsolat sorÃ¡n">
-<!ENTITY torbutton.prefs.session_restore "A munkamenet tÃ¡rolÃ³k mentsÃ©k Ã©s Ã¡llÃtsÃ¡k helyre ezeket a fÃ¼leket:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tor nÃ©lkÃ¼l betÃ¶ltÃ¶tt fÃ¼lek">
-<!ENTITY torbutton.prefs.tor_tabs "Tor-on keresztÃ¼l betÃ¶ltÃ¶tt fÃ¼lek">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nincs proxy ehhez:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Figyelem: Ne hasznÃ¡lja a lentebb lÃ¡thatÃ³ hostneveket">
-<!ENTITY torbutton.prefs.spoofreresh "HamisÃtÃ¡s frissÃtÃ©s">
-<!ENTITY torbutton.prefs.refereroptions "HivatkozÃ³ oldal hamisÃtÃ¡si beÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.nospoof "Ne hamisÃtsa a hivatkozÃ³ oldalt">
-<!ENTITY torbutton.prefs.spoofroot "HamisÃtsa a weboldal oldalt tartalmazÃ³ kÃ¶nyvtÃ¡rÃ¡t">
-<!ENTITY torbutton.prefs.spoofdomain "A domain megadÃ¡sa hivatkozÃ³ oldalnak">
-<!ENTITY torbutton.prefs.spoofblank "A hivatkozÃ³ oldal legyen Ã¼res">
 <!ENTITY torbutton.cookiedialog.title "SÃ¼ti vÃ©delem kezelÃ©se">
 <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett">
 <!ENTITY torbutton.cookiedialog.domainCol "ÃllomÃ¡s">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "A vÃ©dett kivÃ©telÃ©vel az Ã¶sszes tÃ¶rlÃ©se">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃ¼tiket">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃ¼tiket">
-<!ENTITY torbutton.prefs.disable_livemarks "A Livemark frissÃtÃ©sek tiltÃ¡sa Tor kapcsolat alatt">
-<!ENTITY torbutton.prefs.dtd_recommended "(ajÃ¡nlott)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcionÃ¡lis)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kritikus)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "A Torbutton frissÃtÃ©sek Tor-on keresztÃ¼li Ã¡tirÃ¡nyÃtÃ¡sa">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatikusan hasznÃ¡ljon egy mÃ¡sik keresÅ‘motort, ha Google Captcha-val talÃ¡lkozik:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "ÃtlÃ¡tszÃ³ Tor-osÃtÃ¡s (Egyedi transproxy-t vagy Tor routert igÃ©nyel)">
 <!ENTITY torbutton.prefs.block_disk "Ne rÃ¶gzÃtsen bÃ¶ngÃ©szÅ‘ elÅ‘zmÃ©nyeket, vagy weboldal adatot (engedÃ©lyezi a PrivÃ¡t bÃ¶ngÃ©szÅ‘ mÃ³dot)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅ‘l szÃ¡rmazÃ³ sÃ¼tik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa">
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 7a73427..9153999 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferensi Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Pengaturan proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proxy yang disarankan untuk versi Firefox saya">
-<!ENTITY torbutton.prefs.use_privoxy "Gunakan Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Gunakan Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Gunakan pengaturan proxy yang disesuaikan">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Tentang Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Nonaktifkan Torbutton mengubah pengaturan ini.">
 <!ENTITY torbutton.pref_connection.more_info "Informasi lebih lanjut">
 <!ENTITY torbutton.pref_connection_more_info.title "Bantuan">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton sedang aktif.  Apabila Anda ingin mengubah pengaturan proxy selain proxy Tor, Silahkan nonaktifkan Torbutton dan kembali ke sini.  Apabila Anda ingin mengubah pengaturan Tor, silahkan gunakan jendela preferensi Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Alihkan Status Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferensi...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Tentang Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Pengaturan Keamanan">
-<!ENTITY torbutton.prefs.block_thread "Blokir pembacaan riwayat selama sesi Tor (krusial)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokir penulisan riwayat selama sesi Tor (disarankan)">
-<!ENTITY torbutton.prefs.block_nthread "Blokir pembacaan riwayat selama sesi Non-Tor (opsional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokir penulisan riwayat selama sesi Non-Tor (opsional)">
-<!ENTITY torbutton.prefs.clear_history "Bersihkan riwayat pada saat peralihan status Tor (opsional)">
-<!ENTITY torbutton.prefs.clear_cache "Blokir disk cache dan bersihkan semua cache pada saat peralihan status Tor">
-<!ENTITY torbutton.prefs.block_cache "Blokir akses cache memori dan disk selama sesi Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Simpan cookie Non-Tor dalam jar terproteksi">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "Saya akan mengelola cookie saya secara manual (berbahaya)">
-<!ENTITY torbutton.prefs.clear_cookies "Bersihkan cookie pada saat peralihan status Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Nonaktifkan plugin selama menggunakan Tor (krusial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Tahan javascript yang berbahaya (krusial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolasi konten dinamis pada kondisi Tor (krusial)">
-<!ENTITY torbutton.prefs.no_updates "Nonaktifkan update selama penggunaan Tor">
-<!ENTITY torbutton.prefs.set_uagent "Tetapkan agen pengguna untuk penggunaan Tor (krusial)">
-<!ENTITY torbutton.prefs.dynamic "Konten Dinamis">
-<!ENTITY torbutton.prefs.cookies "Cookie">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Riwayat">
-<!ENTITY torbutton.prefs.no_search "Nonaktifkan saran pencarian selama sesi Tor (disarankan)">
-<!ENTITY torbutton.prefs.shutdown "Matikan">
-<!ENTITY torbutton.prefs.tor_shutdown "Bersihkan cookie Tor saat mematikan browser dengan Tor aktif">
-<!ENTITY torbutton.prefs.all_shutdown "Bersihkan cookie saat mematikan browser dengan kondisi apapun">
-<!ENTITY torbutton.prefs.no_shutdown "Jangan bersihkan cookie saya ketika mematikan browser">
-<!ENTITY torbutton.prefs.disable_sessionstore "Nonaktifkan Penyimpanan Sesi (disarankan)">
-<!ENTITY torbutton.prefs.headers "Header">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Nonaktifkan penyimpanan DOM selama penggunaan Tor (krusial)">
-<!ENTITY torbutton.prefs.forms "Formulir">
-<!ENTITY torbutton.prefs.block_tforms "Blokir penyimpanan password+formulir selama sesi Tor (disarankan)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokir penyimpanan password+formulir selama sesi Non-Tor (opsional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Saat memulai browser dengan sesi dipulihkan, tetapkan kondisi Tor:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Muat ulang cookie jar/bersihkan cookie saat Firefox mengalami kerusakan (disarankan)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Simpan baik cookie Tor maupun Non-Tor dalam jar terproteksi (berbahaya)">
-<!ENTITY torbutton.prefs.clear_http_auth "Bersihkan sesi HTTP terotorisasi (disarankan)">
-<!ENTITY torbutton.prefs.block_js_history "Isolasi akses ke riwayat navigasi pada kondisi Tor (krusial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ubah ukuran jendela ke kelipatan 50px selama penggunaan Tor (disarankan)">
-<!ENTITY torbutton.prefs.close_tor "Tutup semua jendela Tor dan Tab pada saat peralihan (opsional)">
-<!ENTITY torbutton.prefs.close_nontor "Tutup semua jendela Non-Tor dan Tab pada saat peralihan (opsional)">
-<!ENTITY torbutton.prefs.block_links "Blokir klik tautan dan pemuatulangan halaman dari kondisi Tor yang berbeda (opsional)">
-<!ENTITY torbutton.prefs.jar_certs "Simpan sertifikat SSL dalam jar terpisah untuk Tor/Non-Tor (disarankan)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Simpan sertifikat CA dalam jar terpisah untuk Tor/Non-Tor (disarankan)">
-<!ENTITY torbutton.prefs.locked_mode "Nonaktifkan tombol pintas untuk mencegah peralihan tak disengaja">
-<!ENTITY torbutton.prefs.startup_state "Pada startup normal, tetapkan status Tor:">
-<!ENTITY torbutton.prefs.shutdown_state "Kondisi mati">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokir akses Tor ke jaringan dari file:// urls (disarankan)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokir akses Non-Tor ke jaringan dari file:// urls (disarankan)">
 <!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
 <!ENTITY torbutton.prefs.test_settings "Uji pengaturan">
-<!ENTITY torbutton.prefs.test_auto "Uji pengaturan Tor saya setelah saya melakukan peralihan yang pertama setiap kali Firefox dimulai">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Jangan tulis cookie Tor ke disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Jangan tulis cookie Non-Tor ke disk">
-<!ENTITY torbutton.prefs.session_restore "Simpan dan pulihkan tab berikut:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tab dimuat dalam kondisi Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tab dimuat dalam kondisi Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS V4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS V5">
 <!ENTITY torbutton.prefs.no_proxies_on "Jangan gunakan proxy untuk: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Peringatan: Hindari penggunaan hostname di atas">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Nonaktifkan update Livemark selama penggunaan Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(disarankan)">
-<!ENTITY torbutton.prefs.dtd_optional "(opsional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(krusial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Alihkan rute Torbutton melalui Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Gunakan mesin pencari alternatif secara otomatis apabila dihadapkan pada Captcha Google:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index ced330e..63d0f78 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "HjÃ¡lp">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "NÃ½tt auÃ°kenni">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index f08b41d..75e3d36 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferenze di Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Usa Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Usa Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usa impostazioni proxy personalizzate">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.about.title "Informazioni su Torbutton">
-<!ENTITY torbutton.about.version "Versione:">
-<!ENTITY torbutton.about.summary "Proteggi la privacy della navigazione Tor">
-<!ENTITY torbutton.about.code "Sviluppatori:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Revisori per la sicurezza:">
-<!ENTITY torbutton.about.donate "Se apprezzate Tor, prendete in considerazione di">
-<!ENTITY torbutton.about.make_donation "fare una donazione.">
 <!ENTITY torbutton.pref_connection.notice "Disattiva Torbutton per modificare queste impostazioni">
 <!ENTITY torbutton.pref_connection.more_info "Ulteriori informazioni">
 <!ENTITY torbutton.pref_connection_more_info.title "Aiuto">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Cambia lo stato di Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Impostazioni sicurezza e privacy...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Informazioni su Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Impostazioni di rete di Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controllo per aggiornamento Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copia URL Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Apri URL Tor in una nuova scheda">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Apri URL Tor in una nuova finestra">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza">
-<!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)">
-<!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)">
-<!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blocca la scrittura della cronologia quando non si usa Tor (facoltativo)">
-<!ENTITY torbutton.prefs.clear_history "Cancella la cronologia di navigazione attivando o disattivando Tor (facoltativo)">
-<!ENTITY torbutton.prefs.clear_cache "Blocca l'uso della cache disco durante l'uso di Tor e cancella tutta la cache attivando o disattivando Tor">
-<!ENTITY torbutton.prefs.block_cache "Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Conserva i cookie non Tor in un archivio protetto">
-<!ENTITY torbutton.prefs.cookie_protection "Usa la finestra di dialogo per scelta della protezione dei Cookie">
-<!ENTITY torbutton.prefs.mmm_cookies "Gestione manuale dei cookies (pericoloso)">
-<!ENTITY torbutton.prefs.clear_cookies "Cancella i cookies attivando o disattivando Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Disabilita i plugin usando Tor (essenziale)">
-<!ENTITY torbutton.prefs.kill_bad_js "Blocca i javascript pericolosi (essenziale)">
-<!ENTITY torbutton.prefs.isolate_content "Disabilita i contenuti dinamici se Tor ha stati diversi da quello attuale (essenziale)">
-<!ENTITY torbutton.prefs.no_updates "Disabilita gli aggiornamenti durante l'uso di Tor">
-<!ENTITY torbutton.prefs.set_uagent "Imposta l' user agent usando Tor (essenziale)">
-<!ENTITY torbutton.prefs.dynamic "Contenuto dinamico">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Cronologia">
-<!ENTITY torbutton.prefs.no_search "Disabilita i suggerimenti di ricerca quando usi Tor (consigliato)">
-<!ENTITY torbutton.prefs.shutdown "Chiusura">
-<!ENTITY torbutton.prefs.tor_shutdown "Cancella i cookies Tor quando si chiude il browser con Tor attivo">
-<!ENTITY torbutton.prefs.all_shutdown "Cancella sempre i cookies alla chiusura del browser">
-<!ENTITY torbutton.prefs.no_shutdown "Non cancellare i cookies alla chiusura del browser">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disabilita il salvataggio della sessione (consigliato)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Offusca i Referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Offusca in modo intelligente i Referef durante l'uso di Tor (offusca i riferimenti da un dominio ad un altro)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disabilita DOM Storage quando si usa Tor (essenziale)">
-<!ENTITY torbutton.prefs.forms "Moduli">
-<!ENTITY torbutton.prefs.block_tforms "Blocca il salvataggio di password e dei dati nei moduli usando Tor (consigliato)">
-<!ENTITY torbutton.prefs.block_ntforms "Blocca il salvataggio di password e dei dati nei moduli quando non si usa Tor (facoltativo)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Al ripristino di una sessione, imposta lo stato di Tor a:">
-<!ENTITY torbutton.prefs.startup_tor "All'avvio del browser, imposta lo stato di Tor su:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ricarica l'archivio dei cookies/cancella i cookies a un crash di Firefox (consigliato)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Conserva sia i cookie Tor sia quelli Non-Tor in archivi protetti (pericoloso)">
-<!ENTITY torbutton.prefs.clear_http_auth "Cancella le sessioni HTTP autenticate (consigliato)">
-<!ENTITY torbutton.prefs.block_js_history "Disabilita l'accesso alla cronologia se Tor ha stati diversi da quello attuale (essenziale)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 50px durante l'uso di Tor (consigliato)">
-<!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor quando avvengono cambi di stato (facoltativo)">
-<!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor quando avvengono cambi di stato (facoltativo)">
-<!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)">
-<!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in archivi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in archivi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.locked_mode "Disabilita il pulsante e le scorciatoie da tastiera per evitare accidentali attivazioni/disattivazioni di Tor">
-<!ENTITY torbutton.prefs.startup_state "All'avvio imposta lo stato di Tor cosÃ¬:">
-<!ENTITY torbutton.prefs.shutdown_state "Stato alla chiusura">
-<!ENTITY torbutton.prefs.startup "Avvio">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blocca l'accesso Tor alla rete da indirizzi di tipo file://url (consigliato)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// (consigliato)">
 <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
 <!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni">
-<!ENTITY torbutton.prefs.test_auto "Verifica le mie impostazioni Tor dopo la prima volta che lo attivo o disattivo e a ogni avvio di Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Non scrivere cookies Tor sul disco">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Non scrivere cookies non-Tor sul disco">
-<!ENTITY torbutton.prefs.session_restore "Imposta il session store per salvataggio e ripristino di queste schede:">
-<!ENTITY torbutton.prefs.nontor_tabs "Schede caricate in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Schede caricate in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nessun proxy per:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Attenzione: Evitare di usare uno degli hostnames di cui sopra">
-<!ENTITY torbutton.prefs.spoofreresh "Offusca gli aggiornamenti">
-<!ENTITY torbutton.prefs.refereroptions "Opzioni di offuscamento dei Referer">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Offusca la cartella contenente la pagina">
-<!ENTITY torbutton.prefs.spoofdomain "Offusca il dominio come referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(consigliato)">
-<!ENTITY torbutton.prefs.dtd_optional "(facoltativo)">
-<!ENTITY torbutton.prefs.dtd_crucial "(essenziale)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redireziona con Tor gli aggiornamenti di Torbutton">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Utilizza automaticamente un motore di ricerca alternativo quando viene presentato un Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Torificazione trasparente (richiede un transproxy personalizzato o un tor router)">
 <!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy">
 <!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript puÃ² essere attivato a seconda del sito usando il pulsante NoScript sulla barra strumenti.">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ã¨ disabilitato di default su tutti i siti.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Molti formati audio e video sono disabilitati.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM Ã¨ l'unico codec che rimane abilitato.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati.">
 <!ENTITY torbutton.prefs.sec_custom "Valori personalizzati">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 64e91a4..c58bd68 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbuttonè¨å®š">
 <!ENTITY torbutton.prefs.tor_settings "ãƒ—ãƒã‚ã‚·è¨å®š">
 <!ENTITY torbutton.prefs.recommended_settings "Firefoxã®ãƒ—ãƒã‚ã‚·è¨å®šã‚’ä½¿ã†">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxyã‚’ä½¿ã†">
 <!ENTITY torbutton.prefs.use_polipo "Polipoã‚’ä½¿ã†">
 <!ENTITY torbutton.prefs.custom_settings "ã‚«ã‚¹ã‚¿ãƒ è¨å®šã®ãƒ—ãƒã‚ã‚·ã‚’ä½¿ã†">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTPãƒ—ãƒã‚ã‚·">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopherãƒ—ãƒã‚ã‚·">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKSãƒ›ã‚¹ãƒˆ">
 <!ENTITY torbutton.prefs.proxy.port "ãƒãƒ¼ãƒˆ">
-<!ENTITY torbutton.about.title "Torbuttonã«ã¤ã„ã¦">
-<!ENTITY torbutton.about.version "ãƒãƒ¼ã‚¸ãƒ§ãƒ³:">
-<!ENTITY torbutton.about.summary "ã‚ãªãŸã®Torãƒ–ãƒ©ã‚¦ã‚¸ãƒ³ã‚°ã®ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ã‚’ä¿è·ã—ã¾ã™ã€‚">
-<!ENTITY torbutton.about.code "ãƒ—ãƒã‚°ãƒ©ãƒ ã®è²¢çŒ®è€…:">
-<!ENTITY torbutton.about.maintainer "ãƒ¡ãƒ³ãƒ†ãƒŠâ€•:">
-<!ENTITY torbutton.about.security_review "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¬ãƒ“ãƒ¥ãƒ¼:">
-<!ENTITY torbutton.about.donate "Torã‚’ä½¿ã†ã®ãŒå¥½ããªã‚‰ã€æ¤œè¨Žã—ã¾ã—ã‚‡ã†">
-<!ENTITY torbutton.about.make_donation "å¯„ä»˜ã™ã‚‹">
 <!ENTITY torbutton.pref_connection.notice "ã“ã‚Œã‚‰ã®è¨å®šã‚’å¤‰æ›´ã™ã‚‹ã«ã¯Torbuttonã‚’ã‚ªãƒ•ã«ã—ã¦ãã ã•ã„">
 <!ENTITY torbutton.pref_connection.more_info "è©³ç´°æƒ…å ±">
 <!ENTITY torbutton.pref_connection_more_info.title "ãƒ˜ãƒ«ãƒ—">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ã“ã®ã‚µã‚¤ãƒˆç”¨ã®æ–°ã—ã„ Tor ã‚µãƒ¼ã‚ãƒƒãƒˆ">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Torã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’å¤‰æ›´">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ã¨ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼è¨å®š">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbuttonã«ã¤ã„ã¦...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¨å®š...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "TorBrowserã®ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã‚’ç¢ºèª">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie ã®é˜²å¾¡">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Torã®URLã‚’ã‚³ãƒ”ãƒ¼">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "æ–°ã—ã„ã‚¿ãƒ–ã§Torã®URLã‚’é–‹ã">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "æ–°ã—ã„ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§Torã®URLã‚’é–‹ã">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbuttonã‚’åˆæœŸçŠ¶æ…‹ã«æˆ»ã™">
 <!ENTITY torbutton.prefs.privacy_security_settings "ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ã¨ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ã®è¨å®š">
-<!ENTITY torbutton.prefs.block_thread "ãƒ–ãƒãƒƒã‚¯å±¥æ´ãŒTorä¸ã«èªã¿ã¾ã™ (é‡è¦)">
-<!ENTITY torbutton.prefs.block_thwrite "ãƒ–ãƒãƒƒã‚¯å±¥æ´ãŒTorä¸ã«æ›¸ãè¾¼ã¾ã‚Œã¾ã™ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.block_nthread "éžTorä¸ã«ãƒ–ãƒãƒƒã‚¯å±¥æ´ã‚’èªã¿ã¾ã™ (ä»»æ„)">
-<!ENTITY torbutton.prefs.block_nthwrite "ãƒ–ãƒãƒƒã‚¯å±¥æ´ãŒéžTorä¸ã«æ›¸ãè¾¼ã¾ã‚Œã¾ã™ (ä»»æ„)">
-<!ENTITY torbutton.prefs.clear_history "Toråˆ‡ã‚Šæ›¿ãˆæ™‚ã«å±¥æ´ã‚’ã‚¯ãƒªã‚¢ (ä»»æ„)">
-<!ENTITY torbutton.prefs.clear_cache "Torã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚ãƒ£ãƒƒã‚·ãƒ¥ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¦ã€Torã®åˆ‡ã‚Šæ›¿ãˆæ™‚ã«ã™ã¹ã¦ã®ã‚ãƒ£ãƒƒã‚·ãƒ¥ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹">
-<!ENTITY torbutton.prefs.block_cache "Torä¸ãƒ‡ã‚£ã‚¹ã‚¯ã¨ãƒ¡ãƒ¢ãƒªãƒ¼ã‚ãƒ£ãƒƒã‚·ãƒ¥ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹">
-<!ENTITY torbutton.prefs.cookie_jars "éžTorã®cookieã‚’ä¿è·ã•ã‚ŒãŸjarã§ä¿ç®¡ã™ã‚‹">
-<!ENTITY torbutton.prefs.cookie_protection "é¸æŠžã™ã‚‹ã«ã¯Cookieä¿è·ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’ä½¿ç”¨ã™ã‚‹">
-<!ENTITY torbutton.prefs.mmm_cookies "æ‰‹å‹•ã§è‡ªåˆ†ã®cookieã‚’ç®¡ç†ã™ã‚‹ (å±é™º)">
-<!ENTITY torbutton.prefs.clear_cookies "Toråˆ‡ã‚Šæ›¿ãˆæ™‚ã«cookieã‚’ã‚¯ãƒªã‚¢">
-<!ENTITY torbutton.prefs.disable_plugins "Torä½¿ç”¨ä¸ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã‚’ç„¡åŠ¹ (é‡è¦)">
-<!ENTITY torbutton.prefs.kill_bad_js "å±é™ºãªjavascriptã‚’ãƒ•ãƒƒã‚¯ (é‡è¦)">
-<!ENTITY torbutton.prefs.isolate_content "å‹•çš„ãªå†…å®¹ã‚’Torã®çŠ¶æ…‹ã«åˆ†é›¢ (é‡è¦)">
-<!ENTITY torbutton.prefs.no_updates "Torä½¿ç”¨ä¸ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã‚’ç„¡åŠ¹">
-<!ENTITY torbutton.prefs.set_uagent "Torã®ä½¿ç”¨ã®ãŸã‚ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆã‚’è¨å®š (é‡è¦)">
-<!ENTITY torbutton.prefs.dynamic "ã‚³ãƒ³ãƒ†ãƒ³ãƒ„">
-<!ENTITY torbutton.prefs.cookies "ã‚¯ãƒƒã‚ãƒ¼">
-<!ENTITY torbutton.prefs.cache "ã‚ãƒ£ãƒƒã‚·ãƒ¥">
-<!ENTITY torbutton.prefs.history "å±¥æ´">
-<!ENTITY torbutton.prefs.no_search "Torä¸ã¯æ¤œç´¢å€™è£œã‚’ç„¡åŠ¹ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.shutdown "åœæ¢">
-<!ENTITY torbutton.prefs.tor_shutdown "TorãŒæœ‰åŠ¹ãªãƒ–ãƒ©ã‚¦ã‚¶ãƒ¼ãŒã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³ä¸ã¯Torã®cookieã‚’ã‚¯ãƒªã‚¢">
-<!ENTITY torbutton.prefs.all_shutdown "å…¨ã¦ã®ãƒ–ãƒ©ã‚¦ã‚¶ãŒã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³ä¸ã¯cookieã‚’ã‚¯ãƒªã‚¢">
-<!ENTITY torbutton.prefs.no_shutdown "ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³æ™‚ã«ç§ã®cookieã‚’å‰Šé™¤ã—ãªã„">
-<!ENTITY torbutton.prefs.disable_sessionstore "ã‚»ãƒƒã‚·ãƒ§ãƒ³ä¿å˜ã‚’ç„¡åŠ¹åŒ– (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.headers "ãƒ˜ãƒƒãƒ€é€ä¿¡">
-<!ENTITY torbutton.prefs.refererspoofing "ãƒªãƒ•ã‚¡ãƒ©ã‚’å½è£…ã™ã‚‹">
-<!ENTITY torbutton.prefs.spoofblank "Torä½¿ç”¨ä¸ã¯ç©ºç™½ã®ãƒªãƒ•ã‚¡ãƒ©ã«å½è£…ã™ã‚‹ (ä¸€éƒ¨ã®ã‚µã‚¤ãƒˆã‚’å£Šã™ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“)">
-<!ENTITY torbutton.prefs.smartspoof "Torä½¿ç”¨ä¸ã¯ã‚¹ãƒžãƒ¼ãƒˆãªãƒªãƒ•ã‚¡ãƒ©å½è£… (ã‚¯ãƒã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ã®ãƒªãƒ•ã‚¡ãƒ©ã‚’å½è£…ã™ã‚‹)">
-<!ENTITY torbutton.prefs.nospoof "Torä½¿ç”¨ä¸ã¯ãƒªãƒ•ã‚¡ãƒ©å½è£…ã‚’ã—ãªã„ (é€šå¸¸é€šã‚Šãƒªãƒ•ã‚¡ãƒ©ã‚’é€ã‚‹)">
-<!ENTITY torbutton.prefs.disable_domstorage "Torä½¿ç”¨ä¸ã¯DOMã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚’ç„¡åŠ¹åŒ– (é‡è¦)">
-<!ENTITY torbutton.prefs.forms "ãƒ•ã‚©ãƒ¼ãƒ å…¥åŠ›">
-<!ENTITY torbutton.prefs.block_tforms "Torä¸ã¯ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒä¿å˜ã•ã‚Œãªã„ã‚ˆã†ã«ã™ã‚‹ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.block_ntforms "éžTorä¸ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒä¿å˜ã•ã‚Œãªã„ã‚ˆã†ã«ã™ã‚‹ (ä»»æ„)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "ã‚»ãƒƒã‚·ãƒ§ãƒ³ãŒå›žå¾©ã•ã‚ŒãŸèµ·å‹•æ™‚ã®Torã®è¨å®š:">
-<!ENTITY torbutton.prefs.startup_tor "ãƒ–ãƒ©ã‚¦ã‚¶èµ·å‹•æ™‚ã®Torã®è¨å®š:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefoxã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥æ™‚Cookie jarã‚’ãƒªãƒãƒ¼ãƒ‰ / cookieã‚’ã‚¯ãƒªã‚¢ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "ä¿è·ã•ã‚ŒãŸjarã§Torã¨éžTor cookieã®ä¸¡æ–¹ã‚’ä¿å˜ã™ã‚‹ (å±é™º)">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTPèªè¨¼ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.block_js_history "å±¥æ´ãƒŠãƒ“ã‚²ãƒ¼ã‚·ãƒ§ãƒ³ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’Torã®çŠ¶æ…‹ã«åˆ†é›¢ (é‡è¦)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Torä½¿ç”¨æ™‚ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’è¤‡æ•°ã®50pxã®ã‚µã‚¤ã‚ºã«å¤‰æ›´ã™ã‚‹ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.close_tor "åˆ‡ã‚Šæ›¿ãˆæ™‚ã™ã¹ã¦ã®Torã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¨ã‚¿ãƒ–ã‚’é–‰ã˜ã‚‹ (ä»»æ„)">
-<!ENTITY torbutton.prefs.close_nontor "åˆ‡ã‚Šæ›¿ãˆæ™‚ã™ã¹ã¦ã®éžTorã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¨ã‚¿ãƒ–ã‚’é–‰ã˜ã‚‹ (ä»»æ„)">
-<!ENTITY torbutton.prefs.block_links "ç•°ãªã‚‹TorçŠ¶æ…‹ã‹ã‚‰ã®ãƒªãƒ³ã‚¯ã®ã‚¯ãƒªãƒƒã‚¯ã‚„ãƒšãƒ¼ã‚¸ã®ãƒªãƒãƒ¼ãƒ‰ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ (ä»»æ„)">
-<!ENTITY torbutton.prefs.jar_certs "Torã¨éžTorã”ã¨ã«åˆ†å‰²ã—ãŸJarã§SSLè¨¼æ˜Žæ›¸ã‚’ä¿ç®¡ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Torã¨éžTorã”ã¨ã«åˆ†å‰²ã—ãŸJarã§CAè¨¼æ˜Žæ›¸ã‚’ä¿ç®¡ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.locked_mode "äºˆæœŸã›ã¬åˆ‡ã‚Šæ›¿ãˆã‚’é˜²ããŸã‚ã€ãƒœã‚¿ãƒ³ã‚„ãƒ›ãƒƒãƒˆã‚ãƒ¼ã‚’ç„¡åŠ¹ã«ã™ã‚‹">
-<!ENTITY torbutton.prefs.startup_state "èµ·å‹•æ™‚ã®Torã®è¨å®š: ">
-<!ENTITY torbutton.prefs.shutdown_state "åœæ¢çŠ¶æ…‹">
-<!ENTITY torbutton.prefs.startup "èµ·å‹•">
-<!ENTITY torbutton.prefs.block_tor_file_net "file://ã®URLã‹ã‚‰ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®Torã‚¢ã‚¯ã‚»ã‚¹ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹ (æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "file://ã®URLã‹ã‚‰ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®éžTorã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’ãƒ–ãƒãƒƒã‚¯ã™ã‚‹">
 <!ENTITY torbutton.prefs.restore_defaults "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨å®šã«æˆ»ã™">
 <!ENTITY torbutton.prefs.test_settings "è¨å®šã‚’ãƒ†ã‚¹ãƒˆã™ã‚‹">
-<!ENTITY torbutton.prefs.test_auto "å¸¸ã«æœ€åˆã«Firefoxã‚’èµ·å‹•ã—ãŸå¾Œè‡ªåˆ†ã®Torã®è¨å®šã‚’ãƒ†ã‚¹ãƒˆã™ã‚‹">
-<!ENTITY torbutton.prefs.disable_livemarks "Torä½¿ç”¨ä¸ã¯ãƒ©ã‚¤ãƒ–ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ã®æ›´æ–°ã‚’ç„¡åŠ¹åŒ–">
-<!ENTITY torbutton.prefs.tor_memory_jar "Torã®cookieã‚’ãƒ‡ã‚£ã‚¹ã‚¯ã«æ›¸ãè¾¼ã¾ãªã„">
-<!ENTITY torbutton.prefs.nontor_memory_jar "éžTorã®cookieã‚’ãƒ‡ã‚£ã‚¹ã‚¯ã«æ›¸ãè¾¼ã¾ãªã„">
-<!ENTITY torbutton.prefs.session_restore "ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚¹ãƒˆã‚¢ã«ä¿å˜ã—å›žå¾©ã™ã‚‹ã‚¿ãƒ–:">
-<!ENTITY torbutton.prefs.nontor_tabs "éžTorã§èªã¿è¾¼ã¾ã‚ŒãŸã‚¿ãƒ–">
-<!ENTITY torbutton.prefs.tor_tabs "Torã§èªã¿è¾¼ã‚€ã‚¿ãƒ–">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ãƒ—ãƒã‚ã‚·ã‚’ç”¨ã„ãªã„:">
 <!ENTITY torbutton.prefs.no_proxy_warning "è¦å‘Š: ä»¥ä¸Šã®ã©ã‚“ãªãƒ›ã‚¹ãƒˆãƒãƒ¼ãƒ ã®ä½¿ç”¨ã‚‚é¿ã‘ã¦ãã ã•ã„">
-<!ENTITY torbutton.prefs.spoofreresh "å½è£…æ›´æ–°">
-<!ENTITY torbutton.prefs.refereroptions "ãƒªãƒ•ã‚¡ãƒ©å½è£…ã‚ªãƒ—ã‚·ãƒ§ãƒ³">
-<!ENTITY torbutton.prefs.nospoof "Torä½¿ç”¨ä¸ã¯ãƒªãƒ•ã‚¡ãƒ©å½è£…ã‚’ã—ãªã„ (é€šå¸¸é€šã‚Šãƒªãƒ•ã‚¡ãƒ©ã‚’é€ã‚‹)">
-<!ENTITY torbutton.prefs.spoofroot "ãƒšãƒ¼ã‚¸ã®å«ã‚“ã§ã„ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã‚’å½è£…ã™ã‚‹">
-<!ENTITY torbutton.prefs.spoofdomain "ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’ãƒªãƒ•ã‚¡ãƒ©ã¨ã—ã¦å½è£…ã™ã‚‹">
-<!ENTITY torbutton.prefs.spoofblank "Torä½¿ç”¨ä¸ã¯ç©ºç™½ã®ãƒªãƒ•ã‚¡ãƒ©ã«å½è£…ã™ã‚‹ (ä¸€éƒ¨ã®ã‚µã‚¤ãƒˆã‚’å£Šã™ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“)">
 <!ENTITY torbutton.cookiedialog.title "Cookieä¿è·ã‚’ç®¡ç†">
 <!ENTITY torbutton.cookiedialog.lockCol "ä¿è·æ¸ˆã¿">
 <!ENTITY torbutton.cookiedialog.domainCol "ãƒ›ã‚¹ãƒˆ">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ä¿è·ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ä»¥å¤–å‰Šé™¤">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "æ–°ã—ã„Cookieã‚’ä¿è·">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ–°ã—ã„Cookieã‚’ä¿è·ã—ãªã„">
-<!ENTITY torbutton.prefs.disable_livemarks "Torä½¿ç”¨ä¸ã¯ãƒ©ã‚¤ãƒ–ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ã®æ›´æ–°ã‚’ç„¡åŠ¹åŒ–">
-<!ENTITY torbutton.prefs.dtd_recommended "(æŽ¨å¥¨)">
-<!ENTITY torbutton.prefs.dtd_optional "(ã‚ªãƒ—ã‚·ãƒ§ãƒ³)">
-<!ENTITY torbutton.prefs.dtd_crucial "(é‡è¦)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torè¶Šã—ã«Torbuttonã®æ›´æ–°ã‚’ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆ">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google CaptchaãŒå‡ºãŸã¨ãã¯è‡ªå‹•çš„ã«äºˆå‚™ã®æ¤œç´¢ã‚¨ãƒ³ã‚¸ãƒ³ã‚’ä½¿ç”¨ã™ã‚‹">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "é€éŽåž‹ToråŒ– (ã‚«ã‚¹ã‚¿ãƒ é€éŽåž‹ãƒ—ãƒã‚ã‚·ã‹Torã®ãƒ«ãƒ¼ã‚¿ãƒ¼ãŒå¿…è¦)">
 <!ENTITY torbutton.prefs.priv_caption "ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼è¨å®š">
 <!ENTITY torbutton.prefs.block_disk "ãƒ–ãƒ©ã‚¦ã‚¸ãƒ³ã‚°å±¥æ´ã‚„ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã®ãƒ‡ãƒ¼ã‚¿ã‚’è¨˜éŒ²ã—ãªã„ (ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆãƒ–ãƒ©ã‚¦ã‚¸ãƒ³ã‚°ãƒ¢ãƒ¼ãƒ‰ã‚’æœ‰åŠ¹åŒ–)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "No-Script ãƒ„ãƒ¼ãƒ«ãƒãƒ¼ã‹ã‚‰ã‚µã‚¤ãƒˆã”ã¨ã« JavaScript ã‚’æœ‰åŠ¹åŒ–ã§ãã¾ã™ã€‚">
 <!ENTITY torbutton.prefs.sec_high "é«˜ã„">
 <!ENTITY torbutton.prefs.sec_all_js_desc "å…¨ã¦ã®ã‚µã‚¤ãƒˆã® JavaScript ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "ã»ã¨ã‚“ã©ã®æ˜ åƒã¨éŸ³æ¥½å½¢å¼ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM å½¢å¼ã ã‘ãŒæœ‰åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "ã„ãã¤ã‹ã®ãƒ•ã‚©ãƒ³ãƒˆã¨ã‚¢ã‚¤ã‚³ãƒ³ã¯æ£å¸¸ã«è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“ã€‚">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web ã‚µã‚¤ãƒˆãŒæä¾›ã™ã‚‹ãƒ•ã‚©ãƒ³ãƒˆã¯ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¾ã™ã€‚">
 <!ENTITY torbutton.prefs.sec_custom "ã‚«ã‚¹ã‚¿ãƒ å€¤">
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 0ce3fce..d597085 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton í™˜ê²½ ì„¤ì •">
 <!ENTITY torbutton.prefs.tor_settings "í”„ë¡ì‹œ ì„¤ì •">
 <!ENTITY torbutton.prefs.recommended_settings "í˜„ìž¬ ì¶”ì²œëœ í”„ë¡ì‹œ ì„¤ì • ì‚¬ìš©">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy ì‚¬ìš©">
 <!ENTITY torbutton.prefs.use_polipo "Polipo ì‚¬ìš©">
 <!ENTITY torbutton.prefs.custom_settings "ì‚¬ìš©ìž ì§€ì • í”„ë¡ì‹œ ì„¤ì • ì‚¬ìš©">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP í”„ë¡ì‹œ ì£¼ì†Œ:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher í”„ë¡ì‹œ ì£¼ì†Œ:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :">
 <!ENTITY torbutton.prefs.proxy.port "í¬íŠ¸  : ">
-<!ENTITY torbutton.about.title "Torbuttonì— ëŒ€í•˜ì—¬">
-<!ENTITY torbutton.about.version "ë²„ì „:">
-<!ENTITY torbutton.about.summary "Tor ë¸Œë¼ìš°ì§•ì˜ ì‚¬ìƒí™œ ë³´í˜¸">
-<!ENTITY torbutton.about.code "ì½”ë“œ ê³µí—Œìž:">
-<!ENTITY torbutton.about.maintainer "ê´€ë¦¬ìž :">
-<!ENTITY torbutton.about.security_review "ë³´ì•ˆ ë¦¬ë·°:">
-<!ENTITY torbutton.about.donate "Torë¥¼ ì‚¬ìš©í•˜ëŠ” ê²ƒì´ ì¢‹ìœ¼ì‹œë‹¤ë©´ ëª¨">
-<!ENTITY torbutton.about.make_donation "í›„ì›í•˜ê¸°">
 <!ENTITY torbutton.pref_connection.notice "Torbuttonì´ ë‹¤ìŒì˜ ì„¤ì •ë“¤ì„ ë°”ê¾¸ì§€ ëª»í•˜ê²Œ í•©ë‹ˆë‹¤.">
 <!ENTITY torbutton.pref_connection.more_info "ì¶”ê°€ ì •ë³´">
 <!ENTITY torbutton.pref_connection_more_info.title "ë„ì›€ë§">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor ì„œí‚· ìž¬êµ¬ì¶•">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Tor ìž‘ë™ ìƒíƒœ">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ê°œì¸ì •ë³´ ë° ë³´ì•ˆ ê´€ë ¨ ì„¤ì •...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbuttonì— ëŒ€í•˜ì—¬...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "í† ë¥´ ë„¤íŠ¸ì›Œí¬ ì„¤ì •...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "í† ë¥´ ë¸Œë¼ìš°ì € ì—…ë°ì´íŠ¸ ì²´í¬í•˜ê¸°...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ì¿ í‚¤ ë³´í˜¸....">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Tor URL ë³µì‚¬">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Tor URLì„ ìƒˆ íƒì—ì„œ ì—´ê¸°">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Tor URLì„ ìƒˆ ì°½ì—ì„œ ì—´ê¸°">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbutton ì„¤ì • ì´ˆê¸°í™”">
 <!ENTITY torbutton.prefs.privacy_security_settings "ê°œì¸ ì •ë³´ì™€ ë³´ì•ˆ ì„¤ì •">
-<!ENTITY torbutton.prefs.block_thread "Tor ì‚¬ìš© ì‹œ, ì‚¬ìš© ê¸°ë¡ì„ ì™¸ë¶€ì—ì„œ ì½ì–´ê°€ëŠ” ê²ƒì„ ì°¨ë‹¨ (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor ì‚¬ìš© ì‹œ, ì‚¬ìš© ê¸°ë¡ì„ ë‚¨ê¸°ì§€ ì•Šê¸° (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.block_nthread "Torë¥¼ ì‚¬ìš©í•˜ì§€ ì•Šì„ ë•Œ, ì‚¬ìš© ê¸°ë¡ì„ ì™¸ë¶€ì—ì„œ ì½ì–´ê°€ëŠ” ê²ƒì„ ì°¨ë‹¨ (ì„ íƒ)">
-<!ENTITY torbutton.prefs.block_nthwrite "Torë¥¼ ì‚¬ìš©í•˜ì§€ ì•Šì„ ë•Œ, ì‚¬ìš© ê¸°ë¡ ì“°ëŠ” ê²ƒì„ ë§‰ê¸° (ì„ íƒ)">
-<!ENTITY torbutton.prefs.clear_history "Tor ìž‘ë™ ì‹œ ì‚¬ìš© ê¸°ë¡ ì´ˆê¸°í™” (ì„ íƒ)">
-<!ENTITY torbutton.prefs.clear_cache "Tor ìž‘ë™ ì‹œ Torê°€ ìž„ì‹œí´ë”ì— ê¸°ë¡ë˜ëŠ” ê²ƒì„ ì°¨ë‹¨í•˜ê³ , ìž„ì‹œí´ë” ì´ˆê¸°í™”">
-<!ENTITY torbutton.prefs.block_cache "Tor ìž‘ë™ ì¤‘ Torê°€ ìž„ì‹œí´ë”ì— ê¸°ë¡ë˜ëŠ” ê²ƒì„ ì°¨ë‹¨">
-<!ENTITY torbutton.prefs.cookie_jars "ë³´í˜¸ë˜ëŠ” ì˜ì—ì— ì¼ë°˜ ìž„ì‹œíŒŒì¼ ì €ìž¥">
-<!ENTITY torbutton.prefs.cookie_protection "ì¿ í‚¤ ë³´í˜¸ ì„ íƒ ì‚¬ìš©">
-<!ENTITY torbutton.prefs.mmm_cookies "ìˆ˜ë™ìœ¼ë¡œ ìž„ì‹œíŒŒì¼ ê´€ë¦¬ (ìœ„í—˜)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor ìž‘ë™ ì‹œ ëª¨ë“  ìž„ì‹œíŒŒì¼ ì‚ì œ">
-<!ENTITY torbutton.prefs.disable_plugins "Tor ì‚¬ìš© ì¤‘ í”ŒëŸ¬ê·¸ì¸ ë¹„í™œì„±í™” (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.kill_bad_js "ìœ„í—˜í•œ ìžë°”ìŠ¤í¬ë¦½íŠ¸ ì°¨ë‹¨ (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.isolate_content "ìžë™ ì‹¤í–‰ë˜ëŠ” ì½˜í…ì¸ ë¥¼ Tor ìƒíƒœì—ì„œ ê²©ë¦¬ (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.no_updates "Tor ë¸Œë¼ìš°ì € ì‚¬ìš©ì¤‘ ì—…ë°ì´íŠ¸ ë¹„í™œì„±í™”">
-<!ENTITY torbutton.prefs.set_uagent "Tor ì‚¬ìš© ì‹œ ì‚¬ìš©ìž ì—ì´ì „íŠ¸ ì„¤ì • (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.dynamic "ìžë™ ì‹¤í–‰ ì½˜í…ì¸ ">
-<!ENTITY torbutton.prefs.cookies "ì¿ í‚¤">
-<!ENTITY torbutton.prefs.cache "ìºì‹œ">
-<!ENTITY torbutton.prefs.history "ë°©ë¬¸/íƒìƒ‰ ê¸°ë¡">
-<!ENTITY torbutton.prefs.no_search "Tor ì‚¬ìš©ì¤‘ ê²€ìƒ‰ ì—”ì§„ì˜ ì¶”ì²œì„ ë¹„í™œì„±í™” (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.shutdown "ì¢…ë£Œ">
-<!ENTITY torbutton.prefs.tor_shutdown "Torê°€ í™œì„±í™”ëœ ë¸Œë¼ìš°ì €ê°€ ì¢…ë£Œ ì‹œ ëª¨ë“  ì¿ í‚¤ ì‚ì œ">
-<!ENTITY torbutton.prefs.all_shutdown "ì „ì²´ ì¸í„°ë„· ë¸Œë¼ìš°ì € ì¢…ë£Œ ì‹œ ëª¨ë“  ì¿ í‚¤ ì‚ì œ">
-<!ENTITY torbutton.prefs.no_shutdown "ì¢…ë£Œì‹œ ì¿ í‚¤ë¥¼ ì‚ì œí•˜ì§€ ì•ŠìŒ">
-<!ENTITY torbutton.prefs.disable_sessionstore "ì„¸ì…˜ì„ ì €ìž¥í•˜ì§€ ì•ŠìŒ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.headers "í—¤ë”">
-<!ENTITY torbutton.prefs.refererspoofing "ë¦¬í¼ëŸ¬ ìŠ¤í‘¸í•‘">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Tor ì‚¬ìš©ì‹œ ìŠ¤ë§ˆíŠ¸ ë¦¬í¼ëŸ¬ ì¡°ìž‘ (ë„ë©”ì¸ ë¦¬í¼ëŸ¬ë¥¼ ê°€ë¡œì§ˆëŸ¬ ì¡°ìž‘)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor ì‚¬ìš©ì‹œ DOM ì €ìž¥ì†Œ ë¹„í™œì„±í™” (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.forms "ì–‘ì‹">
-<!ENTITY torbutton.prefs.block_tforms "Tor ì‚¬ìš©ì‹œ ë¹„ë°€ë²ˆí˜¸ì™€ ì–‘ì‹ ì €ìž¥ ì•ˆí•¨ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.block_ntforms "Torë¥¼ ì‚¬ìš©í•˜ì§€ ì•Šì„ ë•Œ ë¹„ë°€ë²ˆí˜¸ì™€ ì–‘ì‹ ì €ìž¥ ì•ˆí•¨ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "ì‹œìž‘ì‹œ ì €ìž¥ëœ ì„¸ì…˜ì´ ìžˆë‹¤ë©´, Tor ìƒíƒœë¥¼ ë‹¤ìŒê³¼ ê°™ì´ í•©ë‹ˆë‹¤.">
-<!ENTITY torbutton.prefs.startup_tor "ë¸Œë¼ìš°ì €ê°€ ì‹œìž‘ë  ë•Œ, Tor ìƒíƒœ : ">
-<!ENTITY torbutton.prefs.reload_crashed_jar "íŒŒì´ì–´íìŠ¤ê°€ ì˜¤ë¥˜ë¡œ ì¢…ë£Œë˜ì—ˆì„ë•Œ Cookie Jarë¥¼ ë‹¤ì‹œ ë¡œë“œí•˜ê³  ì¿ í‚¤ë¥¼ ì œê±°í•©ë‹ˆë‹¤.">
-<!ENTITY torbutton.prefs.dual_cookie_jars "ë³´í˜¸ëœ Jar íŒŒì¼ì— Tor ë° ë¹„-Tor ì¿ í‚¤ ì €ìž¥ (ìœ„í—˜)">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTP ì¸ì¦ ì„¸ì…˜ ì§€ìš°ê¸° (ê¶Œìž¥)">
-<!ENTITY torbutton.prefs.block_js_history "Tor ìƒíƒœë¡œ íƒìƒ‰ ê¸°ë¡ì— ëŒ€í•œ ì•¡ì„¸ìŠ¤ ë¶„ë¦¬ (ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Torë¥¼ ì‚¬ìš©í•˜ëŠ” ë™ì•ˆ 50 í”½ì…€ì˜ ë°°ìˆ˜ë¡œ ì°½ í¬ê¸° ì¡°ì • (ê¶Œìž¥)">
-<!ENTITY torbutton.prefs.close_tor "ì „í™˜ ì‹œ ëª¨ë“  Tor ì°½ê³¼ íƒ ë‹«ê¸° (ì˜µì…˜)">
-<!ENTITY torbutton.prefs.close_nontor "ì „í™˜ ì‹œ ëª¨ë“  ë¹„-Tor ì°½ê³¼ íƒ ë‹«ê¸° (ì˜µì…˜)">
-<!ENTITY torbutton.prefs.block_links "ë‹¤ë¥¸ Tor ìƒíƒœë¡œë¶€í„° ë§í¬ í´ë¦ê³¼ íŽ˜ì´ì§€ë¥¼ ë‹¤ì‹œ ë¡œë“œí•˜ëŠ” ê²ƒì„ ë§‰ìŒ (ì„ íƒ)">
-<!ENTITY torbutton.prefs.jar_certs "SSL ì¸ì¦ì„œë¥¼ Tor/Non-Torì¸ ë™ì•ˆ ë‹¤ë¥¸ ë³´ê´€ì†Œì— ë³´ê´€ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.jar_ca_certs "CA ì¸ì¦ì„œë¥¼ Tor/Non-Torì¸ ë™ì•ˆ ë‹¤ë¥¸ ë³´ê´€ì†Œì— ë³´ê´€ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.locked_mode "ê³ ì „ì ì¸ í† ê¸€ì„ ë§‰ëŠ” ë²„íŠ¼ê³¼ ë‹¨ì¶•í‚¤ë¥¼ ë¹„í™œì„±í™”í•©ë‹ˆë‹¤.">
-<!ENTITY torbutton.prefs.startup_state "ì¼ë°˜ì ì¸ ì‹œìž‘ì—ì„œ, Tor ìƒíƒœ ì„¤ì • :">
-<!ENTITY torbutton.prefs.shutdown_state "ì¢…ë£Œëœ ìƒíƒœ">
-<!ENTITY torbutton.prefs.startup "ì‹œìž‘">
-<!ENTITY torbutton.prefs.block_tor_file_net "file:// urlë¡œ Torì˜ ì ‘ê·¼ì„ ë§‰ìŒ (ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "file:// urlë¡œ Torë¥¼ ì‚¬ìš©ì¤‘ì´ì§€ ì•Šì€ ìƒíƒœì—ì„œ ì ‘ê·¼ì„ ë§‰ìŒ">
 <!ENTITY torbutton.prefs.restore_defaults "ì„¤ì • ì´ˆê¸°í™”">
 <!ENTITY torbutton.prefs.test_settings "ì„¤ì • í…ŒìŠ¤íŠ¸">
-<!ENTITY torbutton.prefs.test_auto "íŒŒì´ì–´íìŠ¤ê°€ ì‹œìž‘í•  ë•Œë§ˆë‹¤ ë‚´ Tor ì„¤ì • í™•ì¸">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor ì¿ í‚¤ë¥¼ ë””ìŠ¤í¬ì— ì“°ì§€ ì•ŠìŒ">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Torê°€ ì•„ë‹Œ ì¿ í‚¤ë¥¼ ë””ìŠ¤í¬ì— ì“°ì§€ ì•ŠìŒ">
-<!ENTITY torbutton.prefs.session_restore "ì„¸ì…˜ ì €ìž¥ì†Œê°€ ì´ëŸ¬í•œ íƒì„ ì €ìž¥í•˜ê³  ë³µì›í–ˆìŠµë‹ˆë‹¤">
-<!ENTITY torbutton.prefs.nontor_tabs "Torê°€ ì•„ë‹Œ ë¡œë“œëœ íƒ">
-<!ENTITY torbutton.prefs.tor_tabs "Torì—ì„œ ë¡œë“œëœ íƒ">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ë‹¤ìŒ ì£¼ì†Œì—ì„œëŠ” í”„ë¡ì‹œë¥¼ ì‚¬ìš©í•˜ì§€ ì•ŠìŒ :">
 <!ENTITY torbutton.prefs.no_proxy_warning "ì£¼ì˜ : ì–´ë–¤ í˜¸ìŠ¤íŠ¸ë„¤ìž„ì„ ì•„ëž˜ì—ì„œ ì‚¬ìš©í•˜ëŠ” ê²ƒì„ í”¼í•˜ì‹ì‹œì˜¤.">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing ì˜µì…˜">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "íŽ˜ì´ì§€ í´ë”ë¥¼ í¬í•¨í•˜ëŠ” spoof">
-<!ENTITY torbutton.prefs.spoofdomain "ë„ì—ë¯¼ì„ ë¦¬í¼ëŸ¬ë¡œ spoof í•˜ì‹ì‹œì˜¤">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "ì¿ í‚¤ ë³´í˜¸ ê´€ë¦¬">
 <!ENTITY torbutton.cookiedialog.lockCol "ë³´í˜¸ë¨">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í˜¸ëœ ê²ƒ ë¹¼ê³  ëª¨ë‘ ì§€ìš°ê¸°">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ìƒˆë¡œìš´ ì¿ í‚¤ ë³´í˜¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ìƒˆë¡œìš´ ì¿ í‚¤ë¥¼ ë³´í˜¸í•˜ì§€ ì•ŠìŒ">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(ì¶”ì²œ)">
-<!ENTITY torbutton.prefs.dtd_optional "(ì„ íƒ)">
-<!ENTITY torbutton.prefs.dtd_crucial "(ì¤‘ìš”)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton ì—…ë°ì´íŠ¸ë¥¼ Torë¡œ ë””ë¼ì´ë ‰íŠ¸">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha ê°€ ê°ì§€ë˜ì—ˆì„ë•Œ ìžë™ì ìœ¼ë¡œ ë‹¤ë¥¸ ê²€ìƒ‰ ì—”ì§„ ì‚¬ìš©">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "íˆ¬ëª… Toritication (ì‚¬ìš©ìž transproxyë‚˜ Tor ë¼ìš°í„° í•„ìš”)">
 <!ENTITY torbutton.prefs.priv_caption "ê°œì¸ ì •ë³´ ì„¤ì •">
 <!ENTITY torbutton.prefs.block_disk "ë¸Œë¼ìš°ì§• ížˆìŠ¤í† ë¦¬ë‚˜ ì›¹ì‚¬ì´íŠ¸ ë°ì´í„°ë¥¼ ê¸°ë¡í•˜ì§€ ë§ˆì‹ì‹œì˜¤ (Private Browsing ëª¨ë“œ í™œì„±í™”)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
 <!ENTITY torbutton.prefs.sec_high "ë†’ìŒ">
 <!ENTITY torbutton.prefs.sec_all_js_desc "ìžë°” ìŠ¤í¬ë¦½íŠ¸ëŠ” ê¸°ë³¸ ì„¤ì •ìœ¼ë¡œ ëª¨ë“  ì‚¬ì´íŠ¸ì—ì„œ ë¹„í™œì„±í™” ë˜ì–´ ìžˆìŠµë‹ˆë‹¤.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "ëŒ€ë‹¤ìˆ˜ í¬ë§·ì˜ ìŒì„±, ì˜ìƒ íŒŒì¼ì´ ë¹„í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "ì–´ë–¤ ê¸€ì”¨ì²´ë‚˜ ì•„ì´ì½˜ì€ ì˜¬ë°”ë¥´ì§€ ì•Šê²Œ í‘œì‹œë  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ì‚¬ì´íŠ¸ ë‚´ìž¥ í°íŠ¸ê°€ ì°¨ë‹¨ë˜ì—ˆìŠµë‹ˆë‹¤.">
 <!ENTITY torbutton.prefs.sec_custom "ë§žì¶¤ ê°’">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 9bd8a41..976f38f 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð–Ð°Ñ€Ð´Ð°Ð¼">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Ð–Ð°Ò£Ñ‹ Ð¸Ð½ÑÐ°Ð½">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd
index 5b05d1d..ee12fab 100644
--- a/src/chrome/locale/lg/torbutton.dtd
+++ b/src/chrome/locale/lg/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,102 +8,21 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -117,15 +34,4 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 001c093..f3b2735 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton nustatymai">
 <!ENTITY torbutton.prefs.tor_settings "Proxy nustatymai">
 <!ENTITY torbutton.prefs.recommended_settings "Naudoti mano Firefox versijai rekomenduojamus proxy nustatymus">
-<!ENTITY torbutton.prefs.use_privoxy "Naudoti Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Naudoti Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Prievadas:">
-<!ENTITY torbutton.about.title "Apie Trobutton">
-<!ENTITY torbutton.about.version "Versija:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Atjunkite Torbutton kad pakeisti Å¡iuos nustatymus.">
 <!ENTITY torbutton.pref_connection.more_info "Daugiau informacijos">
 <!ENTITY torbutton.pref_connection_more_info.title "Pagalba">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybÄ—">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Pakeisti Tor statusÄ…">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Nustatymai...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Apie Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SlapukÅ³ apsaugos">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopijuoti Tor nuorodÄ…">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Atidaryti Tor nuorodÄ… naujame skirtuke">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Atidaryti Tor nuorodÄ… naujame lange">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Apsaugos nustatymai">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Naudoti slapukÅ³ apsaugos dialogÄ… pasirinkimui">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dinaminis turinys">
-<!ENTITY torbutton.prefs.cookies "Slapukai">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Istorija">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius">
 <!ENTITY torbutton.prefs.test_settings "Patikrinti nustatymus">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index d1abb37..c0d8df1 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton preferences">
 <!ENTITY torbutton.prefs.tor_settings "Starpnieka iestatÄ«jumi">
 <!ENTITY torbutton.prefs.recommended_settings "Lietot manai Firefox'a versijai ieteiktos starpnieka iestatÄ«jumus">
-<!ENTITY torbutton.prefs.use_privoxy "Lietot Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Lietot Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Lietot starpnieka pielÄgotus iestatÄ«jumus">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP starpnieks:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher starpnieks:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS'a viesotÄjs:">
 <!ENTITY torbutton.prefs.proxy.port "Ports:">
-<!ENTITY torbutton.about.title "Par Torbutton">
-<!ENTITY torbutton.about.version "Versija:">
-<!ENTITY torbutton.about.summary "AizsargÄ JÅ«su Tor pÄrlÅ«koÅ¡anas privÄtumu.">
-<!ENTITY torbutton.about.code "Koda izstrÄdes lÄ«dzdalÄ«bnieki:">
-<!ENTITY torbutton.about.maintainer "TurÄ“tÄjs:">
-<!ENTITY torbutton.about.security_review "DroÅ¡Ä«bas pÄrskats:">
-<!ENTITY torbutton.about.donate "Ja Jums patÄ«k lietot Tor, variet apsvÄ“rt">
-<!ENTITY torbutton.about.make_donation "ziedojuma veikÅ¡anu.">
 <!ENTITY torbutton.pref_connection.notice "AtspÄ“jot Torbutton, lai mainÄ«tu Å¡os iestatÄ«jumus.">
 <!ENTITY torbutton.pref_connection.more_info "Papildu informÄcija">
 <!ENTITY torbutton.pref_connection_more_info.title "PalÄ«dzÄ«ba">
 <!ENTITY torbutton.pref_connection_more_info.text "Å obrÄ«d Torbutton ir iespÄ“jots.  Ja vÄ“laties mainÄ«t savus Ärpus-Tor starpnieka iestatÄ«jumus, lÅ«dzu atspÄ“jojiet Torbutton un tad atgriezieties te.  Ja vÄ“laties mainÄ«t savus Tor iestatÄ«jumus, lÅ«dzu lietojiet Torbutton'a preferenÄu logu.">
 <!ENTITY torbutton.context_menu.new_identity "Jauna identitÄte">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "PÄrslÄ“gt Tor statusu">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Par Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "AtvÄ“rt tÄ«kla iestatÄ«jumus...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "LejuplÄdÄ“t PÄrlÅ«ka Tor pakotnes jauninÄjumu...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba no sÄ«kdatnÄ“m">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "KopÄ“t Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "AtvÄ“rt jaunÄ cilnÄ“ Tor'a URL">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "AtvÄ“rt jaunÄ logÄ Tor'a URL">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "NoklikÅ¡Ä·inÄt, lai inicializÄ“tu Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "DroÅ¡Ä«bas iestatÄ«jumi">
-<!ENTITY torbutton.prefs.block_thread "BloÄ·Ä“t vÄ“stures nolasi Tor'a darbÄ«bas laikÄ (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.block_thwrite "BloÄ·Ä“t vÄ“stures rakstÄ«Å¡anu Tor'a darbÄ«bas laikÄ (ieteicami)">
-<!ENTITY torbutton.prefs.block_nthread "BloÄ·Ä“t vÄ“stures nolasi Ärpus-Tor'a darbÄ«bas laikÄ (neobligÄti)">
-<!ENTITY torbutton.prefs.block_nthwrite "BloÄ·Ä“t vÄ“stures rakstÄ«Å¡anu Ärpus-Tor'a darbÄ«bas laikÄ (neobligÄti)">
-<!ENTITY torbutton.prefs.clear_history "NodzÄ“st vÄ“sturi, pÄrslÄ“dzot Tor'u (neobligÄti)">
-<!ENTITY torbutton.prefs.clear_cache "BloÄ·Ä“t Tor diska keÅ¡atmiÅ†u un iztÄ«rÄ«t visas keÅ¡atmiÅ†as, pÄrslÄ“dzot Tor'u">
-<!ENTITY torbutton.prefs.block_cache "BloÄ·Ä“t atmiÅ†as un diska keÅ¡atmiÅ†as, Tor'a darbÄ«bas laikÄ">
-<!ENTITY torbutton.prefs.cookie_jars "GlabÄt Ärpus-Tor'a sÄ«kdatnes aizsargÄtÄ traukÄ">
-<!ENTITY torbutton.prefs.cookie_protection "Lai izvÄ“lÄ“tos, lietot AizsardzÄ«bas no sÄ«kdatnÄ“m dialogu">
-<!ENTITY torbutton.prefs.mmm_cookies "Pats pÄrraudzÄ«Å¡u sÄ«kdatnes (bÄ«stami)">
-<!ENTITY torbutton.prefs.clear_cookies "NodzÄ“ts sÄ«kdatnes, pÄrslÄ“dzot Tor'u">
-<!ENTITY torbutton.prefs.disable_plugins "Tor'a lietoÅ¡anas laikÄ atspÄ“jot spraudÅ†us (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ä¶ert bÄ«stamus javascript'us (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.isolate_content "IzolÄ“t dinamisku saturu paÅ¡reizÄ“jÄ Tor stÄvokÄ¼a ietvaros (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.no_updates "Tor'a lietoÅ¡anas laikÄ atspÄ“jot atjauninÄjumus">
-<!ENTITY torbutton.prefs.set_uagent "IestatÄ«t lietotÄja aÄ£entu Tor lietoÅ¡anai (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.dynamic "Dinamisks saturs">
-<!ENTITY torbutton.prefs.cookies "SÄ«kdatnes">
-<!ENTITY torbutton.prefs.cache "KeÅ¡atmiÅ†a">
-<!ENTITY torbutton.prefs.history "VÄ“sture">
-<!ENTITY torbutton.prefs.no_search "Tor'a lietoÅ¡anas laikÄ atspÄ“jot meklÄ“Å¡anas ieteikumus (ieteicami)">
-<!ENTITY torbutton.prefs.shutdown "IzslÄ“gÅ¡ana">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor-iespÄ“jota pÄrlÅ«ka izslÄ“gÅ¡anas laikÄ izdzÄ“st Tor'a sÄ«kdatnes">
-<!ENTITY torbutton.prefs.all_shutdown "IzdzÄ“st sÄ«kdatnes jebkura pÄrlÅ«ka izslÄ“gÅ¡anÄs laikÄ">
-<!ENTITY torbutton.prefs.no_shutdown "IzslÄ“gÅ¡anÄs laikÄ neizdzÄ“st manas sÄ«kdatnes">
-<!ENTITY torbutton.prefs.disable_sessionstore "AtspÄ“jot sesijas saglabÄÅ¡anu (ieteicami)">
-<!ENTITY torbutton.prefs.headers "Galvenes">
-<!ENTITY torbutton.prefs.refererspoofing "MaldinÄÅ¡ana, norÄdot aplamas atsauces">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Vieda maldinÄÅ¡ana, Tor'a lietoÅ¡anas laikÄ norÄdot aplamas atsauces (maldina, norÄdot Å¡Ä·Ä“rsdomÄ“nu atsauces)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor'a lietoÅ¡anas laikÄ atspÄ“jot dokumentu objektu moduÄ¼a jeb DOM glabÄÅ¡anu (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.forms "Veidlapas">
-<!ENTITY torbutton.prefs.block_tforms "Tor'a darbÄ«bas laikÄ bloÄ·Ä“t parole+veidlapa saglabÄÅ¡anu (ieteicami)">
-<!ENTITY torbutton.prefs.block_ntforms "Ä€rpus-Tor'a darbÄ«bas laikÄ bloÄ·Ä“t parole+veidlapa saglabÄÅ¡anu (neobligÄti)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ä€rpus-Tor">
-<!ENTITY torbutton.prefs.restore_tor "StartÄ“jot atjaunotu sesiju, iestatÄ«t Tor stÄvokli:">
-<!ENTITY torbutton.prefs.startup_tor "StartÄ“jot pÄrlÅ«ku, iestatÄ«t Tor stÄvokli uz:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox'a avÄrijas gadÄ«jumÄ pÄrlÄdÄ“t sÄ«kdatÅ†u trauku / nodzÄ“st sÄ«kdatnes (ieteicami)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "GlabÄt gan Tor, gan Ärpus-Tor sÄ«kdatnes aizsargÄtos traukos (bÄ«stami)">
-<!ENTITY torbutton.prefs.clear_http_auth "IzdzÄ“st HTTP autentifikÄcijas sesijas (ieteicami)">
-<!ENTITY torbutton.prefs.block_js_history "IzolÄ“t piekÄ¼uvi vÄ“stures navigÄcijai tikai Tor stÄvokÄ¼a ietvaros (Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor'a izmantoÅ¡anas laikÄ mainÄ«t logu izmÄ“rus 50 px soÄ¼os (ieteicami)">
-<!ENTITY torbutton.prefs.close_tor "PÄrslÄ“dzot aizvÄ“rt visus Tor logus un cilnes (neobligÄti)">
-<!ENTITY torbutton.prefs.close_nontor "PÄrslÄ“dzot aizvÄ“rt visus Ärpus-Tor logus un cilnes (neobligÄti)">
-<!ENTITY torbutton.prefs.block_links "BloÄ·Ä“t saiÅ¡u klikÅ¡Ä·us un lapu pÄrlÄdes no citiem Tor stÄvokÄ¼iem (neobligÄti)">
-<!ENTITY torbutton.prefs.jar_certs "GlabÄt SSL sertifikÄtus atseviÅ¡Ä·os traukos Tor'am/Ä€rpus-Tor'am (ieteicami)">
-<!ENTITY torbutton.prefs.jar_ca_certs "GlabÄt sertificÄ“Å¡anas iestÄdes, SI jeb angÄ¼u val. CA sertifikÄtus atseviÅ¡Ä·os traukos Tor'am/Ä€rpus-Tor'am (ieteicami)">
-<!ENTITY torbutton.prefs.locked_mode "Karstie taustiÅ†i un Poga AtspÄ“jot, lai novÄ“rstu nejauÅ¡u pÄrslÄ“gÅ¡anos">
-<!ENTITY torbutton.prefs.startup_state "StartÄ“jot ierasti, iestatÄ«t Tor stÄvokli:">
-<!ENTITY torbutton.prefs.shutdown_state "IzslÄ“gÅ¡anas stÄvoklis">
-<!ENTITY torbutton.prefs.startup "StartÄ“Å¡ana">
-<!ENTITY torbutton.prefs.block_tor_file_net "BloÄ·Ä“t Tor piekÄ¼uvi tÄ«klam no file:// urls (ieteicami)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "BloÄ·Ä“t Ärpus-Tor piekÄ¼uvi tÄ«klam no file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusÄ“juma vÄ“rtÄ«bas">
 <!ENTITY torbutton.prefs.test_settings "PÄrbaudÄ«t iestatÄ«jumus">
-<!ENTITY torbutton.prefs.test_auto "KatrÄ Firefox startÄ“Å¡anas laikÄ pÄrbaudÄ«t manus Tor iestatÄ«jumus pÄ“c tam kad pirmo reizi pÄrslÄ“dzos">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "NerakstÄ«t Tor sÄ«kdatnes diskÄ">
-<!ENTITY torbutton.prefs.nontor_memory_jar "NerakstÄ«t Ärpus-Tor sÄ«kdatnes diskÄ">
-<!ENTITY torbutton.prefs.session_restore "Sesijas glabÄtuvÄ“ saglabÄt un no tÄs atjaunot Å¡Ä«s cilnes:">
-<!ENTITY torbutton.prefs.nontor_tabs "Cilnes, kuras ielÄdÄ“tas Ärpus-Tor'Ä">
-<!ENTITY torbutton.prefs.tor_tabs "Cilnes, kuras ielÄdÄ“tas Tor'Ä">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nav starpnieku priekÅ¡: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "BrÄ«dinÄjums: Izvairieties lietot ikvienu no augstÄk norÄdÄ«tajiem viesotÄjnosaukumiem">
-<!ENTITY torbutton.prefs.spoofreresh "MaldinÄÅ¡anas atjaunoÅ¡ana">
-<!ENTITY torbutton.prefs.refereroptions "AtsauÄu maldinÄÅ¡anas iespÄ“jas">
-<!ENTITY torbutton.prefs.nospoof "NemaldinÄt ar atsaucÄ“m">
-<!ENTITY torbutton.prefs.spoofroot "MaldinÄt ar lapas saturoÅ¡o mapi">
-<!ENTITY torbutton.prefs.spoofdomain "MaldinÄt ar domÄ“na norÄdi">
-<!ENTITY torbutton.prefs.spoofblank "PadarÄ«t atsauces tukÅ¡as">
 <!ENTITY torbutton.cookiedialog.title "PÄrvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄ“m">
 <!ENTITY torbutton.cookiedialog.lockCol "AizsargÄts">
 <!ENTITY torbutton.cookiedialog.domainCol "ViesotÄjs">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "NoÅ†emt visas, izÅ†emot aizsargÄtÄs">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄt jaunÄs sÄ«kdatnes">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄt jaunÄs sÄ«kdatnes">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor's lietoÅ¡anas laikÄ atspÄ“jot Livemark jeb dzÄ«vatzÄ«mju atjaunoÅ¡anu">
-<!ENTITY torbutton.prefs.dtd_recommended "(ieteicami)">
-<!ENTITY torbutton.prefs.dtd_optional "(neobligÄti)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ä¼oti svarÄ«gi)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "NovirzÄ«t Torbutton atjaunotnes caur Tor'u">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Sastopoties ar Google Captcha, automÄtiski lietot citu meklÄ“tÄjprogrammu:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "PÄrredzama torifikÄcija (nepiecieÅ¡ams pielÄgots pÄrstarpnieks jeb transproxy vai Tor'a marÅ¡rutÄ“tÄjs)">
 <!ENTITY torbutton.prefs.block_disk "NereÄ£istrÄ“t pÄrlÅ«koÅ¡anas vÄ“sturi vai tÄ«mekÄ¼a vietÅ†u datus (iespÄ“jo PrivÄtas pÄrlÅ«koÅ¡anas reÅ¾Ä«mu)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "IerobeÅ¾ot treÅ¡o personu sÄ«kdatnes un citus izsekoÅ¡anas datus">
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 6dc29be..3bbae13 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ° Ð½Ð° Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ° Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸">
 <!ENTITY torbutton.prefs.recommended_settings "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð³Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð° Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¸ Ð·Ð° Ð¼Ð¾Ñ˜Ð°Ñ‚Ð° Ð²ÐµÑ€Ð·Ð¸Ñ˜Ð° Ð½Ð° Ð¤Ð°Ñ˜Ñ€Ñ„Ð¾ÐºÑ">
-<!ENTITY torbutton.prefs.use_privoxy "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð³Ð¾ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð³Ð¾ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ ÑÐ¾Ð¿ÑÑ‚Ð²ÐµÐ½Ð¸ Ð¿Ñ€Ð¾ÐºÑÐ¸-Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿Ñ€Ð¾ÐºÑÐ¸:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿Ñ€Ð¾ÐºÑÐ¸:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ñ…Ð¾ÑÑ‚:">
 <!ENTITY torbutton.prefs.proxy.port "ÐŸÐ¾Ñ€Ñ‚Ð°:">
-<!ENTITY torbutton.about.title "Ð—Ð° Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Ð˜ÑÐºÐ»ÑƒÑ‡ÐµÑ‚Ðµ Ð³Ð¾ Torbutton Ð·Ð° Ð´Ð° Ð³Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¾Ð²Ð¸Ðµ Ð¿Ñ€Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°.">
 <!ENTITY torbutton.pref_connection.more_info "ÐŸÐ¾Ð²ÐµÑœÐµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸">
 <!ENTITY torbutton.pref_connection_more_info.title "ÐŸÐ¾Ð¼Ð¾Ñˆ">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ðµ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð°Ð»Ð½Ð¾ Ð²ÐºÐ»ÑƒÑ‡ÐµÐ½. Ð”Ð¾ÐºÐ¾Ð»ÐºÑƒ ÑÐ°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð³Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð° Ð½Ð° Ð’Ð°ÑˆÐµÑ‚Ð¾ Ð¿Ñ€Ð¾ÐºÑÐ¸ ÐºÐ¾Ð¸ ÑˆÑ‚Ð¾ Ð½Ðµ ÑÐµ Ð¿Ð¾Ð²Ñ€Ð·Ð°Ð½Ð¸ ÑÐ¾ Ð¢Ð¾Ñ€, Ñ‚Ð¾Ð³Ð° Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÑ‚Ðµ Ð³Ð¸ Torbutton Ð¸ Ð¿Ð¾Ñ‚Ð¾Ð° Ð²Ñ€Ð°Ñ‚ÐµÑ‚Ðµ ÑÐµ Ñ‚ÑƒÐºÐ°. Ð”Ð¾ÐºÐ¾Ð»ÐºÑƒ ÑÐ°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð³Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð° Ð·Ð° Ð¢Ð¾Ñ€, Ñ‚Ð¾Ð³Ð°Ñˆ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑ‚Ðµ Ð³Ð¾ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾Ñ‚ ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ° Ð½Ð° Ð¢Ð¾Ñ€.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¢Ð¾Ñ€ ÑÑ‚Ð°Ñ‚ÑƒÑ">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°...">
 <!ENTITY torbutton.context_menu.preferences.key "Z">
-<!ENTITY torbutton.context_menu.about "Ð—Ð° Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "Z">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ÐšÐ»Ð¸ÐºÐ½ÐµÑ‚Ðµ Ð·Ð° Ð¸Ð½Ð¸Ñ†Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°">
-<!ENTITY torbutton.prefs.block_thread "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ñ‡Ð¸Ñ‚Ð°ÑšÐµ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÐµÐ½ Ð¢Ð¾Ñ€ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_thwrite "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð·Ð°Ð¿Ð¸ÑˆÑƒÐ²Ð°ÑšÐµ Ð²Ð¾ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÐµÐ½ Ð¢Ð¾Ñ€ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_nthread "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ñ‡Ð¸Ñ‚Ð°ÑšÐµ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½ Ð¢Ð¾Ñ€ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð·Ð°Ð¿Ð¸ÑˆÑƒÐ²Ð°ÑšÐµ Ð²Ð¾ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¾ÑÐºÐ»ÑƒÑ‡ÐµÐ½ Ð¢Ð¾Ñ€ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.clear_history "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ñ˜Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.clear_cache "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð³Ð¾ Ð´Ð¸ÑÐº-ÐºÐµÑˆÐ¾Ñ‚ Ð½Ð° Ð¢Ð¾Ñ€ Ð¸ Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¾ ÑÐ¸Ð¾Ñ‚ ÐºÐµÑˆ Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.block_cache "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿ Ð´Ð¾ Ð¼ÐµÐ¼Ð¾Ñ€Ð¸ÑÐºÐ¸Ð¾Ñ‚ Ð¸ Ð´Ð¸ÑÐº-ÐºÐµÑˆÐ¾Ñ‚ Ð²Ð¾ Ð¢Ð¾Ñ€-Ñ€ÐµÐ¶Ð¸Ð¼">
-<!ENTITY torbutton.prefs.cookie_jars "Ð¡Ñ‚Ð°Ð²Ð°Ñ˜ Ð³Ð¸ Ð½Ðµ-Ð¢Ð¾Ñ€ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð²Ð¾ Ð·Ð°ÑˆÑ‚Ð¸Ñ‚ÐµÐ½Ð° Ñ‚ÐµÐ³Ð»Ð°">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "ÐœÐ°Ð½ÑƒÐµÐ»Ð½Ð¾ ÑœÐµ ÑÐµ ÑÐ¿Ñ€Ð°Ð²ÑƒÐ²Ð°Ð¼ ÑÐ¾ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cookies "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.disable_plugins "ÐÐµÐºÐ° Ð½ÐµÐ¼Ð° Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¸ Ð¿Ñ€Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ð¡Ð¿Ñ€ÐµÑ‡Ð¸ Ð³Ð¾ Ð¾Ð¿Ð°ÑÐ½Ð¸Ð¾Ñ‚ javascript ÐºÐ¾Ð´ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.isolate_content "Ð˜Ð·Ð¾Ð»Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐºÐ°Ñ‚Ð° ÑÐ¾Ð´Ñ€Ð¶Ð¸Ð½Ð° Ð²Ð¾ Ð·Ð°Ð²Ð¸ÑÐ½Ð¾ÑÑ‚ Ð¾Ð´ ÑÐ¾ÑÑ‚Ð¾Ñ˜Ð±Ð°Ñ‚Ð° Ð½Ð° Ð¢Ð¾Ñ€ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.no_updates "ÐÐµÐºÐ° Ð½ÐµÐ¼Ð° Ð°Ð¿Ð´ÐµÑ˜Ñ‚Ð¸ Ð¿Ñ€Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.set_uagent "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ñ˜Ð° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° Ð±Ñ€Ð°ÑƒÑÐµÑ€Ð¾Ñ‚ Ð·Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dynamic "Ð”Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐºÐ° ÑÐ¾Ð´Ñ€Ð¶Ð¸Ð½Ð°">
-<!ENTITY torbutton.prefs.cookies "ÐšÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°">
-<!ENTITY torbutton.prefs.cache "ÐšÐµÑˆ">
-<!ENTITY torbutton.prefs.history "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°">
-<!ENTITY torbutton.prefs.no_search "Ð˜ÑÐºÐ»ÑƒÑ‡Ð¸ Ð³Ð¸ Ð¿Ñ€ÐµÐ±Ð°Ñ€ÑƒÐ²Ð°Ñ‡ÐºÐ¸Ñ‚Ðµ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð·Ð¸ Ð·Ð° Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð¢Ð¾Ñ€ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.shutdown "Ð˜ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.tor_shutdown "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¸ Ð¢Ð¾Ñ€-ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð¿Ñ€Ð¸ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ð½ Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.all_shutdown "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ ÑÐµÐºÐ¾Ðµ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ð±Ñ€Ð°ÑƒÑÐµÑ€Ð¾Ñ‚">
-<!ENTITY torbutton.prefs.no_shutdown "ÐÐµ Ð³Ð¸ Ð±Ñ€Ð¸ÑˆÐ¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.disable_sessionstore "ÐÐµ Ñ˜Ð° Ð·Ð°Ñ‡ÑƒÐ²ÑƒÐ²Ð°Ñ˜ ÑÐµÑÐ¸Ñ˜Ð°Ñ‚Ð° (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.headers "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "ÐÐµ Ð³Ð¾ ÑÐ½Ð¸Ð¼Ð°Ñ˜ ÑÐºÐµÐ»ÐµÑ‚Ð¾Ñ‚ (DOM) Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð°Ñ‚Ð° Ð¿Ñ€Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€Ð¸">
-<!ENTITY torbutton.prefs.block_tforms "ÐÐµ ÑÐ½Ð¸Ð¼Ð°Ñ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ð¸ Ð¿Ð¾Ð¿Ð¾Ð»Ð½ÐµÑ‚Ð¸ Ñ„Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€Ð¸ Ð·Ð° Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð¢Ð¾Ñ€ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_ntforms "ÐÐµ ÑÐ½Ð¸Ð¼Ð°Ñ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ð¸ Ð¿Ð¾Ð¿Ð¾Ð»Ð½ÐµÑ‚Ð¸ Ñ„Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€Ð¸ Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½ Ð¢Ð¾Ñ€ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.tor "Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.non_tor "ÐÐµ-Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.restore_tor "ÐŸÑ€Ð¸ Ñ€ÐµÑÑ‚Ð°Ð²Ñ€Ð¸Ñ€Ð°ÑšÐµ Ð¾Ð´ Ð·Ð°Ñ‡ÑƒÐ²Ð°Ð½Ð° ÑÐµÑÐ¸Ñ˜Ð°, Ð¿Ñ€ÐµÑ„Ñ€Ð»Ð¸ ÑÐµ Ð²Ð¾ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ñ‚:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¸ Ð¸Ð»Ð¸ Ð¿Ð°Ðº Ð²Ñ‡Ð¸Ñ‚Ð°Ñ˜ Ð³Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¿Ð°Ð´ Ð½Ð° Ð¤Ð°Ñ˜Ñ€Ñ„Ð¾ÐºÑ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ð¡Ñ‚Ð°Ð²Ð°Ñ˜ Ð³Ð¸ Ð¸ Ð¢Ð¾Ñ€- Ð¸ Ð½Ðµ-Ð¢Ð¾Ñ€-ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð²Ð¾ Ð·Ð°ÑˆÑ‚Ð¸Ñ‚ÐµÐ½Ð¸ Ñ‚ÐµÐ³Ð»Ð¸ (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_http_auth "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð³Ð¸ ÑÐµÑÐ¸Ð¸Ñ‚Ðµ ÑÐ¾ HTTP-Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_js_history "Ð˜Ð·Ð¾Ð»Ð¸Ñ€Ð°Ñ˜ Ð³Ð¾ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿Ð¾Ñ‚ Ð´Ð¾ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° ÑÐ¿Ð¾Ñ€ÐµÐ´ Ð¢Ð¾Ñ€-Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ñ‚ (ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ð—Ð³Ð¾Ð»ÐµÐ¼ÑƒÐ²Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¸ Ð·Ð° Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð¢Ð¾Ñ€ Ð½ÐµÐºÐ° ÑÐµ Ð²Ñ€ÑˆÐ¸ Ð²Ð¾ Ñ‡ÐµÐºÐ¾Ñ€Ð¸ Ð¾Ð´ Ð¿Ð¾ 50 Ð¿Ð¸ÐºÑÐµÐ»Ð¸ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.close_tor "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ Ð³Ð¸ ÑÐ¸Ñ‚Ðµ Ð¢Ð¾Ñ€-Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¸ Ð¸ Ñ‚Ð°Ð±Ð¾Ð²Ð¸ Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.close_nontor "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ Ð³Ð¸ ÑÐ¸Ñ‚Ðµ Ð½Ðµ-Ð¢Ð¾Ñ€-Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¸ Ð¸ Ñ‚Ð°Ð±Ð¾Ð²Ð¸ Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.block_links "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð³Ð¾ ÑÐ»ÐµÐ´ÐµÑšÐµÑ‚Ð¾ Ð»Ð¸Ð½ÐºÐ¾Ð²Ð¸ Ð¸Ð»Ð¸ Ð²Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸ Ð¾Ð´ Ð´Ñ€ÑƒÐ³ Ð¢Ð¾Ñ€-Ñ€ÐµÐ¶Ð¸Ð¼ (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.jar_certs "Ð¡Ñ‚Ð°Ð²Ð°Ñ˜ Ð³Ð¸ SSL-ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð¾ Ð¿Ð¾ÑÐµÐ±Ð½Ð¸ Ñ‚ÐµÐ³Ð»Ð¸ Ð·Ð° Ð¢Ð¾Ñ€ Ð¸ Ð½Ðµ-Ð¢Ð¾Ñ€ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Ð¡Ñ‚Ð°Ð²Ð°Ñ˜ Ð³Ð¸ CA-ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð¾ Ð¿Ð¾ÑÐµÐ±Ð½Ð¸ Ñ‚ÐµÐ³Ð»Ð¸ Ð·Ð° Ð¢Ð¾Ñ€ Ð¸ Ð½Ðµ-Ð¢Ð¾Ñ€ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.locked_mode "Ð¡ÐºÑ€Ð¸Ñ˜ Ð³Ð¾ ÐºÐ¾Ð¿Ñ‡ÐµÑ‚Ð¾ Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡Ð¸ Ð³Ð¸ ÐºÑ€Ð°Ñ‚ÐµÐ½ÐºÐ¸Ñ‚Ðµ Ð½Ð° Ñ‚Ð°ÑÑ‚Ð°Ñ‚ÑƒÑ€Ð° Ð·Ð° Ð´Ð° ÑÐµ ÑÐ¿Ñ€ÐµÑ‡Ð¸ ÑÐ»ÑƒÑ‡Ð°Ñ˜Ð½Ð¾ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.startup_state "ÐŸÑ€Ð¸ Ð½Ð¾Ñ€Ð¼Ð°Ð»Ð½Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð°ÑšÐµ, Ð¾Ð´Ð¸ Ð²Ð¾ Ñ€ÐµÐ¶Ð¸Ð¼:">
-<!ENTITY torbutton.prefs.shutdown_state "Ð ÐµÐ¶Ð¸Ð¼ Ð¿Ñ€Ð¸ Ð¸ÑÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.startup "ÐŸÐ¾Ð´Ð¸Ð³Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ð¡Ð¿Ñ€ÐµÑ‡Ð¸ Ð³Ð¾ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿Ð¾Ñ‚ Ð´Ð¾ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð° Ð¿Ñ€ÐµÐºÑƒ Ð¢Ð¾Ñ€ Ð·Ð° Ð°Ð´Ñ€ÐµÑÐ¸Ñ‚Ðµ file:// (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ð¡Ð¿Ñ€ÐµÑ‡Ð¸ Ð³Ð¾ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿Ð¾Ñ‚ Ð´Ð¾ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð° Ð¿Ñ€ÐµÐºÑƒ Ð½Ðµ-Ð¢Ð¾Ñ€ Ð·Ð° Ð°Ð´Ñ€ÐµÑÐ¸Ñ‚Ðµ file://">
 <!ENTITY torbutton.prefs.restore_defaults "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°">
 <!ENTITY torbutton.prefs.test_settings "Ð¢ÐµÑÑ‚Ð¸Ñ€Ð°Ñ˜ Ð³Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð°">
-<!ENTITY torbutton.prefs.test_auto "Ð¢ÐµÑÑ‚Ð¸Ñ€Ð°Ñ˜ Ð³Ð¸ Ð¢Ð¾Ñ€-Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð° Ð¿Ñ€Ð¸ ÑÐµÐºÐ¾Ðµ Ð¿Ð¾Ð´Ð¸Ð³Ð°ÑšÐµ Ð½Ð° Ð¤Ð°Ñ˜Ñ€Ñ„Ð¾ÐºÑ">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "ÐÐµ Ð³Ð¸ ÑÐ½Ð¸Ð¼Ð°Ñ˜ Ð¢Ð¾Ñ€-ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ÐÐµ Ð³Ð¸ ÑÐ½Ð¸Ð¼Ð°Ñ˜ Ð½Ðµ-Ð¢Ð¾Ñ€-ÐºÐ¾Ð»Ð°Ñ‡Ð¸ÑšÐ°Ñ‚Ð° Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.session_restore "Ð¡Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ Ñ‚Ð°Ð±Ð¾Ð²Ð¸ Ð½ÐµÐºÐ° ÑÐµ Ð·Ð°Ñ‡ÑƒÐ²Ð°Ð°Ñ‚ Ð·Ð° Ñ€ÐµÑÑ‚Ð°Ð²Ñ€Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° ÑÐµÑÐ¸Ñ˜Ð°:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ð¢Ð°Ð±Ð¾Ð²Ð¸ Ð²Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ Ð²Ð¾ Ð½Ðµ-Ð¢Ð¾Ñ€-Ñ€ÐµÐ¶Ð¸Ð¼">
-<!ENTITY torbutton.prefs.tor_tabs "Ð¢Ð°Ð±Ð¾Ð²Ð¸ Ð²Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ Ð²Ð¾ Ð¢Ð¾Ñ€-Ñ€ÐµÐ¶Ð¸Ð¼">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ð‘ÐµÐ· Ð¿Ñ€Ð¾ÐºÑÐ¸Ñ€Ð°ÑšÐµ Ð·Ð°: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ: Ð¸Ð·Ð±ÐµÐ³Ð½ÑƒÐ²Ð°Ñ˜Ñ‚Ðµ Ð´Ð° Ð½Ð°Ð²ÐµÐ´ÑƒÐ²Ð°Ñ‚Ðµ Ñ…Ð¾ÑÑ‚Ð¾Ð²Ð¸ Ð¿Ð¾Ð³Ð¾Ñ€Ðµ">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "ÐÐµÐºÐ° Ð½ÐµÐ¼Ð° Ð¾ÑÐ²ÐµÐ¶ÑƒÐ²Ð°ÑšÐµ Ð½Ð° livemarks Ð¿Ñ€Ð¸ ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð° Ð½Ð° Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)">
-<!ENTITY torbutton.prefs.dtd_crucial "(ÐºÐ»ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "ÐŸÑ€ÐµÐ½Ð°ÑÐ¾Ñ‡Ð¸ Ð³Ð¸ Ð°Ð¿Ð´ÐµÑ˜Ñ‚Ð¸Ñ‚Ðµ Ð½Ð° Torbutton Ð½Ð¸Ð· Ð¢Ð¾Ñ€">
-<!ENTITY torbutton.prefs.dodge_google_captcha "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑšÐµ Ð½Ð° Ð°Ð»Ñ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²ÐµÐ½ Ð¿Ñ€ÐµÐ±Ð°Ñ€ÑƒÐ²Ð°Ñ‡ ÐºÐ¾Ð³Ð° ÑÐµ Ð²Ñ€Ð°ÑœÐ° Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index b962348..83c42e9 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton á€¦á€¸á€…á€¬á€¸á€•á€±á€¸á€á€»á€€á€ºá€™á€»á€¬á€¸">
 <!ENTITY torbutton.prefs.tor_settings "á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
 <!ENTITY torbutton.prefs.recommended_settings "á€€á€»á€½á€”á€ºá€á€±á€¬á€ºá€· á€™á€®á€¸á€œá€»á€¾á€¶á€™á€¼á€±á€á€½á€±á€¸ á€—á€¬á€¸á€›á€¾á€„á€ºá€¸á€¡á€á€½á€€á€º á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€±á€¬ á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€¡á€žá€¯á€¶á€¸á€•á€¼á€¯á€›á€”á€º">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy á€€á€á€¯ á€žá€¯á€¶á€¸á€›á€”á€º">
 <!ENTITY torbutton.prefs.use_polipo "Polipo á€€á€á€¯ á€žá€¯á€¶á€¸á€›á€”á€º">
 <!ENTITY torbutton.prefs.custom_settings "á€…á€á€á€ºá€€á€¼á€á€¯á€€á€º á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€žá€¯á€¶á€¸á€›á€”á€º">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP á€•á€›á€±á€¬á€€á€ºá€‡á€® -">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á€•á€›á€±á€¬á€€á€ºá€‡á€® -">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host -">
 <!ENTITY torbutton.prefs.proxy.port "Port -">
-<!ENTITY torbutton.about.title "Torbutton á€¡á€€á€¼á€±á€¬á€„á€ºá€¸">
-<!ENTITY torbutton.about.version "á€—á€¬á€¸á€›á€¾á€„á€ºá€¸ - ">
-<!ENTITY torbutton.about.summary "á€žá€„á€ºá€· Tor  á€–á€½á€„á€ºá€·á€€á€¼á€Šá€ºá€·á€á€¼á€„á€ºá€¸ á€žá€®á€¸á€á€¼á€¬á€¸á€›á€•á€ºá€á€Šá€ºá€™á€¾á€¯á€€á€á€¯ á€€á€¬á€€á€½á€šá€ºá€•á€«á‹">
-<!ENTITY torbutton.about.code "á€€á€¯á€’á€º á€•á€«á€á€„á€º á€›á€±á€¸á€žá€¬á€¸á€žá€°á€™á€»á€¬á€¸ -">
-<!ENTITY torbutton.about.maintainer "á€‘á€á€”á€ºá€¸á€žá€á€™á€ºá€¸á€žá€° -">
-<!ENTITY torbutton.about.security_review "á€œá€¯á€¶á€á€¼á€¯á€¶á€›á€±á€¸á€†á€á€¯á€„á€ºá€›á€¬ á€žá€¯á€¶á€¸á€žá€•á€ºá€á€»á€€á€º -">
-<!ENTITY torbutton.about.donate "á€¡á€€á€šá€ºá Tor á€€á€á€¯ á€žá€„á€º á€¡á€žá€¯á€¶á€¸á€•á€¼á€¯á€œá€á€¯á€œá€»á€¾á€„á€ºáŠ á€žá€„á€º á€…á€‰á€ºá€¸á€…á€¬á€¸á€žá€„á€ºá€·á€žá€Šá€º">
-<!ENTITY torbutton.about.make_donation "á€œá€¾á€°á€’á€«á€”á€ºá€¸á€™á€¾á€¯ á€•á€¼á€¯á€œá€¯á€•á€ºá€•á€«á‹">
 <!ENTITY torbutton.pref_connection.notice "á€¡á€²á€’á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€¼á€±á€¬á€„á€ºá€¸á€›á€”á€º Torbutton á€€á€á€¯ á€•á€á€á€ºá€•á€«á‹">
 <!ENTITY torbutton.pref_connection.more_info "á€”á€±á€¬á€€á€ºá€‘á€•á€º á€¡á€á€»á€€á€ºá€¡á€œá€€á€ºá€™á€»á€¬á€¸">
 <!ENTITY torbutton.pref_connection_more_info.title "á€¡á€€á€°á€¡á€Šá€®">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton á€€á€á€¯ á€œá€±á€¬á€œá€±á€¬á€†á€šá€º á€–á€½á€„á€ºá€·á€‘á€¬á€¸á€žá€Šá€ºá‹ á€¡á€€á€šá€ºá á€žá€„á€ºá€· Tor á€•á€›á€±á€¬á€€á€ºá€‡á€® á€™á€žá€¯á€¶á€¸á€žá€±á€¬ á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€¼á€±á€¬á€„á€ºá€¸á€œá€á€¯á€œá€»á€¾á€„á€ºáŠ Torbutton á€€á€á€¯ á€•á€á€á€ºá€•á€¼á€®á€¸ á€¤á€”á€±á€›á€¬á€žá€á€¯á€· á€•á€¼á€”á€ºá€œá€¬á€•á€«á‹ á€¡á€€á€šá€ºá á€žá€„á€ºá€· Tor á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€¼á€±á€¬á€„á€ºá€¸á€œá€á€¯á€•á€«á€€áŠ Torbutton á€¦á€¸á€…á€¬á€¸á€•á€±á€¸á€™á€¾á€¯ á€á€„á€ºá€¸á€’á€á€¯á€¸á€€á€á€¯ á€žá€¯á€¶á€¸á€…á€½á€²á€•á€«á‹">
 <!ENTITY torbutton.context_menu.new_identity "á€¡á€‘á€±á€¬á€€á€ºá€¡á€‘á€¬á€¸ á€¡á€žá€…á€º">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Tor status á€€á€á€¯ á€‘á€á€”á€ºá€¸â€‹á€€á€»á€±á€¬á€„á€ºá€¸á€›á€”á€º">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "á€¦á€¸á€…á€¬á€¸á€•á€±á€¸á€á€»á€€á€ºá€™á€»á€¬á€¸...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbutton á€¡á€€á€¼á€±á€¬á€„á€ºá€¸...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "á€€á€½á€á€ºá€€á€®á€¸ á€€á€¬á€€á€½á€šá€ºá€™á€¾á€¯á€™á€»á€¬á€¸">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Tor URL á€€á€á€¯ á€€á€±á€¬á€ºá€•á€®á€¸á€€á€°á€¸á€›á€”á€º">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Tor URL á€€á€á€¯ á€…á€¬á€¡á€™á€¾á€á€ºá€žá€…á€ºá€á€½á€„á€º á€–á€½á€„á€ºá€·á€›á€”á€º">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Tor URL á€€á€á€¯ á€á€„á€ºá€¸á€’á€á€¯á€¸á€žá€…á€ºá€á€½á€„á€º á€–á€½á€„á€ºá€·á€›á€”á€º">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbutton á€€á€á€¯ á€¡á€…á€•á€¼á€¯á€›á€”á€º á€”á€¾á€á€•á€ºá€•á€«á‹">
-<!ENTITY torbutton.prefs.sec_settings "á€œá€¯á€¶á€á€¼á€¯á€¶á€›á€±á€¸ á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.block_thread "Tor á€¡á€œá€¯á€•á€ºá€œá€¯á€•á€ºá€”á€±á€žá€Šá€ºá€·á€¡á€á€« á€™á€¾á€á€ºá€á€™á€ºá€¸á€á€„á€º á€–á€á€ºá€›á€¾á€¯á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€›á€±á€¸á€•á€«á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor á€¡á€œá€¯á€•á€ºá€œá€¯á€•á€ºá€”á€±á€žá€Šá€ºá€·á€¡á€á€« á€™á€¾á€á€ºá€á€™á€ºá€¸á€á€„á€º á€›á€±á€¸á€žá€¬á€¸á€á€¼á€„á€ºá€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.block_nthread "Tor á€¡á€žá€¯á€¶á€¸á€™á€•á€¼á€¯á€žá€Šá€ºá€·á€¡á€á€« á€™á€¾á€á€ºá€á€™á€ºá€¸á€á€„á€º á€–á€á€ºá€›á€¾á€¯á€á€¼á€„á€ºá€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€œá€á€¯á€¡á€•á€ºá€•á€«á€€)">
-<!ENTITY torbutton.prefs.block_nthwrite "Tor á€¡á€žá€¯á€¶á€¸á€™á€•á€¼á€¯á€žá€Šá€ºá€·á€¡á€á€« á€™á€¾á€á€ºá€á€™á€ºá€¸á€á€„á€º á€›á€±á€¸á€žá€¬á€¸á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€œá€á€¯á€¡á€•á€ºá€•á€«á€€)">
-<!ENTITY torbutton.prefs.clear_history "Tor á€‘á€á€”á€ºá€¸á€€á€»á€±á€¬á€„á€ºá€¸á€™á€¾á€¯ á€™á€¾á€á€ºá€á€™á€ºá€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€•á€« (á€œá€á€¯á€¡á€•á€ºá€•á€«á€€)">
-<!ENTITY torbutton.prefs.clear_cache "Tor disk â€‹á€šá€¬á€šá€® á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€á€”á€ºá€¸á€€á€á€¯ á€•á€á€á€ºá€•á€¼á€®á€¸ Tor á€¡á€‘á€á€”á€ºá€¸á€™á€¾ á€šá€¬á€šá€®á€–á€á€¯á€„á€ºá€™á€»á€¬á€¸ á€¡á€¬á€¸á€œá€¯á€¶á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€•á€«">
-<!ENTITY torbutton.prefs.block_cache "Tor á€¡á€œá€¯á€•á€ºá€œá€¯á€•á€ºâ€‹â€‹â€‹á€”á€±á€…á€‰á€º Disk á€”á€¾á€„á€ºá€· á€™á€¾á€á€ºá€‰á€¬á€á€ºá€á€½á€„á€ºá€¸ á€šá€¬á€šá€® á€á€„á€ºá€›á€±á€¬á€€á€ºá€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.cookie_jars "á€€á€¬á€€á€½á€šá€ºá€‘á€¬á€¸á€žá€Šá€ºá€· jar á€‘á€²á€á€½á€„á€º Tor  á€™á€Ÿá€¯á€á€ºâ€‹â€‹â€‹â€‹â€‹â€‹á€žá€±á€¬ á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ á€žá€á€™á€ºá€¸á€›á€”á€º">
-<!ENTITY torbutton.prefs.cookie_protection "á€›á€½á€±á€¸á€á€»á€šá€ºá€›á€”á€º á€€á€½á€á€ºá€€á€®á€¸ á€¡á€€á€¬á€¡á€€á€½á€šá€ºá€™á€»á€¬á€¸ á€¡á€Šá€½á€¾á€”á€ºá€¸á€…á€¬á€™á€»á€€á€ºá€”á€¾á€¬á€€á€á€¯ á€žá€¯á€¶á€¸á€›á€”á€º">
-<!ENTITY torbutton.prefs.mmm_cookies "á€€á€»á€½á€”á€ºá€á€±á€¬á€ºá€· á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ á€€á€»á€½á€”á€ºá€á€±á€¬á€º á€€á€á€¯á€šá€ºá€á€á€¯á€„á€º á€…á€®á€™á€¶á€á€”á€ºá€·á€á€½á€²á€™á€Šá€º (á€¡á€”á€¹á€á€›á€¬á€šá€ºá€›á€¾á€á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor á€¡á€‘á€á€”á€ºá€¸á€•á€±á€«á€ºá€€ á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€›á€”á€º">
-<!ENTITY torbutton.prefs.disable_plugins "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€¡á€á€½á€„á€ºá€¸ á€•á€œá€•á€ºá€¡á€„á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.kill_bad_js "á€¡á€”á€¹á€á€›á€¬á€šá€ºá€›á€¾á€á€žá€±á€¬ javascript á€€á€á€¯ á€á€»á€á€á€ºá€‘á€¬á€¸á€›á€”á€º (á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.isolate_content "á€á€€á€ºá€€á€¼á€½á€žá€±á€¬ á€¡á€€á€¼á€±á€¬á€„á€ºá€¸á€¡á€›á€¬á€€á€á€¯ Tor á€¡á€á€¼á€±á€¡á€”á€±áŒ á€žá€®á€¸á€á€¼á€¬á€¸á€‘á€¬á€¸á€›á€”á€º (á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.no_updates "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º á€™á€½á€™á€ºá€¸á€™á€¶á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.set_uagent "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€™á€¾á€¯á€¡á€á€½á€€á€º á€žá€¯á€¶á€¸á€…á€½á€²á€žá€° á€¡á€±á€¸á€‚á€»á€„á€ºá€·á€€á€á€¯ á€žá€á€ºá€™á€¾á€á€ºá€›á€”á€º (á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.dynamic "á€á€€á€ºá€€á€¼á€½á€žá€±á€¬ á€¡á€€á€¼á€±á€¬á€„á€ºá€¸á€¡á€›á€¬">
-<!ENTITY torbutton.prefs.cookies "á€€á€½á€€á€ºá€€á€®á€¸á€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.cache "á€šá€¬á€šá€® á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€á€”á€ºá€¸">
-<!ENTITY torbutton.prefs.history "á€™á€¾á€á€ºá€á€™á€ºá€¸">
-<!ENTITY torbutton.prefs.no_search "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€¡á€á€½á€„á€ºá€¸ á€›á€¾á€¬á€–á€½á€±á€™á€¾á€¯ á€¡á€€á€¼á€¶á€•á€¼á€¯á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.shutdown "á€…á€€á€ºá€•á€á€á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor á€žá€¯á€¶á€¸á€‘á€¬á€¸á€žá€±á€¬ á€˜á€›á€±á€¬á€„á€ºá€†á€¬á€€á€á€¯ á€•á€á€á€ºá€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º Tor  á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€›á€”á€º">
-<!ENTITY torbutton.prefs.all_shutdown "á€˜á€›á€±á€¬á€„á€ºá€†á€¬ á€•á€á€á€ºá€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€›á€”á€º">
-<!ENTITY torbutton.prefs.no_shutdown "á€…á€€á€ºá€•á€á€á€ºá€á€»á€á€”á€ºá€á€½á€„á€º á€€á€»á€½á€”á€ºá€á€±á€¬á€ºá€· á€€á€½á€€á€ºá€€á€®á€¸á€€á€á€¯ á€™á€›á€¾á€„á€ºá€¸á€•á€«á€”á€¾á€„á€ºá€·">
-<!ENTITY torbutton.prefs.disable_sessionstore "á€œá€¯á€•á€ºá€„á€”á€ºá€¸ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.headers "á€á€±á€«á€„á€ºá€¸á€…á€Šá€ºá€¸á€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.refererspoofing "á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€žá€° á€•á€¯á€¶á€™á€¾á€¬á€¸á€›á€á€¯á€€á€ºá€á€¼á€„á€ºá€¸">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€¡á€á€½á€„á€ºá€¸ á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€á€»á€€á€º á€•á€¯á€¶á€™á€¾á€¬á€¸á€›á€á€¯á€€á€ºá€á€¼á€„á€ºá€¸á€€á€á€¯ á€•á€¼á€„á€ºá€›á€”á€º(á€’á€á€¯á€™á€á€”á€ºá€¸ á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€¯á€¶á€™á€¾á€¬á€¸á€›á€á€¯á€€á€ºá€á€»á€€á€ºá€™á€»á€¬á€¸)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€á€»á€á€”á€ºá€á€½á€„á€º DOM á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.forms "á€–á€¼á€Šá€ºá€·á€…á€½á€á€ºá€•á€¯á€¶á€…á€¶á€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.block_tforms "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º á€…á€€á€¬á€¸á€á€¾á€€á€º+á€–á€¼á€Šá€ºá€·á€…á€½á€á€ºá€•á€¯á€¶á€…á€¶ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º(á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.block_ntforms "Tor á€™á€•á€«á€•á€² á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º á€…á€€á€¬á€¸á€á€¾á€€á€º+á€–á€¼á€Šá€ºá€·á€…á€½á€á€ºá€•á€¯á€¶á€…á€¶ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º(á€œá€á€¯á€¡á€•á€ºá€•á€«á€€)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€ºá€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.restore_tor "á€œá€¯á€•á€ºâ€‹á€„á€”á€ºá€¸ á€…á€á€„á€ºá€”á€±á€…á€‰á€ºáŠ Tor á€¡á€á€¼á€±á€¡á€”á€± á€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€ºá€· á€•á€¯á€¶á€…á€¶ -">
-<!ENTITY torbutton.prefs.startup_tor "á€˜á€›á€±á€¬á€„á€ºá€†á€¬ á€–á€½á€„á€ºá€·á€”á€±á€…á€‰á€ºáŠ Tor á€¡á€á€¼á€±á€¡á€”á€± á€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€ºá€· á€•á€¯á€¶á€…á€¶ -">
-<!ENTITY torbutton.prefs.reload_crashed_jar "á€™á€®á€¸â€‹á€œá€»á€¾á€¶á€™á€¼á€±á€á€½á€±á€¸ á€•á€»á€€á€ºá€žá€Šá€ºá€·á€¡á€á€« á€€á€½á€á€ºá€€á€®á€¸ jar á€€á€á€¯ á€•á€¼á€”á€ºá€–á€½á€„á€ºá€·á€›á€”á€º/á€€á€½á€á€ºá€€á€®á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tor á€”á€¾á€„á€ºá€· Tor á€™á€•á€«á€žá€±á€¬ á€€á€½á€á€ºá€€á€®á€¸ á€”á€¾á€…á€ºá€á€¯á€…á€œá€¯á€¶á€¸á€€á€á€¯ á€€á€¬á€€á€½á€šá€ºá€‘á€¬á€¸á€žá€Šá€ºá€· jar á€™á€»á€¬á€¸á€‘á€²áŒ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€›á€”á€º (á€¡á€”á€¹á€á€›á€¬á€šá€ºá€›á€¾á€á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTP auth á€œá€¯á€•á€ºá€„á€”á€ºá€¸á€™á€»á€¬á€¸á€€á€á€¯ á€›á€¾á€„á€ºá€¸á€œá€„á€ºá€¸á€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.block_js_history "Tor á€¡á€á€¼á€±á€¡á€”á€±á€‘á€² á€™á€¾á€á€ºá€á€™á€ºá€¸ á€œá€™á€ºá€¸á€€á€¼á€±á€¬á€„á€ºá€¸ á€á€„á€ºá€›á€±á€¬á€€á€ºá€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (â€‹á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º á€á€„á€ºá€¸á€’á€á€¯á€¸á€€á€á€¯ á…á€ px á€¡á€›á€½á€šá€º á€•á€½á€¬á€¸á€›á€”á€º á€¡á€›á€½á€šá€ºá€Šá€¾á€á€•á€« (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.close_tor "á€¡á€‘á€á€”á€ºá€¸á€•á€±á€«á€ºá€›á€¾á€ Tor á€á€„á€ºá€¸á€’á€á€¯á€¸á€”á€¾á€„á€ºá€· á€…á€¬á€¡á€™á€¾á€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€œá€á€¯á€¡á€•á€ºá€œá€»á€¾á€„á€º)">
-<!ENTITY torbutton.prefs.close_nontor "Tor á€™á€•á€«á€žá€±á€¬ á€á€„á€ºá€¸á€’á€á€¯á€¸á€”á€¾á€„á€ºá€· á€…á€¬á€¡á€™á€¾á€á€º á€¡á€¬á€¸á€œá€¯á€¶á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€œá€á€¯á€¡á€•á€ºá€œá€»á€¾á€„á€º)">
-<!ENTITY torbutton.prefs.block_links "Tor á€¡á€á€¼á€±á€¡á€”á€± á€¡á€™á€»á€á€¯á€¸á€™á€»á€á€¯á€¸á€™á€¾ á€”á€¾á€á€•á€ºá€á€»á€€á€ºá€™á€»á€¬á€¸á€”á€¾á€„á€ºá€· á€…á€¬á€™á€»á€€á€ºá€”á€¾á€¬ á€•á€¼á€”á€ºá€–á€½á€„á€ºá€·á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€œá€á€¯á€¡á€•á€ºá€œá€»á€¾á€„á€º)">
-<!ENTITY torbutton.prefs.jar_certs "Tor/Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€ºá€™á€»á€¬á€¸ á€¡á€á€½á€€á€º SSL á€œá€€á€ºá€™á€¾á€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€žá€®á€¸á€á€¼á€¬á€¸ jar á€‘á€²áŒ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Tor/Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€º á€¡á€á€½á€€á€º CA á€œá€€á€ºá€™á€¾á€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€žá€®á€¸á€á€¼á€¬á€¸ jar á€‘á€²áŒ á€žá€á€™á€ºá€¸á€‘á€¬á€¸á€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.locked_mode "á€™á€á€±á€¬á€ºá€á€† á€¡á€–á€½á€„á€ºá€·á€¡á€•á€á€á€º á€•á€¼á€¯á€œá€¯á€•á€ºá€á€¼á€„á€ºá€¸á€€á€á€¯ á€€á€¬á€€á€½á€šá€ºá€›á€”á€º á€á€œá€¯á€á€ºá€™á€»á€¬á€¸á€”á€¾á€„á€ºá€· Hotkeys á€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.startup_state "á€•á€¯á€¶á€™á€¾á€”á€º á€á€„á€ºá€¸á€’á€á€¯á€¸á€¡á€á€€á€ºá€á€½á€„á€ºáŠ Tor á€¡á€á€¼á€±á€¡á€”á€±á€€á€á€¯ á€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€ºá€· á€•á€¯á€¶á€…á€¶ -">
-<!ENTITY torbutton.prefs.shutdown_state "á€…á€€á€ºá€•á€á€á€ºá€žá€Šá€ºá€· á€¡á€á€¼á€±á€¡á€”á€±">
-<!ENTITY torbutton.prefs.startup "á€á€„á€ºá€¸á€’á€á€¯á€¸ á€¡á€á€€á€º">
-<!ENTITY torbutton.prefs.block_tor_file_net "file:// urls á€™á€¾ á€€á€½á€”á€ºá€›á€€á€ºá€žá€á€¯á€· Tor á€á€„á€ºá€›á€¬á€€á€ºá€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º (á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "file://urls á€™á€¾ á€€á€½á€”á€ºá€›á€€á€ºá€žá€á€¯á€· Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€º á€á€„á€ºá€›á€±á€¬á€€á€ºá€™á€¾á€¯á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º">
 <!ENTITY torbutton.prefs.restore_defaults " á€™á€°á€œá€¡á€á€á€¯á€„á€ºá€¸ á€•á€¼á€”á€ºá€‘á€¬á€¸á€›á€”á€º">
 <!ENTITY torbutton.prefs.test_settings "á€…á€…á€ºá€†á€±á€¸á€™á€¾á€¯ á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.test_auto "á€™á€®á€¸á€œá€»á€¾á€¶á€™á€¼á€±á€á€½á€±á€¸ á€…á€–á€½á€„á€ºá€·á€žá€Šá€ºá€·á€¡á€á€« á€€á€»á€½á€”á€ºá€á€±á€¬á€ºá€· Tor á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€…á€™á€ºá€¸á€žá€•á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ disk á€‘á€² á€›á€±á€¸á€žá€¬á€¸á€á€¼á€„á€ºá€¸ á€™á€•á€¼á€¯á€›á€”á€º">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€ºá€™á€¾ á€€á€½á€á€ºá€€á€®á€¸á€™á€»á€¬á€¸á€€á€á€¯ disk á€‘á€² á€›á€±á€¸á€žá€¬á€¸á€á€¼á€„á€ºá€¸ á€™á€•á€¼á€¯á€›á€”á€º">
-<!ENTITY torbutton.prefs.session_restore "á€œá€¯á€•á€ºá€„á€”á€ºá€¸ á€žá€á€¯á€œá€¾á€±á€¬á€„á€ºá€‘á€¬á€¸á€™á€¾á€¯á€€á€á€¯ á€žá€á€™á€ºá€¸á€†á€Šá€ºá€¸á€•á€¼á€®á€¸ á€…á€¬á€¡á€™á€¾á€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€¼á€”á€ºá€‘á€¬á€¸á€›á€”á€º -">
-<!ENTITY torbutton.prefs.nontor_tabs "Tor á€™á€Ÿá€¯á€á€ºá€žá€±á€¬ á€•á€›á€á€¯á€‚á€›á€™á€ºá€™á€¾ á€…á€¬á€¡á€™á€¾á€á€ºá€™á€»á€¬á€¸ á€–á€½á€„á€ºá€·á€‘á€¬á€¸á€á€»á€€á€º">
-<!ENTITY torbutton.prefs.tor_tabs "Tor á€™á€¾ á€…á€¬á€¡á€™á€¾á€á€ºá€™á€»á€¬á€¸ á€–á€½á€„á€ºá€·á€‘á€¬á€¸á€á€»á€€á€º">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "á€•á€›á€±á€¬á€€á€ºá€‡á€® á€™á€œá€á€¯á€¡á€•á€ºá€žá€Šá€ºá€· á€¡á€›á€¬ -">
 <!ENTITY torbutton.prefs.no_proxy_warning "á€žá€á€á€•á€±á€¸á€á€»á€€á€º - á€¡á€‘á€€á€ºá€™á€¾ host á€¡á€™á€Šá€ºá€™á€»á€¬á€¸ á€žá€¯á€¶á€¸á€…á€½á€²á€™á€¾á€¯á€€á€á€¯ á€›á€¾á€±á€¬á€„á€ºá€•á€«">
-<!ENTITY torbutton.prefs.spoofreresh "á€•á€¼á€”á€ºá€œá€¾á€¯á€•á€ºá€”á€¾á€á€¯á€¸á€™á€¾á€¯á€€á€á€¯ Spoof á€œá€¯á€•á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.refereroptions "á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€á€»á€€á€º á€•á€¯á€¶á€™á€¾á€¬á€¸á€›á€á€¯á€€á€ºá€žá€Šá€ºá€· á€›á€½á€±á€¸á€…á€›á€¬á€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.nospoof "á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€á€»á€€á€ºá€€á€á€¯ Spoof  á€™á€œá€¯á€•á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.spoofroot "á€¤á€…á€¬á€™á€»á€€á€ºá€”á€¾á€¬áŒ á€›á€¾á€á€žá€±á€¬ á€–á€á€¯á€„á€ºá€á€½á€²á€€á€á€¯ Spoof  á€œá€¯á€•á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.spoofdomain "á€’á€á€¯á€™á€á€”á€ºá€¸á€€á€á€¯ á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€žá€°á€¡á€–á€¼á€…á€º Spoof á€œá€¯á€•á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.spoofblank "á€›á€Šá€ºá€Šá€½á€¾á€”á€ºá€¸á€žá€°á€€á€á€¯ á€¡á€œá€½á€á€ºá€‘á€¬á€¸á€›á€”á€º">
 <!ENTITY torbutton.cookiedialog.title "á€€á€½á€á€ºá€€á€®á€¸ á€€á€¬á€€á€½á€šá€ºá€™á€¾á€¯á€™á€»á€¬á€¸á€€á€á€¯ á€…á€®á€™á€¶á€á€”á€ºá€·á€á€½á€²á€›á€”á€º">
 <!ENTITY torbutton.cookiedialog.lockCol "á€¡á€€á€¬á€¡á€€á€½á€šá€º á€œá€¯á€•á€ºá€‘á€¬á€¸á€žá€Šá€º">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á€¡á€¬á€¸á€œá€¯á€¶á€¸á€€á€á€¯ á€–á€šá€ºá€‘á€¯á€á€ºá€•á€«á‹ á€žá€á€¯á€·á€žá€±á€¬á€º á€¡á€€á€¬á€¡á€€á€½á€šá€º á€œá€¯á€•á€ºá€‘á€¬á€¸á€žá€Šá€º">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á€€á€½á€á€ºá€€á€®á€¸á€žá€…á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€€á€¬á€€á€½á€šá€ºá€›á€”á€º">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á€€á€½á€á€ºá€€á€®á€¸á€žá€…á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€€á€¬á€€á€½á€šá€ºá€á€¼á€„á€ºá€¸ á€™á€•á€¼á€¯á€›á€”á€º">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor á€žá€¯á€¶á€¸á€…á€½á€²á€”á€±á€á€»á€á€”á€ºá€á€½á€„á€º Livemark á€™á€½á€™á€ºá€¸á€™á€¶á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€•á€á€á€ºá€›á€”á€º">
-<!ENTITY torbutton.prefs.dtd_recommended "(á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.dtd_optional "(á€œá€á€¯á€¡á€•á€ºá€œá€»á€¾á€„á€º)">
-<!ENTITY torbutton.prefs.dtd_crucial "(á€¡á€›á€±á€¸á€€á€¼á€®á€¸á€žá€Šá€º)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton á€™á€½á€™á€ºá€¸á€™á€¶á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ Tor á€™á€¾á€á€†á€„á€ºá€· â€‹á€á€Šá€ºá€”á€±á€›á€¬á€œá€½á€¾á€²á€›á€”á€º">
-<!ENTITY torbutton.prefs.dodge_google_captcha "á€‚á€°á€‚á€² Captcha á€á€…á€ºá€á€¯á€”á€¾á€„á€ºá€· á€›á€„á€ºá€†á€á€¯á€„á€ºá€žá€Šá€ºá€·á€¡á€á€« á€¡á€á€¼á€¬á€¸ á€›á€¾á€¬á€–á€½á€±á€›á€±á€¸ á€¡á€„á€ºá€‚á€»á€„á€º á€á€…á€ºá€™á€»á€á€¯á€¸á€€á€á€¯ á€¡á€œá€á€¯á€¡á€œá€»á€±á€¬á€€á€º á€žá€¯á€¶á€¸á€…á€½á€²á€•á€« -">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "á€•á€½á€„á€ºá€·á€œá€„á€ºá€¸á€™á€¼á€„á€ºá€žá€¬á€žá€±á€¬ Tor á€žá€¯á€¶á€¸á€…á€½á€²á€™á€¾á€¯ (á€…á€á€á€ºá€€á€¼á€á€¯á€€á€º transproxy á€”á€¾á€„á€ºá€· Tor Router á€œá€á€¯á€¡á€•á€ºá€žá€Šá€º)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 54dcc53..2f42bca 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Innstillinger for Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Bruk Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Bruk Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-vert:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Om Torbutton">
-<!ENTITY torbutton.about.version "Versjon:">
-<!ENTITY torbutton.about.summary "Beskytter personvernet ditt mens du surfer med Tor. ">
-<!ENTITY torbutton.about.code "Kodere:">
-<!ENTITY torbutton.about.maintainer "Vedlikeholder:">
-<!ENTITY torbutton.about.security_review "Sikkerhetsgjennomgang:">
-<!ENTITY torbutton.about.donate "Hvis du liker Tor, sÃ¥ kan du vurdere Ã¥">
-<!ENTITY torbutton.about.make_donation "donÃ©re">
 <!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for Ã¥ endre pÃ¥ disse innstillingene.">
 <!ENTITY torbutton.pref_connection.more_info "Mer informasjon">
 <!ENTITY torbutton.pref_connection_more_info.title "Hjelp">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for Ã¸yeblikket aktivert. Hvis du vil endre pÃ¥ ikke-Tor-proxyinnstillinger, vennligst deaktiver Torbutton og returner hit. Hvis du vil endre pÃ¥ Tor-innstillingene, vennligst bruk Torbutton-innstillingsvinduet.">
 <!ENTITY torbutton.context_menu.new_identity "Ny Identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Endre Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Innstillinger...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Om Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Ã…pne nettverksinnstillinger...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopier Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ã…pne Tor URL i ny fane">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ã…pne Tor URL i nytt vindu">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikk for Ã¥ initialisere Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Sikkerhetsinnstillinger">
-<!ENTITY torbutton.prefs.block_thread "Blokker historielesing under Tor (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokker historieskriving under Tor (anbefales)">
-<!ENTITY torbutton.prefs.block_nthread "Blokker historielesing under ikke-Tor (valgfritt)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokker historie-skriving under ikke-Tor (valgfritt)">
-<!ENTITY torbutton.prefs.clear_history "Slett historie pÃ¥ Tor toggle (valgfritt)">
-<!ENTITY torbutton.prefs.clear_cache "Blokker Tor disk cache og slett all cache pÃ¥ Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og minne-cache under Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Lagre ikke-Tor informasjonskapsler i en beskyttet jar">
-<!ENTITY torbutton.prefs.cookie_protection "Bruk informasjonskapslenes dialogboks til Ã¥ velge">
-<!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine informasjonskapsler (farlig)">
-<!ENTITY torbutton.prefs.clear_cookies "Slett informasjonskapsler pÃ¥ Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Deaktiver tillegg under Tor (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.kill_bad_js "Fjern farlige javascript (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.isolate_content "Isoler dynamisk innhold til Tor-tilstand (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.no_updates "Deaktiver oppdateringer under Tor">
-<!ENTITY torbutton.prefs.set_uagent "Sett bruker-agent for bruk av Tor (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.dynamic "Dynamisk Innhold">
-<!ENTITY torbutton.prefs.cookies "Informasjonskapsler">
-<!ENTITY torbutton.prefs.cache "Hurtiglager">
-<!ENTITY torbutton.prefs.history "Historie">
-<!ENTITY torbutton.prefs.no_search "Deaktiver sÃ¸keforslag under Tor (anbefalt)">
-<!ENTITY torbutton.prefs.shutdown "Skru av">
-<!ENTITY torbutton.prefs.tor_shutdown "Slett Tor-informasjonskapsler nÃ¥r nettleseren med Tor aktivert avsluttes">
-<!ENTITY torbutton.prefs.all_shutdown "Slett informasjonskapsler hver gang nettleseren avsluttes">
-<!ENTITY torbutton.prefs.no_shutdown "Ikke slett informasjonskapslene mine under avslutning">
-<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver lagring av sesjoner (anbefalt)">
-<!ENTITY torbutton.prefs.headers "Topptekst">
-<!ENTITY torbutton.prefs.refererspoofing "Henviserparodiering">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart henviserparodiering mens du bruker Tor (parodierer henvisninger pÃ¥ tvers av domener)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM-lagring under Tor (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.forms "Skjemaer">
-<!ENTITY torbutton.prefs.block_tforms "Blokker lagring av passord + informasjon i skjema under Tor (anbefalt)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokker lagring av passord + informasjon i skjema under ikke-Tor (valgfritt)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Under oppstart av en gjenopprettet sesjon, sett Tor-status til:">
-<!ENTITY torbutton.prefs.startup_tor "Under nettleserens oppstart, sett Tor-status til:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Last jar med informasjonskapsler pÃ¥ nytt / slett informasjonskapsler nÃ¥r Firefox krÃ¦sjer (anbefalt)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Lagre informasjonskapsler for bÃ¥de Tor og ikke-Tor i beskyttende jar (farlig)">
-<!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte sesjoner (anbefalt)">
-<!ENTITY torbutton.prefs.block_js_history "Isoler tilgang til historienavigering til Tor-status (kritisk)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Gjennopprett vinduer til stÃ¸rrelsen 50px under Tor (anbefalt)">
-<!ENTITY torbutton.prefs.close_tor "Lukk alle Tor-vinduer og faner pÃ¥ toggle (valgfritt)">
-<!ENTITY torbutton.prefs.close_nontor "Lukk alle ikke-tor-vinduer og faner pÃ¥ toggle (valgfritt)">
-<!ENTITY torbutton.prefs.block_links "Blokker klikking av linker og oppdatering av sider fra forskjellige Tor-statuser (valgfritt)">
-<!ENTITY torbutton.prefs.jar_certs "Lagre SSL-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Lagre CA-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)">
-<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knappen og Hurtigtaster for Ã¥ unngÃ¥ uhell med toggle">
-<!ENTITY torbutton.prefs.startup_state "Under normal oppstart, sett Tor-status til:">
-<!ENTITY torbutton.prefs.shutdown_state "Avslutningsmodus">
-<!ENTITY torbutton.prefs.startup "Oppstart">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokker Tor-tilgang til nettverket fra URL-er av typen file:// (anbefalt)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokker ikke-Tor-tilgang til nettverket fra URL-er av typen file://">
 <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
 <!ENTITY torbutton.prefs.test_settings "Test innstillinger">
-<!ENTITY torbutton.prefs.test_auto "Test mine Tor-innstillinger etter fÃ¸rste gang jeg aktiverer den hver gang Firefox starter opp">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ikke skriv Tor-informasjonskapsler til disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ikke skriv ikke-Tor informasjonskapsler til disk">
-<!ENTITY torbutton.prefs.session_restore "La sesjonen lagre og gjennopprette fÃ¸lgende faner:">
-<!ENTITY torbutton.prefs.nontor_tabs "Faner lastet under ikke-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Faner lastet under Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UnngÃ¥ Ã¥ bruke noen av vertsnavnene ovenfor">
-<!ENTITY torbutton.prefs.spoofreresh "Parodier oppdatering av siden">
-<!ENTITY torbutton.prefs.refereroptions "Innstillinger for henvisningsparodiering ">
-<!ENTITY torbutton.prefs.nospoof "Ikke parodier henviser">
-<!ENTITY torbutton.prefs.spoofroot "Parodier mappen som inneholder siden">
-<!ENTITY torbutton.prefs.spoofdomain "Parodier domenet som henviser">
-<!ENTITY torbutton.prefs.spoofblank "Tom henviser">
 <!ENTITY torbutton.cookiedialog.title "AdministrÃ©r Informasjonskapslenes Beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler">
-<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver oppdateringer av live-bokmerker under Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(anbefalt)">
-<!ENTITY torbutton.prefs.dtd_optional "(valgfritt)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kritisk)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Send Torbutton-oppdateringer gjennom Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Bruk automatisk en annen sÃ¸kemotor nÃ¥r du fÃ¥r presentert en Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (krever egendefinert transproxy eller Tor-router)">
 <!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleser Ã¸kt)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 08e3703..f377870 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Voorkeuren">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen">
 <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken">
 <!ENTITY torbutton.prefs.use_polipo "Polipo gebruiken">
 <!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP proxy:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS host:">
 <!ENTITY torbutton.prefs.proxy.port "Poort:">
-<!ENTITY torbutton.about.title "Over Torbutton">
-<!ENTITY torbutton.about.version "Versie:">
-<!ENTITY torbutton.about.summary "Beveiligt de privacy van jouw Tor browsen.">
-<!ENTITY torbutton.about.code "Code medewerkers:">
-<!ENTITY torbutton.about.maintainer "Beheerder:">
-<!ENTITY torbutton.about.security_review "Beveiligingscontrole:">
-<!ENTITY torbutton.about.donate "Als je graag Tor gebruikt, kun je misschien ook">
-<!ENTITY torbutton.about.make_donation "een donatie maken.">
 <!ENTITY torbutton.pref_connection.notice "Torbutton dient uitgeschakeld te worden om deze instellingen te kunnen wijzigen.">
 <!ENTITY torbutton.pref_connection.more_info "Meer informatie">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Tor status wisselen">
-<!ENTITY torbutton.context_menu.toggle.key "W">
 <!ENTITY torbutton.context_menu.preferences "Privacy- en beveiligingsinstellingen...">
 <!ENTITY torbutton.context_menu.preferences.key "V">
-<!ENTITY torbutton.context_menu.about "Over Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.context_menu.networksettings "Tor netwerk instellingen">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie beveiligingen...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopieer Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in nieuwe Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in nieuw venster">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen">
-<!ENTITY torbutton.prefs.block_thread "Blokkeer het lezen van de geschiedenis met Tor (cruciaal)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokkeer het schrijven van de geschiedenis met Tor (aangeraden)">
-<!ENTITY torbutton.prefs.block_nthread "Blokkeer het lezen van de geschiedenis zonder Tor (optioneel)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokkeer het schrijven van de geschiedenis zonder Tor (optioneel)">
-<!ENTITY torbutton.prefs.clear_history "Verwijder de geschiedenis bij Tor-wissel (optioneel)">
-<!ENTITY torbutton.prefs.clear_cache "Blokkeer Tor schijf-cache en verwijder alle cachebestanden bij Tor-wissel">
-<!ENTITY torbutton.prefs.block_cache "Blokkeer Tor schijf- en geheugencache">
-<!ENTITY torbutton.prefs.cookie_jars "Sla de niet-Tor cookies op op een beveiligde plaats">
-<!ENTITY torbutton.prefs.cookie_protection "Gebruik het Cookie Beveiligingen dialoogvenster om te kiezen.">
-<!ENTITY torbutton.prefs.mmm_cookies "Ik beheer de cookies handmatig (gevaarlijk)">
-<!ENTITY torbutton.prefs.clear_cookies "Verwijder de cookies bij in/uitschakelen van Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Gebruik geen plug-ins tijdens Tor (cruciaal)">
-<!ENTITY torbutton.prefs.kill_bad_js "Pas gevaarlijke javascripts aan (cruciaal)">
-<!ENTITY torbutton.prefs.isolate_content "Isoleer dynamische inhoud binnen de Tor status (cruciaal)">
-<!ENTITY torbutton.prefs.no_updates "Schakel updates uit tijdens gebruik van Tor">
-<!ENTITY torbutton.prefs.set_uagent "Stel de user agent voor Torgebruik in (cruciaal)">
-<!ENTITY torbutton.prefs.dynamic "Dynamische inhoud">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Geschiedenis">
-<!ENTITY torbutton.prefs.no_search "Zoeken uitschakelen tijdens Tor (aanbevolen)">
-<!ENTITY torbutton.prefs.shutdown "Uitschakelen">
-<!ENTITY torbutton.prefs.tor_shutdown "Verwijder Tor cookies na afsluiten van een Tor browsersessie">
-<!ENTITY torbutton.prefs.all_shutdown "Verwijder cookies na afsluiten van elke browsersessie">
-<!ENTITY torbutton.prefs.no_shutdown "Verwijder mijn cookies niet na het afsluiten">
-<!ENTITY torbutton.prefs.disable_sessionstore "Schakel sessie opslaan uit (aanbevolen)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Verwijzer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Slimme verwijzer spoofing tijdens Tor gebruik (spoofs cross-domain verwijzers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Verhinder DOM opslag tijdens Tor gebruik (cruciaal)">
-<!ENTITY torbutton.prefs.forms "Formulieren">
-<!ENTITY torbutton.prefs.block_tforms "Blokkeer het opslaan van het formulierpaswoord tijdens Tor gebruik (aanbevolen)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokkeer het opslaan van het formulierpaswoord buiten het Tor gebruik (optioneel)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "niet Tor">
-<!ENTITY torbutton.prefs.restore_tor "Bij opstart met sessieherstel, stel de Tor status in als : ">
-<!ENTITY torbutton.prefs.startup_tor "Bij Browser opstart, zet Tor status naar:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Herlaad de cookie ruimte/verwijder de cookies bij een Firefox crash (aanbevolen)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Sla zowel Tor- als niet-Torcookies op in beschermde ruimtes (gevaarlijk)">
-<!ENTITY torbutton.prefs.clear_http_auth "Verwijder HTTP-geauthoriseerde sessies (aanbevolen)">
-<!ENTITY torbutton.prefs.block_js_history "Isoleer toegang tot de navigatiegeschiedenis bij Tor (cruciaal)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Verander de grootte van de schermen tot veelvouden van 50 punten bij Tor gebruik (aanbevolen)">
-<!ENTITY torbutton.prefs.close_tor "Sluit alle Tor schermen en tabs bij wissel (optioneel)">
-<!ENTITY torbutton.prefs.close_nontor "Sluit alle niet-Tor schermen en tabs bij wissel (optioneel)">
-<!ENTITY torbutton.prefs.block_links "Blokkeer links en paginavernieuwingen tussen verschillen Tor toestanden (optioneel)">
-<!ENTITY torbutton.prefs.jar_certs "Sla SSL-certificaten op in afzonderlijke ruimtes voor Tor/niet-Tor (aanbevolen)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Sla CA-certificaten op in afzonderlijke ruimtes voor Tor/niet-Tor (aanbevolen)">
-<!ENTITY torbutton.prefs.locked_mode "Blokkeer knop en sneltoetsen om toevallige wissel te vermijden">
-<!ENTITY torbutton.prefs.startup_state "Zet de toestand bij normale start op :">
-<!ENTITY torbutton.prefs.shutdown_state "Toestand bij afsluiten">
-<!ENTITY torbutton.prefs.startup "Opstarten">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokkeer Tor-toegang tot file:// urls (aanbevolen)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokkeer niet-Tor-toegang tot file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand">
 <!ENTITY torbutton.prefs.test_settings "Testen van de instellingen">
-<!ENTITY torbutton.prefs.test_auto "Testen van de Tor-instellingen de eerste wissel na elke Firefoxstart">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Geen Tor cookies op de schijf opslaan">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Geen niet-Tor cookies op de schijf opslaan">
-<!ENTITY torbutton.prefs.session_restore "Volgende tabs door sessiebeheer opslaan en herstellen : ">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs geladen in niet-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs geladen in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Geen proxy voor: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Opgelet: gebruik van bovenstaande hostnamen vermijden">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Vernieuwen">
-<!ENTITY torbutton.prefs.refereroptions "Verwijzer Spoof instellingen">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Spoof de bovenliggende folder van de pagina">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof het domein als verwijzer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(aanbevolen)">
-<!ENTITY torbutton.prefs.dtd_optional "(optioneel)">
-<!ENTITY torbutton.prefs.dtd_crucial "(cruciaal)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton enkel via Tor updaten">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatisch een alternatieve zoekmachine gebruiken bij een Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router nodig)">
 <!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen">
 <!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt PrivÃ©navigatie in.)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan worden ingeschakeld op een basis per - site via de NoScript werkbalk knop.">
 <!ENTITY torbutton.prefs.sec_high "Hoog">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is standaard uitgeschakeld op alle websites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Meeste audio en video formaten zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM blijft de enige codec die is ingeschakeld.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. ">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypes worden geblokkeerd.">
 <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden">
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index bda5ba4..4330980 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "à¨–à©à¨¦ à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨— à¨¦à¨¿à¨“">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "à¨¸à¨¹à¨¾à¨‡à¨¤à¨¾">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "p">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "p">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "à¨¸à©à¨°à©±à¨–à¨¿à¨† à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "à¨Ÿà©Œà¨°">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "à¨Ÿà©‡à¨¸à¨Ÿ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index f617b53..eabc8ef 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton - ustawienia">
 <!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy">
 <!ENTITY torbutton.prefs.recommended_settings "UÅ¼yj zalecanych ustawieÅ„ proxy dla mojej wersji Firefoksa">
-<!ENTITY torbutton.prefs.use_privoxy "UÅ¼yj Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "UÅ¼ywaj Polipo">
 <!ENTITY torbutton.prefs.custom_settings "UÅ¼yj spersonalizowanych ustawieÅ„ proxy.">
 <!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Serwer proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "O Torbutton">
-<!ENTITY torbutton.about.version "Wersja:">
-<!ENTITY torbutton.about.summary "Chroni prywatnoÅ›Ä‡ Twojego przeglÄ…dania sieci z Torem.">
-<!ENTITY torbutton.about.code "WkÅ‚ady kodu:">
-<!ENTITY torbutton.about.maintainer "Opiekun:">
-<!ENTITY torbutton.about.security_review "PrzeglÄ…d bezpieczeÅ„stwa:">
-<!ENTITY torbutton.about.donate "JeÅ›li lubisz korzystaÄ‡ z Tora, moÅ¼esz rozwaÅ¼yÄ‡">
-<!ENTITY torbutton.about.make_donation "zÅ‚oÅ¼enie dotacji.">
 <!ENTITY torbutton.pref_connection.notice "Aby zmieniÄ‡ te ustawienia wyÅ‚Ä…cz Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "WiÄ™cej informacji">
 <!ENTITY torbutton.pref_connection_more_info.title "Pomoc">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "o">
 <!ENTITY torbutton.context_menu.new_circuit "Nowy obwÃ³d dla tej strony">
 <!ENTITY torbutton.context_menu.new_circuit_key "c">
-<!ENTITY torbutton.context_menu.toggle "ZmieÅ„ status Tora">
-<!ENTITY torbutton.context_menu.toggle.key "Z">
 <!ENTITY torbutton.context_menu.preferences "Ustawienia PrywatnoÅ›ci i BezpieczeÅ„stwa...">
 <!ENTITY torbutton.context_menu.preferences.key "U">
-<!ENTITY torbutton.context_menu.about "O Torbutton">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "s">
 <!ENTITY torbutton.context_menu.downloadUpdate "SprawdÅº czy sÄ… aktualizacje Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "u">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrona plikÃ³w cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "c">
-<!ENTITY torbutton.context_menu.copyTor "Kopiuj URL Tora">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "OtwÃ³rz URL Tora w nowej karcie">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "OtwÃ³rz adres URL Tora w nowym oknie">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ‡ Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatnoÅ›ci i bezpieczeÅ„stwa">
-<!ENTITY torbutton.prefs.block_thread "Blokuj odczyt historii gdy Tor jest wÅ‚Ä…czony (krytyczne)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokuj zapis do historii gdy Tor jest wÅ‚Ä…czony (zalecane)">
-<!ENTITY torbutton.prefs.block_nthread "Blokuj odczyt historii gdy Tor jest wyÅ‚Ä…czony (opcjonalnie)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokuj zapis do historii gdy Tor jest wyÅ‚Ä…czony (opcjonalnie)">
-<!ENTITY torbutton.prefs.clear_history "CzyÅ›Ä‡ historiÄ™ przy wÅ‚/wyÅ‚ Tora (opcjonalnie)">
-<!ENTITY torbutton.prefs.clear_cache "Blokuj pamiÄ™Ä‡ podrÄ™cznÄ… Tora i wyczyÅ›Ä‡ jÄ… przy wÅ‚/wyÅ‚ Tora">
-<!ENTITY torbutton.prefs.block_cache "Blokuj dostÄ™p do pamiÄ™ci podrÄ™cznej (dysk/pamiÄ™Ä‡) gdy Tor jest wÅ‚Ä…czony">
-<!ENTITY torbutton.prefs.cookie_jars "ZapamiÄ™tuj ciasteczka z trybu zwykÅ‚ego w zabezpieczonych magazynach">
-<!ENTITY torbutton.prefs.cookie_protection "UÅ¼yj okna dialogowego ochrony ciasteczek, by wybraÄ‡">
-<!ENTITY torbutton.prefs.mmm_cookies "BÄ™dÄ™ sam zarzÄ…dzaÅ‚ ciasteczkami (niebezpieczne)">
-<!ENTITY torbutton.prefs.clear_cookies "CzyÅ›Ä‡ ciasteczka przy zmianie trybu Tor">
-<!ENTITY torbutton.prefs.disable_plugins "WyÅ‚Ä…cz wtyczki podczas uÅ¼ycia Tor (krytyczne)">
-<!ENTITY torbutton.prefs.kill_bad_js "Nadzoruj niebezpieczne skrypty (krytyczne)">
-<!ENTITY torbutton.prefs.isolate_content "Izoluj treÅ›Ä‡ dynamicznÄ… (krytyczne)">
-<!ENTITY torbutton.prefs.no_updates "WyÅ‚Ä…cz uaktualnienia podczas uÅ¼ywanie Tora">
-<!ENTITY torbutton.prefs.set_uagent "Ustaw identyfikacjÄ™ przeglÄ…darki podczas uÅ¼ywania Tora (krytyczne)">
-<!ENTITY torbutton.prefs.dynamic "ZawartoÅ›Ä‡ dynamiczna">
-<!ENTITY torbutton.prefs.cookies "Ciasteczka">
-<!ENTITY torbutton.prefs.cache "PamiÄ™Ä‡ podrÄ™czna">
-<!ENTITY torbutton.prefs.history "Historia">
-<!ENTITY torbutton.prefs.no_search "WyÅ‚Ä…cz sugerowane zapytania wyszukiwania podczas trybu Tor (zalecane)">
-<!ENTITY torbutton.prefs.shutdown "WyÅ‚Ä…czenie">
-<!ENTITY torbutton.prefs.tor_shutdown "UsuÅ„ ciasteczka Tora gdy nastÄ™puje wyÅ‚Ä…czenie w trybie z wÅ‚Ä…czonym Torem">
-<!ENTITY torbutton.prefs.all_shutdown "UsuÅ„ ciasteczka zawsze przy wyÅ‚Ä…czaniu przeglÄ…darki">
-<!ENTITY torbutton.prefs.no_shutdown "Nie usuwaj ciasteczek przy wyÅ‚Ä…czaniu">
-<!ENTITY torbutton.prefs.disable_sessionstore "Blokuj zapisywanie sesji przeglÄ…darki (zalecane)">
-<!ENTITY torbutton.prefs.headers "NagÅ‚Ã³wki">
-<!ENTITY torbutton.prefs.refererspoofing "FaÅ‚szowanie adresu zwrotnego">
-<!ENTITY torbutton.prefs.spoofblank "WysyÅ‚aj pusty adres zwrotny w czasie uÅ¼ywania Tora (moÅ¼e zepsuÄ‡ niektÃ³re strony)">
-<!ENTITY torbutton.prefs.smartspoof "MÄ…drze faÅ‚szuj adres zwrotny w czasie uÅ¼ywania Tora (faÅ‚szuje odnoÅ›niki miÄ™dzy stronami)">
-<!ENTITY torbutton.prefs.nospoof "Nie faÅ‚szuj adresu zwrotnego w czasie uÅ¼ywania Tora (wysyÅ‚aj adres normalnie)">
-<!ENTITY torbutton.prefs.disable_domstorage "WyÅ‚Ä…cz Magazyn DOM podczas uÅ¼ywania Tora (krytyczne)">
-<!ENTITY torbutton.prefs.forms "Formularze">
-<!ENTITY torbutton.prefs.block_tforms "Blokuj zapamiÄ™tywanie haseÅ‚ z formularzy (zalecane)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokuj zapamiÄ™tywanie haseÅ‚ oraz zawartoÅ›ci formularzy gdy Tor jest nieaktywny (opcjonalnie)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "bez Tora">
-<!ENTITY torbutton.prefs.restore_tor "Po przywrÃ³ceniu sesji, ustaw stan Tora na:">
-<!ENTITY torbutton.prefs.startup_tor "Podczas uruchomienia przeglÄ…darki, ustaw stan Tora na:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "UsuÅ„ ciasteczka z magazynÃ³w przy nieoczekiwanym zamkniÄ™ciu Firefoxa (zalecane)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Zapisuj wszystkie ciasteczka w zabezpieczonych magazynach(niebezpieczne)">
-<!ENTITY torbutton.prefs.clear_http_auth "CzyÅ›Ä‡ sesje autentykacji HTTP (zalecane)">
-<!ENTITY torbutton.prefs.block_js_history "ZabroÅ„ dostÄ™pu do historii przeglÄ…dania gdy tryb Tor byÅ‚ aktywny (krytyczne)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Skaluj okna do wielokrotnoÅ›ci 50px podczas uÅ¼ywania Tora (zalecane)">
-<!ENTITY torbutton.prefs.close_tor "Zamykaj wszystkie karty i okna podczas zmiany trybu Tora (opcjonalne)">
-<!ENTITY torbutton.prefs.close_nontor "Zamykaj wszystkie okna i karty nie przeglÄ…dane w trybie Tor podczas zmiany trybu (opcjonalnie)">
-<!ENTITY torbutton.prefs.block_links "Blokuj klikanie na Å‚Ä…cza i przeÅ‚adowania strony gdy zmieniÅ‚ siÄ™ status Tora (opcjonalnie)">
-<!ENTITY torbutton.prefs.jar_certs "Zapisuj certyfikaty SSL w osobnych magazynach, w kaÅ¼dym trybie (zalecane)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Zapisuj certyfikaty CA w osobnych magazynach, w kaÅ¼dym trybie (zalecane)">
-<!ENTITY torbutton.prefs.locked_mode "Zablokuj przycisk i gorÄ…ce klawisze aby uniknÄ…Ä‡ przypadkowego przeÅ‚Ä…czenia">
-<!ENTITY torbutton.prefs.startup_state "Podczas normalnego uruchomienia, ustaw stan Tora na:">
-<!ENTITY torbutton.prefs.shutdown_state "Stan przy wyÅ‚Ä…czeniu">
-<!ENTITY torbutton.prefs.startup "Uruchomienie">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokuj dostÄ™p do sieci z odnoÅ›nikÃ³w file:// urls (zalecane)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokuj dostÄ™p do sieci z odnoÅ›nikÃ³w file:// urls (gdy Tor jest wyÅ‚Ä…czony)">
 <!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅ›lne">
 <!ENTITY torbutton.prefs.test_settings "Testuj ustawienia">
-<!ENTITY torbutton.prefs.test_auto "Testuj moje ustawienia podczas pierwszego wÅ‚Ä…czenia Tora po starcie Firefoxa">
-<!ENTITY torbutton.prefs.disable_livemarks "WyÅ‚Ä…cz uaktualnienia livemarks podczas uÅ¼ywania Tora">
-<!ENTITY torbutton.prefs.tor_memory_jar "Nie zapisuj ciasteczek Tora na dysk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Nie zapisuj ciasteczek na dysk (tryb bez Tora)">
-<!ENTITY torbutton.prefs.session_restore "Niech sesja zapamiÄ™tuje i przywraca te zakÅ‚adki:">
-<!ENTITY torbutton.prefs.nontor_tabs "ZakÅ‚adki otwarte w trybie bez Tora">
-<!ENTITY torbutton.prefs.tor_tabs "ZakÅ‚adki otwarte w trybie Tora">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Brak proxy dla: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Uwaga: Unikaj podawania nazw hostÃ³w powyÅ¼ej">
-<!ENTITY torbutton.prefs.spoofreresh "FaÅ‚szuj odÅ›wieÅ¼anie">
-<!ENTITY torbutton.prefs.refereroptions "Opcje faÅ‚szowania adresu zwrotnego">
-<!ENTITY torbutton.prefs.nospoof "Nie faÅ‚szuj adresu zwrotnego w czasie uÅ¼ywania Tora (wysyÅ‚aj adres normalnie)">
-<!ENTITY torbutton.prefs.spoofroot "WysyÅ‚aj folder zawierajÄ…cy stronÄ™">
-<!ENTITY torbutton.prefs.spoofdomain "WysyÅ‚aj domenÄ™ jako adres zwrotny">
-<!ENTITY torbutton.prefs.spoofblank "WysyÅ‚aj pusty adres zwrotny w czasie uÅ¼ywania Tora (moÅ¼e zepsuÄ‡ niektÃ³re strony)">
 <!ENTITY torbutton.cookiedialog.title "ZarzÄ…dzaj ochronÄ… ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "UsuÅ„ wszystkie oprÃ³cz chronionych">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ„ nowe ciasteczka">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ„ nowych ciasteczek">
-<!ENTITY torbutton.prefs.disable_livemarks "WyÅ‚Ä…cz uaktualnienia livemarks podczas uÅ¼ywania Tora">
-<!ENTITY torbutton.prefs.dtd_recommended "(zalecane)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcjonalne)">
-<!ENTITY torbutton.prefs.dtd_crucial "(waÅ¼ne)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Przekieruj aktualizacje Torbutton przez Tora">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatycznie uÅ¼ywaj alternatywnej wyszukiwarki, gdy natrafisz na Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Przezroczysta toryfikacja (wymaga wÅ‚asnego transproxy lub routera Tora)">
 <!ENTITY torbutton.prefs.priv_caption "Ustawienia PrywatnoÅ›ci">
 <!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglÄ…dania i danych o stronach (wÅ‚Ä…cza Tryb Prywatny)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript moÅ¼e byÄ‡ wÅ‚Ä…czony dla pojedyÅ„czych, wybranych przez Ciebie stronach uÅ¼ywajÄ…c przycisku NoScript z paska narzÄ™dzi.">
 <!ENTITY torbutton.prefs.sec_high "Wysoki">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript jest domyÅ›lnie wyÅ‚Ä…czona na wszystkich stronach.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "WiÄ™kszoÅ›Ä‡ formatÃ³w audio i wideo jest wyÅ‚Ä…czone.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM jest jedynym kodekiem ktÃ³ry pozostaje wÅ‚Ä…czony.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "NiektÃ³re czcionki i ikony mogÄ… byÄ‡ wyÅ›wietlane niepoprawnie.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe sÄ… blokowane.">
 <!ENTITY torbutton.prefs.sec_custom "WartoÅ›ci niestandardowe">
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index d03fc5d..e2dc1dd 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ConfiguraÃ§Ãµes do BotÃ£o do Tor">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes de Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar as configuraÃ§Ãµes de proxy recomendadas para a minha versÃ£o de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Usar o Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Usar o Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar configuraÃ§Ãµes de proxy personalizadas">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy para HTTP:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy para Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Host para SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.about.title "Sobre o BotÃ£o do Tor">
-<!ENTITY torbutton.about.version "VersÃ£o:">
-<!ENTITY torbutton.about.summary "Protege a privacidade da sua navegaÃ§Ã£o com Tor.">
-<!ENTITY torbutton.about.code "Contribuidores:">
-<!ENTITY torbutton.about.maintainer "Mantenedor">
-<!ENTITY torbutton.about.security_review "RevisÃ£o de SeguranÃ§a:">
-<!ENTITY torbutton.about.donate "Se vocÃª gosta de usar o Tor, vocÃª pode considerar">
-<!ENTITY torbutton.about.make_donation "fazer uma doaÃ§Ã£o.">
 <!ENTITY torbutton.pref_connection.notice "Desabilitar o BotÃ£o do Tor para alterar essas configuraÃ§Ãµes.">
 <!ENTITY torbutton.pref_connection.more_info "Mais informaÃ§Ãµes">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
 <!ENTITY torbutton.pref_connection_more_info.text "O BotÃ£o do Tor estÃ¡ habilitado. Se deseja alterar as configuraÃ§Ãµes de proxy nÃ£o relacionadas ao Tor, por favor desabilite o BotÃ£o do Tor e retorne aqui. Se vocÃª deseja alterar as configuraÃ§Ãµes do Tor, por favor use a janela de configuraÃ§Ãµes do BotÃ£o do Tor.">
 <!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
-<!ENTITY torbutton.context_menu.toggle "Alternar o Status do Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Sobre o BotÃ£o do Tor...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Abrir ConfiguraÃ§Ãµes de Rede">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualizaÃ§Ã£o do pacote Tor para navegadores...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes para Cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar a URL do Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir a URL do Tor em uma nova Aba">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir a URL do Tor em uma nova Janela">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "BotÃ£o do Tor">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o BotÃ£o do Tor">
-<!ENTITY torbutton.prefs.sec_settings "ConfiguraÃ§Ãµes de SeguranÃ§a">
-<!ENTITY torbutton.prefs.block_thread "Bloquear leituras do histÃ³rico durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquear escritas no histÃ³rico durante a utilizaÃ§Ã£o do Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear leituras do histÃ³rico quando nÃ£o estiver utilizando o Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escritas no histÃ³rico quando nÃ£o estiver utilizando o Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_history "Limpar histÃ³rico ao alternar o status do Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear o cache de disco do Tor e limpar todos os caches ao alternar o status do Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquear o acesso ao cache de memÃ³ria e de disco durante o uso do Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies nÃ£o relacionados ao Tor num jar protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Usar a caixa de diÃ¡logo ProteÃ§Ãµes para Cookies para selecionar">
-<!ENTITY torbutton.prefs.mmm_cookies "Desejo gerenciar meus cookies manualmente (perigoso)">
-<!ENTITY torbutton.prefs.clear_cookies "Limpar cookies ao alternar o status do Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Desabilitar complementos durante o uso do Tor (importante)">
-<!ENTITY torbutton.prefs.kill_bad_js "Bloquear os cÃ³digos javascript perigosos (importante)">
-<!ENTITY torbutton.prefs.isolate_content "Isolar os conteÃºdos dinÃ¢micos ao status atual do Tor (importante)">
-<!ENTITY torbutton.prefs.no_updates "Desabilitar atualizaÃ§Ãµes durante o uso do Tor">
-<!ENTITY torbutton.prefs.set_uagent "Definir o user agent para o uso do Tor (importante)">
-<!ENTITY torbutton.prefs.dynamic "ConteÃºdo DinÃ¢mico">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "HistÃ³rico">
-<!ENTITY torbutton.prefs.no_search "Desabilitar as sugestÃµes de pesquisa durante o uso do Tor (recomendado)">
-<!ENTITY torbutton.prefs.shutdown "Encerrar">
-<!ENTITY torbutton.prefs.tor_shutdown "Limpar os cookies do Tor quando um navegador com Tor for encerrado">
-<!ENTITY torbutton.prefs.all_shutdown "Limpar cookies quando qualquer navegador for encerrado">
-<!ENTITY torbutton.prefs.no_shutdown "NÃ£o limpar meus cookies ao encerrar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Desabilitar o salvamento de sessÃ£o (recomendado)">
-<!ENTITY torbutton.prefs.headers "CabeÃ§alhos">
-<!ENTITY torbutton.prefs.refererspoofing "Falsificar origem">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Falsificar de forma inteligente a origem durante o uso do Tor (falsifica a origem em domÃnios cruzados)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Desabilitar o armazenamento do DOM durante o uso do Tor (importante)">
-<!ENTITY torbutton.prefs.forms "FormulÃ¡rios">
-<!ENTITY torbutton.prefs.block_tforms "Bloquear senhas e informaÃ§Ãµes de formulÃ¡rios durante o uso do Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquear senhas e informaÃ§Ãµes de formulÃ¡rios quando nÃ£o estiver usando o Tor (opcional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "NÃ£o relacionado ao Tor">
-<!ENTITY torbutton.prefs.restore_tor "Quando restaurar uma sessÃ£o, definir o status do Tor para:">
-<!ENTITY torbutton.prefs.startup_tor "Durante inicializaÃ§Ã£o do navegador, definir o estado do Tor como:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar o jar de cookies/limpar cookies em caso de falha do Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Armazenar os cookies, do Tor ou nÃ£o, em jars protegidos (perigoso)">
-<!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessÃµes HTTP autenticadas (recomendado)">
-<!ENTITY torbutton.prefs.block_js_history "Isolar o acesso ao histÃ³rico de navegaÃ§Ã£o ao status atual do Tor (importante)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar janelas em mÃºltiplos de 50 px durante o uso do Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor "Fechar todas as janelas e abas do Tor ao alternar o status (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Fechar todas as janelas e abas nÃ£o relacionadas ao Tor ao alternar o status (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloquear cliques aos links e atualizaÃ§Ãµes de pÃ¡ginas de status do Tor diferente do atual (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Armazenar certificados SSL, em jars separados, um para o que for do Tor e um para o que nÃ£o for (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Armazenar certificados da AC, em jars separados, um para o for do Tor e um para o que nÃ£o for (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Desabilitar botÃµes e atalhos para prevenir mudanÃ§as acidentais">
-<!ENTITY torbutton.prefs.startup_state "Durante inicio normal, definir estado do Tor para:">
-<!ENTITY torbutton.prefs.shutdown_state "Modo de desligamento">
-<!ENTITY torbutton.prefs.startup "Inicio">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear o acesso Ã  rede a partir de urls do tipo file:// (recomendado)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear acesso nÃ£o-Tor Ã  rede a partir de urls do tipo file://">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar padrÃ£o">
 <!ENTITY torbutton.prefs.test_settings "Testar configuraÃ§Ãµes">
-<!ENTITY torbutton.prefs.test_auto "Testar minhas configuraÃ§Ãµes do Tor, quando houver alteraÃ§Ã£o, durante o carregamento do Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "NÃ£o gravar cookies do Tor no disco">
-<!ENTITY torbutton.prefs.nontor_memory_jar "NÃ£o gravar cookies nÃ£o-Tor no disco">
-<!ENTITY torbutton.prefs.session_restore "Salvar sessÃ£o e restaurar essas abas:">
-<!ENTITY torbutton.prefs.nontor_tabs "Abas nÃ£o-Tor carregadas">
-<!ENTITY torbutton.prefs.tor_tabs "Abas carregadas no Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Sem Proxy para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite usar quaisquer dos hosts acima">
-<!ENTITY torbutton.prefs.spoofreresh "AtualizaÃ§Ã£o de Fraudes">
-<!ENTITY torbutton.prefs.refereroptions "OpÃ§Ãµes de engano de referenciador">
-<!ENTITY torbutton.prefs.nospoof "NÃ£o enganar referenciador">
-<!ENTITY torbutton.prefs.spoofroot "Enganar o diretÃ³rio que contÃ©m a pÃ¡gina">
-<!ENTITY torbutton.prefs.spoofdomain "Enganar o domÃnio como referenciador">
-<!ENTITY torbutton.prefs.spoofblank "Usar referenciador em branco">
 <!ENTITY torbutton.cookiedialog.title "Gerenciar ProteÃ§Ãµes de Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Prototeger Novos COOKIES">
-<!ENTITY torbutton.prefs.disable_livemarks "Desabilitar atualizaÃ§Ãµes Livemark durante o uso do Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirecionar atualizaÃ§Ãµes do Torbutton atravÃ©s do Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automaticamente utilizar um mecanismo de busca alternativo quando receber um Google Captcha">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "TorificaÃ§Ã£o Transparente (Requer transpoxy customizado ou roteador Tor)">
 <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou dados do site (permite NavegaÃ§Ã£o em modo privado)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 5e0ef84..67e8649 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PreferÃªncias do Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes do Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utilize as configuraÃ§Ãµes recomendadas do proxy para a minha versÃ£o do Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utilizar as configuraÃ§Ãµes do proxy personalizadas">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.about.title "Sobre o Torbutton">
-<!ENTITY torbutton.about.version "VersÃ£o:">
-<!ENTITY torbutton.about.summary "Protege a privacidade da sua navegaÃ§Ã£o Tor.">
-<!ENTITY torbutton.about.code "Contribuidores do cÃ³digo:">
-<!ENTITY torbutton.about.maintainer "Defensor:">
-<!ENTITY torbutton.about.security_review "RevisÃ£o de seguranÃ§a:">
-<!ENTITY torbutton.about.donate "Se gosta de utilizar o Tor, poderÃ¡ considerar">
-<!ENTITY torbutton.about.make_donation "efetuar uma doaÃ§Ã£o.">
 <!ENTITY torbutton.pref_connection.notice "Desativar o Torbutton para alterar estas configuraÃ§Ãµes.">
 <!ENTITY torbutton.pref_connection.more_info "Mais informaÃ§Ã£o">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Alterar estado do Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes de SeguranÃ§a e Privacidade...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Sobre o Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraÃ§Ãµes da Rede Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizaÃ§Ãµes do Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes de Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar URL do Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num novo Separador ">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir o URL do Tor numa nova Janela ">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a">
-<!ENTITY torbutton.prefs.block_thread "Bloquear a leitura do histÃ³rico durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquear a gravaÃ§Ã£o no histÃ³rico durante a utilizaÃ§Ã£o do Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear a leitura do histÃ³rico durante a nÃ£o utilizaÃ§Ã£o do Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear a gravaÃ§Ã£o no histÃ³rico durante a nÃ£o utilizaÃ§Ã£o do Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_history "Limpar o histÃ³rico ao alternar a utilizaÃ§Ã£o do Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear a cache de disco do Tor e limpar toda a cache ao alternar a utilizaÃ§Ã£o do Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquear a cache de memÃ³ria e acesso de disco durante a utilizaÃ§Ã£o do Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Guardar todos os cookies NÃ£o-Tor num local protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Utilizar a janela das ProteÃ§Ãµes de Cookies para escolher">
-<!ENTITY torbutton.prefs.mmm_cookies "Eu irei gerir manualmente os meus cookies (perigoso)">
-<!ENTITY torbutton.prefs.clear_cookies "Limpar os cookies quando alternar a utilizaÃ§Ã£o do Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Desativar as extensÃµes durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Captar  javascript perigosos (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolar o conteÃºdo dinÃ¢mico para o estado do Tor (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Desativar as atualizaÃ§Ãµes durante a utilizaÃ§Ã£o do Tor">
-<!ENTITY torbutton.prefs.set_uagent "Definir o agente do utilizador durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.dynamic "ConteÃºdo DinÃ¢mico">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "HistÃ³rico">
-<!ENTITY torbutton.prefs.no_search "Desativar as sugestÃµes de procura durante a utilizaÃ§Ã£o do Tor (recomendado)">
-<!ENTITY torbutton.prefs.shutdown "Encerrar">
-<!ENTITY torbutton.prefs.tor_shutdown "Limpar os cookies durante o encerramento do navegador Tor ativado">
-<!ENTITY torbutton.prefs.all_shutdown "Limpar os cookies durante o encerramento de qualquer navegador">
-<!ENTITY torbutton.prefs.no_shutdown "NÃ£o limpar os meus cookies ao encerrar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Desativar FunÃ§Ã£o de Guardar a SessÃ£o (recomendado)">
-<!ENTITY torbutton.prefs.headers "CabeÃ§alhos">
-<!ENTITY torbutton.prefs.refererspoofing "Enganar remetente">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "FalsificaÃ§Ã£o inteligente do referente durante o uso do Tor (falsifica referentes de domÃnios cruzados)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Desativar o armazenamento DOM durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.forms "FormulÃ¡rios">
-<!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + formulÃ¡rio durante a utilizaÃ§Ã£o do Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquear senha + formulÃ¡rio durante a utilizaÃ§Ã£o do Tor (opcional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "NÃ£o-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Na sessÃ£o restaurada do arranque, definir o estado do Tor para:">
-<!ENTITY torbutton.prefs.startup_tor "No arranque do Browser, definir o estado do Tor para:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookies/limpar cookies no crache do Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Guardar ambos os cookies do Tor ou NÃ£o-Tor nos recipientes protegidos (perigoso)">
-<!ENTITY torbutton.prefs.clear_http_auth "Limpar a autorizaÃ§Ã£o das sessÃµes HTTP (recomendado)">
-<!ENTITY torbutton.prefs.block_js_history "Isolar o acesso ao histÃ³rico de navegaÃ§Ã£o ao arquivo de estado de Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Alterar o tamanho das pÃ¡ginas em mÃºltiplos de 50px durante o uso de Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor "Fechar todas as pÃ¡ginas e abas abertas com Tor ao clicar no Ãcone do Torbutton (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Fechar todas as pÃ¡ginas e abas nÃ£o-Tor ao clicar no Ãcone do Torbutton (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloquear os cliques em endereÃ§os e as recarga de pÃ¡ginas de diferentes arquivos de estado de Tor (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Armazene certificados SSL em arquivos de estado do Tor separados para pÃ¡ginas Tor e nÃ£o-Tor (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Armazene certificados CA em arquivos de estado separados para pÃ¡ginas Tor e nÃ£o-Tor (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Desactivar botÃ£o e atalhos para prevenir a activaÃ§Ã£o/desactivaÃ§Ã£o por engano">
-<!ENTITY torbutton.prefs.startup_state "Na inicializaÃ§Ã£o normal, definir o estado do Tor para:">
-<!ENTITY torbutton.prefs.shutdown_state "Estado do encerramento">
-<!ENTITY torbutton.prefs.startup "Arranque">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear o acesso do Tor Ã  rede a partir de file:// urls (recomendado)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear o acesso de NÃ£o-Tor Ã  rede a partir de file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar PredefiniÃ§Ãµes">
 <!ENTITY torbutton.prefs.test_settings "Testar ConfiguraÃ§Ãµes">
-<!ENTITY torbutton.prefs.test_auto "Testar as minhas configuraÃ§Ãµes sempre que o Firefox iniciar, apÃ³s a primeira activaÃ§Ã£o do Torbutton">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "NÃ£o gravar os cookies do Tor para disco">
-<!ENTITY torbutton.prefs.nontor_memory_jar "NÃ£o gravar os cookies NÃ£o-Tor para disco">
-<!ENTITY torbutton.prefs.session_restore "Guarde a sessÃ£o e restaure estes separadores:">
-<!ENTITY torbutton.prefs.nontor_tabs "Separadores carregados na utilizaÃ§Ã£o de NÃ£o-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Separadores carregados na utilizaÃ§Ã£o do Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite utilizar quaisquer nomes de hospedeiro acima">
-<!ENTITY torbutton.prefs.spoofreresh "Refrescamento da falsificaÃ§Ã£o">
-<!ENTITY torbutton.prefs.refereroptions "OpÃ§Ãµes de falsificaÃ§Ã£o do referente">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Enganar a pasta da pÃ¡gina">
-<!ENTITY torbutton.prefs.spoofdomain "Enganar o domÃnio como remetente">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Gerir ProteÃ§Ãµes dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirecionar as atualizaÃ§Ãµes do Torbutton atravÃ©s do Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Utilizar automaticamente um mecanismo de procura alternativo quando lhe for apresentado um Captcha Google:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "TorrificaÃ§Ã£o Transparente (requer transpoxy personalizado ou encaminhamento do Tor)">
 <!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
 <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou os dados do site da Web (ativa o Modo de NavegaÃ§Ã£o Privado)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript pode ser ativada numa base de por cada site atravÃ©s do botÃ£o da barra de ferramentas NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript estÃ¡ desativada por predefiniÃ§Ã£o em todos os sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de Ã¡udio e vÃdeo estÃ£o desativados.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM Ã© o Ãºnico codec que se mantÃ©m ativado.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e Ãcones poderÃ£o ser visualizados incorretamente.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo site da Web estÃ£o bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 3e19345..2a7e79b 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PreferinÈ›e Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "SetÄƒrile pentru proxy">
 <!ENTITY torbutton.prefs.recommended_settings "FoloseÈ™te setÄƒrile pentru proxy recomandate pentru versiunea mea de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "FoloseÈ™te Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "FoloseÈ™te Polipo">
 <!ENTITY torbutton.prefs.custom_settings "FoloseÈ™te setÄƒri individualizate pentru proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Portul:">
-<!ENTITY torbutton.about.title "Despre Torbutton">
-<!ENTITY torbutton.about.version "Versiune:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Contribuitori Cod:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Revizie Securitate:">
-<!ENTITY torbutton.about.donate "Daca va place sa utiliuzati Tor, ati putea considera:">
-<!ENTITY torbutton.about.make_donation "faceti o donatie.">
 <!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄƒri.">
 <!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄƒ Ã®n acest moment. DacÄƒ doriÅ£i sÄƒ schimbaÅ£i setÄƒrile non-proxy Tor, dezactivaÅ£i Torbutton ÅŸi vÄƒ rugÄƒm sÄƒ reveniÅ£i aici. DacÄƒ doriÅ£i sÄƒ vÄƒ schimbaÅ£i setÄƒrile Tor, vÄƒ rugÄƒm sÄƒ folosiÅ£i fereastra de preferinÅ£Äƒ Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identitate noua">
 <!ENTITY torbutton.context_menu.new_identity_key "l">
-<!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PreferinÈ›e...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Despre Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri.">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiaza URL-ul Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Deschide URL-ul Tor intr-o noua fila.">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Deschide URL-ul Tor intr-o noua fereastra.">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Butonul Tor">
 <!ENTITY torbutton.button.tooltip "ApasÄƒ pentru pornirea Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "SetÄƒri de securitate">
-<!ENTITY torbutton.prefs.block_thread "BlocheazÄƒ citirea istoricului Ã®n timpul Tor (esenÅ£ial)">
-<!ENTITY torbutton.prefs.block_thwrite "BlocheazÄƒ scrierea istoriei in timpul Tor (recomandat)">
-<!ENTITY torbutton.prefs.block_nthread "BlocheazÄƒ citirea istoricului in timpul non-Tor(opÅ£ional)">
-<!ENTITY torbutton.prefs.block_nthwrite "BlocheazÄƒ scrierea istoriei in timpul non-Tor(opÅ£ional)">
-<!ENTITY torbutton.prefs.clear_history "Åžterge istoricul cÃ¢nd comuÅ£ Tor(opÅ£ional)">
-<!ENTITY torbutton.prefs.clear_cache "BlocheazÄƒ Tor cache si sterge toate chache-urile cÃ¢nd  comuÅ£ Tor">
-<!ENTITY torbutton.prefs.block_cache "Blocheaza accesarea discului so memoriei cÃ¢nd Tor este pornit">
-<!ENTITY torbutton.prefs.cookie_jars "PÄƒstreazÄƒ cookie-urile non-Tor Ã®ntr-o cutie protejate">
-<!ENTITY torbutton.prefs.cookie_protection "FoloseÅŸte fereastra ProtecÅ£ii Cookie pentru a alege">
-<!ENTITY torbutton.prefs.mmm_cookies "Eu voi gestiona manual cookie-urile mele (periculos)">
-<!ENTITY torbutton.prefs.clear_cookies "Åžterge cookie-urile cÃ¢nd comut Tor">
-<!ENTITY torbutton.prefs.disable_plugins "OpreÅŸte plugin-urile in timpul funcÅ£ionÄƒri lui Tor(esenÅ£ial)">
-<!ENTITY torbutton.prefs.kill_bad_js "AgÄƒÅ£a javascript-urile periculoase (esenÅ£ial)">
-<!ENTITY torbutton.prefs.isolate_content "IzoleazÄƒ conÅ£inutul dinamic pentru star lui Tor(esenÅ£ial)">
-<!ENTITY torbutton.prefs.no_updates "OpreÅŸte actualizÄƒrile in timpul funcÅ£ionÄƒri lui Tor">
-<!ENTITY torbutton.prefs.set_uagent "SeteazÄƒ user agentul pentru funcÅ£ionarea lui Tor(esenÅ£ial)">
-<!ENTITY torbutton.prefs.dynamic "ConÅ£inut dinamic ">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Istoric">
-<!ENTITY torbutton.prefs.no_search "OpreÅŸte cÄƒutarea sugestilor in timpul fucÅ£ionÄƒri lui Tor (recomandat)">
-<!ENTITY torbutton.prefs.shutdown "Inchide">
-<!ENTITY torbutton.prefs.tor_shutdown "È˜terge cookie-urile Tor la Ã®nchiderea browser-ului cu o sesiune Tor activÄƒ">
-<!ENTITY torbutton.prefs.all_shutdown "È˜terge cookie-urile la oricare Ã®nchidere a browser-ului ">
-<!ENTITY torbutton.prefs.no_shutdown "Nu È™terge cookie-urile mele la Ã®nchidere">
-<!ENTITY torbutton.prefs.disable_sessionstore "DezactivaÈ›i salvarea sesiunilor (recomandat)">
-<!ENTITY torbutton.prefs.headers "Antete">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "OpreÈ™te DOM Storage Ã®n timpul funcÈ›ionÄƒrii Tor (important)">
-<!ENTITY torbutton.prefs.forms "Forme">
-<!ENTITY torbutton.prefs.block_tforms "BlocheazÄƒ salvarea parolelor È™i datele pentru completÄƒri Ã®n timpul utilizÄƒrii Tor (recomandat)">
-<!ENTITY torbutton.prefs.block_ntforms "BlocheazÄƒ salvarea parolelor È™i datelor pentru auto-completÄƒri Ã®n timpul utilizÄƒrii Non-Tor (opÈ›ional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "La Ã®niÈ›ierea sesiunii restaurate, fixeazÄƒ statutul Tor la:">
-<!ENTITY torbutton.prefs.startup_tor "La pornirea browserului, seteaza starea Tor la:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "RestaureazÄƒ/È™terge cookie-urile dupÄƒ avarierea Firefox">
-<!ENTITY torbutton.prefs.dual_cookie_jars "SalveazÄƒ cookie-urile Tor È™i Non-Tor Ã®n fiÈ™iere protejate (periculos)">
-<!ENTITY torbutton.prefs.clear_http_auth "È˜terge sesiunile de autentificare HTTP (recomandat)">
-<!ENTITY torbutton.prefs.block_js_history "IzolaÈ›i accesul la istoricul navigÄƒrilor al statutul Tor (important)">
-<!ENTITY torbutton.prefs.resize_on_toggle "RedimensioneazÄƒ fereastra de lucru cu multiplul a 50px Ã®n timpul utilizÄƒrii Tor (recomandat)">
-<!ENTITY torbutton.prefs.close_tor "ÃŽnchide toate ferestrele È™i filele Tor la pornire/oprire (opÈ›ional)">
-<!ENTITY torbutton.prefs.close_nontor "ÃŽnchide toate ferestrele È™i filele Non-Tor la oprire/pornire (opÈ›ional)">
-<!ENTITY torbutton.prefs.block_links "BlocheazÄƒ accesarea link-urilor È™i reÃ®ncÄƒrcarea paginilor din diferite statute Tor (opÈ›ional)">
-<!ENTITY torbutton.prefs.jar_certs "PÄƒstreazÄƒ certificare SSL Ã®n fiÈ™iere jar separate pentru Tor/Non-Tor (recomandat)">
-<!ENTITY torbutton.prefs.jar_ca_certs "PÄƒstreazÄƒ certificate CA Ã®n fiÈ™iere jar separate pentru Tor/Non-Tor (recomandat)">
-<!ENTITY torbutton.prefs.locked_mode "DezactiveazÄƒ Butonul È™i CombinaÈ›iile de Taste pentru a preveni oprirea accidentalÄƒ">
-<!ENTITY torbutton.prefs.startup_state "La pornire normalÄƒ, stabileÈ™te statutul Tor la:">
-<!ENTITY torbutton.prefs.shutdown_state "Nu porniÈ›i Tor">
-<!ENTITY torbutton.prefs.startup "PorneÈ™te">
-<!ENTITY torbutton.prefs.block_tor_file_net "BlocheazÄƒ accesul Tor la reÈ›ea din adrese file:// (recomandat)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "BlocheazÄƒ accesul Non-Tor la reÈ›ea din adrese file:// ">
 <!ENTITY torbutton.prefs.restore_defaults "RestaureazÄƒ setÄƒrile implicite">
 <!ENTITY torbutton.prefs.test_settings "SetÄƒrile pentru testÄƒri">
-<!ENTITY torbutton.prefs.test_auto "TesteazÄƒ setÄƒrile mele pentru Tor dupÄƒ prima pornire/oprire la fiecare demarare Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Nu scrie cookie-urile Tor pe disc">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Nu scrie cookie-urile Non-Tor pe disc">
-<!ENTITY torbutton.prefs.session_restore "FÄƒ ca sesiunea sÄƒ salveze È™i sÄƒ restaureze urmÄƒtoarele file: ">
-<!ENTITY torbutton.prefs.nontor_tabs "File Ã®ncÄƒrcate Ã®n Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "File Ã®ncÄƒrcate Ã®n Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nici un proxy pentru:">
 <!ENTITY torbutton.prefs.no_proxy_warning "ATENÈšIE: EvitaÈ›i sÄƒ folosiÈ›i unul din hostname-le de mai sus">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "GestioneazÄƒ ProtecÅ£ii Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protejat">
 <!ENTITY torbutton.cookiedialog.domainCol "Gazda">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
-<!ENTITY torbutton.prefs.disable_livemarks "OpreÅŸte actualizÄƒrile Livemark Ã®n timpul funcÅ£ionÄƒri lui Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recomandat)">
-<!ENTITY torbutton.prefs.dtd_optional "(opÈ›ional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "RedirecÈ›ioneazÄƒ actualizÄƒrile Torbutton prin intermediul Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "FoloseÈ™te automat un alt motor de cÄƒutare cÃ®nd apare Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Torificare transparentÄƒ (NecesitÄƒ transproy sau Tor modificat)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 80e6382..36a27e6 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¾ÐºÑÐ¸">
 <!ENTITY torbutton.prefs.recommended_settings "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¿Ñ€Ð¾ÐºÑÐ¸, Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-Ð¿Ñ€Ð¾ÐºÑÐ¸:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-Ð¿Ñ€Ð¾ÐºÑÐ¸:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»:">
 <!ENTITY torbutton.prefs.proxy.port "ÐŸÐ¾Ñ€Ñ‚:">
-<!ENTITY torbutton.about.title "Ðž Torbutton">
-<!ENTITY torbutton.about.version "Ð’ÐµÑ€ÑÐ¸Ñ:">
-<!ENTITY torbutton.about.summary "Ð—Ð°Ñ‰Ð¸Ñ‰Ð°ÐµÑ‚ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ† Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Tor.">
-<!ENTITY torbutton.about.code "Ð Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹:">
-<!ENTITY torbutton.about.maintainer "Ð¡Ð¾Ð¿Ñ€Ð¾Ð²Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ:">
-<!ENTITY torbutton.about.security_review "ÐžÐ±Ð·Ð¾Ñ€ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸:">
-<!ENTITY torbutton.about.donate "Ð•ÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½Ñ€Ð°Ð²Ð¸Ñ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Tor, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ">
-<!ENTITY torbutton.about.make_donation "Ð²Ð½ÐµÑÑ‚Ð¸ Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ðµ.">
 <!ENTITY torbutton.pref_connection.notice "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Torbutton Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾.">
 <!ENTITY torbutton.pref_connection.more_info "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ÑÑ‚Ð¸">
 <!ENTITY torbutton.pref_connection_more_info.title "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð¯">
 <!ENTITY torbutton.context_menu.new_circuit "ÐÐ¾Ð²Ð°Ñ Ñ†ÐµÐ¿Ð¾Ñ‡ÐºÐ° Tor Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ cÐ°Ð¹Ñ‚Ð°">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸ Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸">
 <!ENTITY torbutton.context_menu.preferences.key "Ð">
-<!ENTITY torbutton.context_menu.about "Ðž Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "Ð">
 <!ENTITY torbutton.context_menu.networksettings "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐµÑ‚Ð¸ Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð½Ð° Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Tor Browser">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð—Ð°Ñ‰Ð¸Ñ‚Ð° ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ð°">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ URL Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "ÐŸ">
-<!ENTITY torbutton.context_menu.openTorTab "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Tor URL Ð² Ð½Ð¾Ð²Ð¾Ð¹ Ð²ÐºÐ»Ð°Ð´ÐºÐµ">
-<!ENTITY torbutton.context_menu.openTorTab.key "Ð ">
-<!ENTITY torbutton.context_menu.openTorWindow "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Tor URL Ð² Ð½Ð¾Ð²Ð¾Ð¼ Ð¾ÐºÐ½Ðµ">
-<!ENTITY torbutton.context_menu.openTorWindow.key "Ð”">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸ Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸">
-<!ENTITY torbutton.prefs.block_thread "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‡Ñ‚ÐµÐ½Ð¸Ðµ Ð¸Ð· Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_thwrite "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð² Ð¶ÑƒÑ€Ð½Ð°Ð» Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.block_nthread "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‡Ñ‚ÐµÐ½Ð¸Ðµ Ð¸Ð· Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Ð½Ðµ-Tor (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð² Ð¶ÑƒÑ€Ð½Ð°Ð» Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Ð½Ðµ-Tor (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_history "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð» Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cache "Ð—Ð°Ð¿Ñ€ÐµÑ‰Ð°Ñ‚ÑŒ ÐºÑÑˆÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð° Ð´Ð¸ÑÐº Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor Ð¸ Ð¾Ñ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð²ÐµÑÑŒ ÐºÑÑˆ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor">
-<!ENTITY torbutton.prefs.block_cache "ÐŸÐ¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÐºÑÑˆ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ cookies Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Ð½Ðµ-Tor Ð² Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ð¾Ð¼ Ñ„Ð°Ð¹Ð»Ðµ">
-<!ENTITY torbutton.prefs.cookie_protection "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ cookie Ð½Ð° Ð²Ñ‹Ð±Ð¾Ñ€">
-<!ENTITY torbutton.prefs.mmm_cookies "Ð ÑƒÑ‡Ð½Ð¾Ðµ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ cookies (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cookies "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ cookies Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor">
-<!ENTITY torbutton.prefs.disable_plugins "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ‹ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.kill_bad_js "ÐŸÐµÑ€ÐµÑ…Ð²Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ð¿Ð°ÑÐ½Ñ‹Ð¹ ÐºÐ¾Ð´ javascript (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.isolate_content "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡Ð¸Ñ‚ÑŒ Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.no_updates "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor">
-<!ENTITY torbutton.prefs.set_uagent "ÐœÐ°ÑÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dynamic "Ð”Ð¸Ð½Ð°Ð¼Ð¸Ñ‡Ð½Ð¾Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "ÐšÑÑˆ">
-<!ENTITY torbutton.prefs.history "Ð–ÑƒÑ€Ð½Ð°Ð»">
-<!ENTITY torbutton.prefs.no_search "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²Ñ‹Ðµ Ð·Ð°Ð¿Ñ€Ð¾ÑÑ‹ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.shutdown "Ð—Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ">
-<!ENTITY torbutton.prefs.tor_shutdown "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Tor, ÐµÑÐ»Ð¸ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚ÑÑ Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ð¼ Tor">
-<!ENTITY torbutton.prefs.all_shutdown "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ñ€Ð¸ Ð»ÑŽÐ±Ð¾Ð¼ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°">
-<!ENTITY torbutton.prefs.no_shutdown "ÐÐµ Ð¾Ñ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°">
-<!ENTITY torbutton.prefs.disable_sessionstore "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ ÑÐµÑÑÐ¸Ð¹ (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.headers "Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸">
-<!ENTITY torbutton.prefs.refererspoofing "ÐŸÐ¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð·Ð°Ð¿Ñ€Ð¾ÑÐ° (Ñ€ÐµÑ„ÐµÑ€ÐµÑ€)">
-<!ENTITY torbutton.prefs.spoofblank "Ð˜Ð¼Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ð¾Ð¹ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor (Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐ°Ð¹Ñ‚Ð¾Ð²)">
-<!ENTITY torbutton.prefs.smartspoof "Ð›Ð¾Ð²ÐºÐ°Ñ Ð¿Ð¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor (Ð¿Ð¾Ð´Ð¼ÐµÐ½Ð° Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘ÑÑ‚Ð½Ñ‹Ñ… Ð´Ð¾Ð¼ÐµÐ½Ð½Ñ‹Ñ… Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð¾Ð²)">
-<!ENTITY torbutton.prefs.nospoof "ÐÐµ Ð¸Ð¼Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor (Ð¾Ñ‚ÑÑ‹Ð»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ðµ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ñ‹)">
-<!ENTITY torbutton.prefs.disable_domstorage "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ DOM Storage Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ€Ð¼Ñ‹">
-<!ENTITY torbutton.prefs.block_tforms "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ñ„Ð¾Ñ€Ð¼ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.block_ntforms "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ñ„Ð¾Ñ€Ð¼ Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ð¼ Tor (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ð’Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor">
-<!ENTITY torbutton.prefs.restore_tor "Ð’Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿ÑƒÑÐºÐ° Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ ÑÐµÑÑÐ¸Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Tor:">
-<!ENTITY torbutton.prefs.startup_tor "ÐŸÑ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Tor:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ/Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ Ð¾ÑˆÐ¸Ð±Ð¾Ðº Ð² Ñ€Ð°Ð±Ð¾Ñ‚Ðµ Firefox (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð²ÑÐµ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð² Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ñ‹Ñ… Ñ„Ð°Ð¹Ð»Ð°Ñ… (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_http_auth "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ ÑÐµÑÑÐ¸Ð¸ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ HTTP (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.block_js_history "ÐžÑ‚ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð¸Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ Ð² Ð½Ñ‹Ð½ÐµÑˆÐ½ÐµÐ¼ Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.resize_on_toggle "ÐœÐ°ÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾ÐºÐ½Ð° ÐºÑ€Ð°Ñ‚Ð½Ð¾ 50 Ð¿Ð¸ÐºÑÐµÐ»Ð°Ð¼ Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.close_tor "Ð—Ð°ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Tor Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.close_nontor "Ð—Ð°ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.block_links "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‰ÐµÐ»Ñ‡ÐºÐ¸ Ð¿Ð¾ ÑÑÑ‹Ð»ÐºÐ°Ð¼ Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ† Ð¸Ð· Ñ€Ð°Ð·Ð½Ñ‹Ñ… Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor (Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.jar_certs "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ SSL Ð² Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… jar-Ñ„Ð°Ð¹Ð»Ð°Ñ… Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ /Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ CA Ð² Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… jar-Ñ„Ð°Ð¹Ð»Ð°Ñ… Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° /Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.locked_mode "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ "ÐšÐ½Ð¾Ð¿ÐºÑƒ" Ð¸ "Ð“Ð¾Ñ€ÑÑ‡Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸" Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ñ ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð°">
-<!ENTITY torbutton.prefs.startup_state "ÐŸÑ€Ð¸ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð¼ Ð·Ð°Ð¿ÑƒÑÐºÐµ (Ð±ÐµÐ· Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐµÑÑÐ¸Ð¸) ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Tor:">
-<!ENTITY torbutton.prefs.shutdown_state "Ð’Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ðµ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ">
-<!ENTITY torbutton.prefs.startup "Ð—Ð°Ð¿ÑƒÑÐº">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐµÑ‚Ð¸ Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑÐ¾Ð² Ñ‚Ð¸Ð¿Ð° file:// (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐµÑ‚Ð¸ Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑÐ¾Ð² Ñ‚Ð¸Ð¿Ð° file://">
 <!ENTITY torbutton.prefs.restore_defaults "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ">
 <!ENTITY torbutton.prefs.test_settings "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
-<!ENTITY torbutton.prefs.test_auto "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Tor ÐºÐ°Ð¶Ð´Ñ‹Ð¹ Ñ€Ð°Ð· Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ ÑÑ‚Ð¾Ñ‚ Ñ€ÐµÐ¶Ð¸Ð¼ Ð¿Ñ€Ð¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð·Ð°Ð¿ÑƒÑÐºÐµ Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ livemarks Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor">
-<!ENTITY torbutton.prefs.tor_memory_jar "ÐÐµ Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ÐÐµ Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹ Ð½Ð° Ð´Ð¸ÑÐº Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor">
-<!ENTITY torbutton.prefs.session_restore "ÐœÐ¾Ð¶ÐµÑ‚ Ð»Ð¸ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒÑÑ Ð¸ Ð²Ð¾ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒÑÑ ÑÐµÑÑÐ¸Ñ ÑÐ¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¼Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ð’ÐºÐ»Ð°Ð´ÐºÐ¸, Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ð²Ð½Ðµ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Ð’ÐºÐ»Ð°Ð´ÐºÐ¸, Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹Ðµ Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS 4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS 5">
 <!ENTITY torbutton.prefs.no_proxies_on "ÐÐµÑ‚ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ: ÐÐµ Ð²Ð½Ð¾ÑÐ¸Ñ‚Ðµ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ… Ð¸Ð¼ÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð² Ð² Ð¿Ð¾Ð»Ðµ Ð²Ñ‹ÑˆÐµ">
-<!ENTITY torbutton.prefs.spoofreresh "Ð¡Ñ‚ÐµÑ€ÐµÑ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ð¿Ð¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº">
-<!ENTITY torbutton.prefs.refereroptions "ÐžÐ¿Ñ†Ð¸Ð¸ Ð¿Ð¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð¾Ð²">
-<!ENTITY torbutton.prefs.nospoof "ÐÐµ Ð¸Ð¼Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor (Ð¾Ñ‚ÑÑ‹Ð»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ðµ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ñ‹)">
-<!ENTITY torbutton.prefs.spoofroot "ÐŸÐ¾Ð´Ð¼ÐµÐ½Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ñ… Ð¿Ð°Ð¿ÐºÐ¸ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹">
-<!ENTITY torbutton.prefs.spoofdomain "ÐŸÐ¾Ð´Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¼ÐµÐ½ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð°">
-<!ENTITY torbutton.prefs.spoofblank "Ð˜Ð¼Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ð¾Ð¹ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor (Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¸Ð²ÐµÑÑ‚Ð¸ Ðº Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐ°Ð¹Ñ‚Ð¾Ð²)">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¾Ð¹ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ð¾Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð’ÐµÐ´ÑƒÑ‰Ð¸Ð¹ ÑƒÐ·ÐµÐ»">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²ÑÐµ, ÐºÑ€Ð¾Ð¼Ðµ Ð·Ð°Ñ‰Ð¸Ñ‰Ñ‘Ð½Ð½Ñ‹Ñ…">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð—Ð°Ñ‰Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ Ð·Ð°Ñ‰Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ ÐºÑƒÐºÐ¸-Ñ„Ð°Ð¹Ð»Ñ‹">
-<!ENTITY torbutton.prefs.disable_livemarks "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ livemarks Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Torbutton Ñ‡ÐµÑ€ÐµÐ· Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½ÑƒÑŽ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ðµ Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "ÐŸÑ€Ð¾Ð·Ñ€Ð°Ñ‡Ð½Ð°Ñ "Ñ‚Ð¾Ñ€Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ" (Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ñ… transproxy Ð¸Ð»Ð¸ Tor-Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð°)">
 <!ENTITY torbutton.prefs.priv_caption "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸">
 <!ENTITY torbutton.prefs.block_disk "ÐÐµ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð¸ÑÑ‚Ð¾Ñ€Ð¸ÑŽ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð¿Ð¾ÑÐµÑ‰ÐµÐ½Ð¸Ð¹ Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ñ Ð¿Ð¾ÑÐµÑ‰Ð°ÐµÐ¼Ñ‹Ñ… ÑÐ°Ð¹Ñ‚Ð¾Ð² (Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÐµÑ‚ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÑŽ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð°)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½ Ð½Ð° ÑÐ°Ð¹Ñ‚Ðµ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐºÐ½Ð¾Ð¿ÐºÐ¸ NoScript Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð².">
 <!ENTITY torbutton.prefs.sec_high "Ð’Ñ‹ÑÐ¾ÐºÐ¸Ð¹">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð½Ð° Ð²ÑÐµÑ… ÑÐ°Ð¹Ñ‚Ð°Ñ….">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ Ð°ÑƒÐ´Ð¸Ð¾ Ð¸ Ð²Ð¸Ð´ÐµÐ¾ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¾Ð² Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÐºÐ¾Ð´ÐµÐºÐ¾Ð¼, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð¾ÑÑ‚Ð°ÐµÑ‚ÑÑ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ð¼.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "ÐÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑˆÑ€Ð¸Ñ„Ñ‚Ñ‹ Ð¸ Ð·Ð½Ð°Ñ‡ÐºÐ¸ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð¤Ð°Ð¹Ð»Ñ‹ ÑˆÑ€Ð¸Ñ„Ñ‚Ð¾Ð², Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ðµ ÑÐ°Ð¹Ñ‚Ð¾Ð¼, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹">
 <!ENTITY torbutton.prefs.sec_custom "Ð¡Ð¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ñ‹Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ">
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 8535f04..1daf430 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Nastavenie proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "PomocnÃk">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "NovÃ¡ identita">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ predvolenÃ©">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.dtd_optional "(voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kritickÃ©)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 29ae9cd..074e67b 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Nastavitve za Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Nastavitve posredniÅ¡kega (proxy) streÅ¾nika">
 <!ENTITY torbutton.prefs.recommended_settings "Uporabi priporoÄene nastavitve posredniÅ¡kega streÅ¾nika za mojo razliÄico Firefoxa">
-<!ENTITY torbutton.prefs.use_privoxy "Uporabi tudi povezavo preko Privoxy-a">
 <!ENTITY torbutton.prefs.use_polipo "uporaba polipo">
 <!ENTITY torbutton.prefs.custom_settings "Uporabi nastavitve proxy streÅ¾nika po meri">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP posredniÅ¡ki streÅ¾nik:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher posredniÅ¡ki streÅ¾nik:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS gostitelj:">
 <!ENTITY torbutton.prefs.proxy.port "Vrata:">
-<!ENTITY torbutton.about.title "O razÅ¡iritvi Torbutton">
-<!ENTITY torbutton.about.version "verzija">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "ÄŒe vam je Tor vÅ¡eÄ, vas bo morda zanimalo tudi:">
-<!ENTITY torbutton.about.make_donation "doniraj">
 <!ENTITY torbutton.pref_connection.notice "ÄŒe Å¾elite spremeniti te nastavitve onemogoÄite razÅ¡iritev Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "VeÄ informacij">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ">
 <!ENTITY torbutton.pref_connection_more_info.text "RazÅ¡iritev Torbutton je trenutno omogoÄena. ÄŒe Å¾elite spremeniti nastavitve ne-Tor posredniÅ¡kega streÅ¾nika (proxy) najprej onemogoÄite razÅ¡iritev Torbutton, nato pa se vrnite na to mesto. ÄŒe Å¾elite spremeniti nastavitve povezave v Tor omreÅ¾je uporabite nastavitve razÅ¡iritve Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "nova indetiteta">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Zamenjaj status anonimizacije">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Nastavitve...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "O razÅ¡iritvi Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "piÅ¡kotkina zaÅ¡Äita">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopiraj Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Odpri Tor URL v novem zavitku">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Odpri Tor URL v novem oknu">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Varnostne nastavitve">
-<!ENTITY torbutton.prefs.block_thread "Prepovej branje zgodovine med uporabo Tor-a (obvezno)">
-<!ENTITY torbutton.prefs.block_thwrite "Prepovej zapisovanje zgodovine med uporabo Tor-a (priporoÄeno)">
-<!ENTITY torbutton.prefs.block_nthread "Prepovej branje zgodovine, ko Tor ni v uporabi (neobvezno)">
-<!ENTITY torbutton.prefs.block_nthwrite "Prepovej zapisovanje zgodovine, ko Tor ni v uporabi (neobvezno)">
-<!ENTITY torbutton.prefs.clear_history "PoÄisti zgodovino med preklopom Tor-a (neobvezno)">
-<!ENTITY torbutton.prefs.clear_cache "Prepovej zapisovanje medpomnilnika na disk ter brisanje medpomnilnika ob preklopu Tor-a">
-<!ENTITY torbutton.prefs.block_cache "Prepovej zapisovanje (na disk in zaÄasni spomin) medpomnilnika med uporabo Tor-a">
-<!ENTITY torbutton.prefs.cookie_jars "Shrani ne-Tor piÅ¡kotke v zaÅ¡Äiten predal">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "Samodejno bom upravljal z piÅ¡kotki (nevarno)">
-<!ENTITY torbutton.prefs.clear_cookies "ZbriÅ¡i piÅ¡kotke ob preklopu Tor-a">
-<!ENTITY torbutton.prefs.disable_plugins "OnemogoÄi dodatke med uporabo Tor-a (obvezno)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ustavi nevarne javascript-e (obvezno)">
-<!ENTITY torbutton.prefs.isolate_content "IzloÄi dinamiÄne vsebine za stanje Tor-a (obvezno)">
-<!ENTITY torbutton.prefs.no_updates "OnemogoÄi nadgradnje med uporabo Tor-a">
-<!ENTITY torbutton.prefs.set_uagent "Nastavi brskalnik za uporabo Tor-a (obvezno)">
-<!ENTITY torbutton.prefs.dynamic "DinamiÄne vsebine">
-<!ENTITY torbutton.prefs.cookies "PiÅ¡kotki">
-<!ENTITY torbutton.prefs.cache "Medpomnilnik">
-<!ENTITY torbutton.prefs.history "Zgodovina">
-<!ENTITY torbutton.prefs.no_search "OnemogoÄi predlagana Iskanja med uporabo Tor-a (priporoÄeno)">
-<!ENTITY torbutton.prefs.shutdown "Ugasni">
-<!ENTITY torbutton.prefs.tor_shutdown "ZbriÅ¡i Tor piÅ¡kotke pri ugaÅ¡anju Tor-aktivnega brskalnika">
-<!ENTITY torbutton.prefs.all_shutdown "ZbriÅ¡i piÅ¡kotke pri ugaÅ¡anju brskalnika">
-<!ENTITY torbutton.prefs.no_shutdown "Ne zbriÅ¡i piÅ¡kotkov pri ugaÅ¡anju">
-<!ENTITY torbutton.prefs.disable_sessionstore "OnemogoÄi shranjevanje sej (proporoÄeno)">
-<!ENTITY torbutton.prefs.headers "Headers (informacije na zaÄetku paketa - naslavljanje)">
-<!ENTITY torbutton.prefs.refererspoofing "osveÅ¾i prevaro">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "OnemogoÄi DOM shranjevanje med uporabo Tor-a (obvezno)">
-<!ENTITY torbutton.prefs.forms "Obrazci">
-<!ENTITY torbutton.prefs.block_tforms "Prepovej shranjevanje vnosov v obrazce in gesel med uporabo Tor-a (priporoÄeno)">
-<!ENTITY torbutton.prefs.block_ntforms "Prepovej shranjevanje vnosov v obrazce in gesel, ko Tor ni v uporabi (neobvezno)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ne-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Ob zaÄetku obnovljene seje nastavi Tor na:">
-<!ENTITY torbutton.prefs.startup_tor "Ob zagonu brskalnika nastavi stanje Tor-a na:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "NaloÅ¾i piÅ¡kotke iz predala /poÄisti piÅ¡kotke, Äe se Firefox samodejno zapre (proporoÄeno)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Shrani Tor in ne-tor piÅ¡kotke v zaÅ¡Äiten predal (nevarno)">
-<!ENTITY torbutton.prefs.clear_http_auth "PoÄisti HTTP seje (priporoÄeno)">
-<!ENTITY torbutton.prefs.block_js_history "IzloÄi dostop do pregleda zgodovine v Tor stanje (obvezno)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Spremeni velikost oken na veÄ 50px oken med uporabo Tor-a (priporoÄeno)">
-<!ENTITY torbutton.prefs.close_tor "Zapri vsa Tor okna in zavihke ob preklopu (neobvezno)">
-<!ENTITY torbutton.prefs.close_nontor "Zapri vsa ne-Tor okna in zavihke ob preklopu (neobvezno)">
-<!ENTITY torbutton.prefs.block_links "Prepovej klike povezav in osveÅ¾evanje strani od razliÄnih stanj Tor-a (neobvezno)">
-<!ENTITY torbutton.prefs.jar_certs "Shrani SSL cert. v posebne predale za Tor / ne-Tor  (priporoÄeno)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Shrani CA cert. v posebne predale za Tor / ne-Tor  (priporoÄeno)">
-<!ENTITY torbutton.prefs.locked_mode "OnemogoÄi gumbe in bliÅ¾nice da prepreÄiÅ¡ nenamerne preklope">
-<!ENTITY torbutton.prefs.startup_state "Ob navadnem zagonu nastavi stanje Tor-a na:">
-<!ENTITY torbutton.prefs.shutdown_state "Stanje izklopa">
-<!ENTITY torbutton.prefs.startup "Vklop">
-<!ENTITY torbutton.prefs.block_tor_file_net "Prepovej Tor dostop do omreÅ¾ja iz datoteke:// urls (priporoÄeno)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Prepovej ne-Tor dostop do omreÅ¾ja iz datoteke:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
 <!ENTITY torbutton.prefs.test_settings "Preveri nastavitve">
-<!ENTITY torbutton.prefs.test_auto "Preveri moje Tor nastavitve po prvem preklopu, ob vsakem zagonu Firefoxa">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne zapisuj Tor piÅ¡kotkov na disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne zapisuj ne-Tor piÅ¡kotkov na disk">
-<!ENTITY torbutton.prefs.session_restore "Seja naj shrani in obnovi naslednje zavihke:">
-<!ENTITY torbutton.prefs.nontor_tabs "Zavihki naloÅ¾eni v ne-Tor-u">
-<!ENTITY torbutton.prefs.tor_tabs "Zavihki naloÅ¾eni v Tor-u">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ne uporabi Proxi za: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaÅ¡Äiti novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.disable_livemarks "OnemogoÄi RSS posodobitve med uporaboTor-a ">
-<!ENTITY torbutton.prefs.dtd_recommended "(priporoÄeno)">
-<!ENTITY torbutton.prefs.dtd_optional "(neobvezno)">
-<!ENTITY torbutton.prefs.dtd_crucial "(obvezno)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 0507557..f3ac414 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Konfigurimi i Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "NdihmÃ«">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 13d3209..78509f0 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°">
 <!ENTITY torbutton.prefs.recommended_settings "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÐµÐ½Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð° Ð¼Ð¾Ñ˜Ðµ Ð¸Ð·Ð´Ð°ÑšÐµ Ñ„Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑÐ°">
-<!ENTITY torbutton.prefs.use_privoxy "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¸Ð»Ð°Ð³Ð¾Ñ’ÐµÐ½Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ðº:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ðº:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ð´Ð¾Ð¼Ð°Ñ›Ð¸Ð½:">
 <!ENTITY torbutton.prefs.proxy.port "ÐŸÐ¾Ñ€Ñ‚:">
-<!ENTITY torbutton.about.title "Ðž Torbutton">
-<!ENTITY torbutton.about.version "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°:">
-<!ENTITY torbutton.about.summary "Ð¨Ñ‚Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚ Tor Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°ÑšÐ°.">
-<!ENTITY torbutton.about.code "Kodiranje pomogli:">
-<!ENTITY torbutton.about.maintainer "OdrÅ¾ava:">
-<!ENTITY torbutton.about.security_review "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð° Ñ€ÐµÐ²Ð¸Ð·Ð¸Ñ˜Ð°:">
-<!ENTITY torbutton.about.donate "ÐÐºÐ¾ Ð²Ð°Ð¼ ÑÐµ ÑÐ²Ð¸Ñ’Ð° Tor, Ñ€Ð°Ð·Ð¼Ð¸Ð»Ð¸ÑÑ‚Ðµ Ð¾">
-<!ENTITY torbutton.about.make_donation "Ð´Ð¾Ð½Ð¸Ñ€Ð°ÑšÑƒ.">
 <!ENTITY torbutton.pref_connection.notice "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñƒ Ð¾Ð²Ð¸Ñ… Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐ¸.">
 <!ENTITY torbutton.pref_connection.more_info "Ð’Ð¸ÑˆÐµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ˜Ð°">
 <!ENTITY torbutton.pref_connection_more_info.title "ÐŸÐ¾Ð¼Ð¾Ñ›">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ñ˜Ðµ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½. ÐÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ñ˜Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ° Ð½ÐµÐ²ÐµÐ·Ð°Ð½Ðµ Ð·Ð° Tor, Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð’Ð°Ñ Ð´Ð° Ð¾Ð½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ðµ Torbutton Ð¸ Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.  ÐÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ñ˜Ðµ Tor Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ, Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð’Ð°Ñ Ð´Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ Ð·Ð° Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°.">
 <!ENTITY torbutton.context_menu.new_identity "ÐÐ¾Ð² Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚">
 <!ENTITY torbutton.context_menu.new_identity_key "Ð˜">
-<!ENTITY torbutton.context_menu.toggle "ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑ">
-<!ENTITY torbutton.context_menu.toggle.key "ÐŸ">
 <!ENTITY torbutton.context_menu.preferences "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ...">
 <!ENTITY torbutton.context_menu.preferences.key "ÐŸ">
-<!ENTITY torbutton.context_menu.about "Ðž Ð´Ð¾Ð´Ð°Ñ‚ÐºÑƒ...">
-<!ENTITY torbutton.context_menu.about.key "Ð´">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Preuzmite Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð”Ð¾Ð·Ð²Ð¾Ð»Ðµ Ð·Ð° ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Ð¦">
-<!ENTITY torbutton.context_menu.copyTor "ÐšÐ¾Ð¿Ñ€Ð°Ñ˜ Tor Ð°Ð´Ñ€ÐµÑÑƒ">
-<!ENTITY torbutton.context_menu.copyTor.key "Ð¿">
-<!ENTITY torbutton.context_menu.openTorTab "ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Tor Ð°Ð´Ñ€ÐµÑÑƒ Ñƒ Ð½Ð¾Ð²Ð¾Ñ˜ ÐºÐ°Ñ€Ñ‚Ð¸Ñ†Ð¸">
-<!ENTITY torbutton.context_menu.openTorTab.key "Ñ€">
-<!ENTITY torbutton.context_menu.openTorWindow "ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Tor Ð°Ð´Ñ€ÐµÑÑƒ Ñƒ Ð½Ð¾Ð²Ð¾Ð¼ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ñƒ">
-<!ENTITY torbutton.context_menu.openTorWindow.key "Ð´">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ÐšÐ»Ð¸ÐºÐ½Ð¸Ñ‚Ðµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÐ»Ð¸ Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ">
-<!ENTITY torbutton.prefs.block_thread "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ñ‡Ð¸Ñ‚Ð°ÑšÐµ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_thwrite "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ð¿Ð¸ÑÐ°ÑšÐµ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.block_nthread "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ñ‡Ð¸Ñ‚Ð°ÑšÐµ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Ð½ÐµÐºÐ¸ Ð´Ñ€ÑƒÐ³Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ð¿Ð¸ÑÐ°ÑšÐµ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Ð½ÐµÐºÐ¸ Ð´Ñ€ÑƒÐ³Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.clear_history "ÐžÑ‡Ð¸ÑÑ‚Ð¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ Tor-Ð° (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cache "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ ÑÐºÑ€Ð¸Ð²ÐµÐ½Ñƒ Ð¼ÐµÐ¼Ð¾Ñ€Ð¸Ñ˜Ñƒ Ð¸ Ð¾Ñ‡Ð¸ÑÑ‚Ð¸ Ñ˜Ðµ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ Tor-Ð°">
-<!ENTITY torbutton.prefs.block_cache "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð´Ð¸ÑÐºÑƒ Ð¸ ÑÐºÑ€Ð¸Ð²ÐµÐ½Ð¾Ñ˜ Ð¼ÐµÐ¼Ð¾Ñ€Ð¸Ñ˜Ð¸ ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½">
-<!ENTITY torbutton.prefs.cookie_jars "Ð¡Ð¼ÐµÑÑ‚Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ñƒ Ð·Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ðµ">
-<!ENTITY torbutton.prefs.cookie_protection "ÐšÑ€Ð¾ÑÑ‚Ð¸ Ð´Ð¸Ñ˜Ð°Ð»Ð¾Ð³ Ð·Ð° Ð·Ð°ÑˆÑ‚Ð¸Ñ‚Ñƒ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ð° Ð·Ð° Ð±Ð¸Ñ€Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.mmm_cookies "Ð ÑƒÑ‡Ð½Ð¾ Ñ›Ñƒ ÑƒÐ¿Ñ€Ð°Ð²Ñ™Ð°Ñ‚Ð¸ ÑÐ²Ð¾Ñ˜Ð¸Ð¼ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ð¸Ð¼Ð° (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cookies "ÐžÑ‡Ð¸ÑÑ‚Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ Tor-Ð°">
-<!ENTITY torbutton.prefs.disable_plugins "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐµ ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.kill_bad_js "ÐŸÐ¾Ð²ÐµÐ¶Ð¸ Ð¾Ð¿Ð°ÑÐ½Ñƒ Ñ˜Ð°Ð²Ð°ÑÐºÑ€Ð¸Ð¿Ñ‚Ñƒ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.isolate_content "Ð˜Ð·Ð¾Ð»ÑƒÑ˜ Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐºÐ¸ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð½Ð° Tor ÑÑ‚Ð°ÑšÐµ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.no_updates "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°ÑšÐ° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚">
-<!ENTITY torbutton.prefs.set_uagent "ÐŸÐ¾Ð´ÐµÑÐ¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¸ Ð°Ð³ÐµÐ½Ñ‚ Ð·Ð° ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ñƒ Ñ Tor-Ð¾Ð¼ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dynamic "Ð”Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐºÐ¸ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜">
-<!ENTITY torbutton.prefs.cookies "ÐšÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ð¸">
-<!ENTITY torbutton.prefs.cache "ÐœÐµÑ’ÑƒÐ¼ÐµÐ¼Ð¾Ñ€Ð¸Ñ˜Ð°">
-<!ENTITY torbutton.prefs.history "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚">
-<!ENTITY torbutton.prefs.no_search "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð³Ðµ Ð·Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ñƒ ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.shutdown "Ð“Ð°ÑˆÐµÑšÐµ">
-<!ENTITY torbutton.prefs.tor_shutdown "ÐžÑ‡Ð¸ÑÑ‚Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸ Ð³Ð°ÑˆÐµÑšÑƒ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½">
-<!ENTITY torbutton.prefs.all_shutdown "ÐžÑ‡Ð¸ÑÑ‚Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸ Ð³Ð°ÑˆÐµÑšÑƒ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.no_shutdown "ÐÐµ Ñ‡Ð¸ÑÑ‚Ð¸ Ð¼Ð¾Ñ˜Ðµ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸ Ð³Ð°ÑˆÐµÑšÑƒ">
-<!ENTITY torbutton.prefs.disable_sessionstore "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ñ‡ÑƒÐ²Ð°ÑšÐµ ÑÐµÑÐ¸Ñ˜Ðµ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.headers "Ð—Ð°Ð³Ð»Ð°Ð²Ñ™Ð°">
-<!ENTITY torbutton.prefs.refererspoofing "ÐœÐ°ÑÐºÐ¸Ñ€Ð°ÑšÐµ ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "ÐŸÐ°Ð¼ÐµÑ‚Ð½Ð¾ Ð¼Ð°ÑÐºÐ¸Ñ€Ð°ÑšÐµ ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð¼Ð°ÑÐºÐ¸Ñ€Ð° Ð¿Ñ€ÐµÐºÐ¾ Ð´Ð¾Ð¼ÐµÐ½Ð° ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ð°)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ DOM ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ðµ ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€Ð¸">
-<!ENTITY torbutton.prefs.block_tforms "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ Ð¸ Ñ„Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€ Ñ‡ÑƒÐ²Ð°ÑšÐ° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.block_ntforms "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ Ð¸ Ñ„Ð¾Ñ€Ð¼ÑƒÐ»Ð°Ñ€ Ñ‡ÑƒÐ²Ð°ÑšÐ° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð½ÐµÐ¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "ÐÐµ-Tor">
-<!ENTITY torbutton.prefs.restore_tor "ÐŸÑ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð° Ð·Ð° Ð²Ñ€Ð°Ñ›Ð°ÑšÐµ ÑÐµÑÐ¸Ñ˜Ðµ, Ð¿Ð¾ÑÑ‚Ð°Ð²Ð¸ ÑÑ‚Ð°ÑšÐµ Tor-Ð° Ð½Ð°:">
-<!ENTITY torbutton.prefs.startup_tor "ÐŸÑ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡Ð°, Ð¿Ð¾Ð´ÑÐµÐ¸ Tor ÑÑ‚Ð°ÑšÐµ Ð½Ð°:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "ÐŸÐ¾Ð½Ð¾Ð²Ð¾ ÑƒÑ‡Ð¸Ñ‚Ð°Ñ˜ jar ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›/Ð¾Ñ‡Ð¸ÑÑ‚Ð¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸ Ð³Ñ€ÐµÑˆÑ†Ð¸ Ñƒ Ñ„Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑÑƒ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ð¡Ð¼ÐµÑÑ‚Ð¸ Ð¾Ð±Ð¸Ñ‡Ð½Ðµ Ð¸ Tor ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ñƒ Ð·Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¸Ð¼ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð° (Ð¾Ð¿Ð°ÑÐ½Ð¾) ">
-<!ENTITY torbutton.prefs.clear_http_auth "ÐžÑ‡Ð¸ÑÑ‚Ð¸ HTTP ÑÐµÑÐ¸Ñ˜Ðµ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.block_js_history "Ð˜Ð·Ð¾Ð»ÑƒÑ˜ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ˜Ð¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°Ñ‚Ð° Ñƒ Tor ÑÑ‚Ð°ÑšÑƒ (ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.resize_on_toggle "ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸ Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ñƒ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð° Ð½Ð° 50 Ñ‚Ð°Ñ‡ÐºÐ¸Ñ†Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.close_tor "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ ÑÐ²Ðµ Tor Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ðµ Ð¸ Ñ˜ÐµÐ·Ð¸Ñ‡ÐºÐµ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.close_nontor "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ ÑÐ²Ðµ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ðµ Ð¸ Ñ˜ÐµÐ·Ð¸Ñ‡ÐºÐµ ÐºÐ¾Ñ˜Ð¸ Ð½Ð¸ÑÑƒ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸ Ñ Tor-Ð¾Ð¼ (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_links "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ ÐºÐ»Ð¸ÐºÐ¾Ð²Ðµ Ð½Ð° Ð²ÐµÐ·Ðµ Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐµ ÑÑ‚Ñ€Ð°Ð½Ñ†Ð° Ð¾Ð´ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ‚Ð¸Ñ… Tor ÑÑ‚Ð°ÑšÐ° (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.jar_certs "Ð£ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ð¸ CA ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ðµ Ñƒ Ð¾Ð´Ð²Ð¾Ñ˜ÐµÐ½Ð¸Ð¼ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð° Ð·Ð° Tor Ð¸ Ð²Ð°Ð½-Tor Ð¼Ñ€ÐµÐ¶Ðµ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Ð£ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ð¸ CA ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ðµ Ñƒ Ð¾Ð´Ð²Ð¾Ñ˜ÐµÐ½Ð¸Ð¼ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð° Ð·Ð° Tor Ð¸ Ð²Ð°Ð½-Tor Ð¼Ñ€ÐµÐ¶Ðµ (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.locked_mode "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ñ‚Ð°ÑÑ‚ÐµÑ€Ðµ Ð¸ Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ðµ Ð·Ð° ÑÐ¿Ñ€ÐµÑ‡Ð°Ð²Ð°ÑšÐµ ÑÐ»ÑƒÑ‡Ð°Ñ˜Ð½Ð¸Ñ… Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐ°">
-<!ENTITY torbutton.prefs.startup_state "ÐÐ° Ð½Ð¾Ñ€Ð¼Ð°Ð»Ð½Ð¾Ð¼ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ, Ð¿Ð¾Ð´ÐµÑÐ¸ Tor ÑÑ‚Ð°ÑšÐµ Ð½Ð°:">
-<!ENTITY torbutton.prefs.shutdown_state "Ð¡Ñ‚Ð°ÑšÐµ Ð³Ð°ÑˆÐµÑšÐ°">
-<!ENTITY torbutton.prefs.startup "ÐŸÐ¾ÐºÑ€ÐµÑ‚Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Tor Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð¼Ñ€ÐµÐ¶Ð¸ Ð¸Ð· file:// urls (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ð—Ð°Ð±Ñ€Ð°Ð½Ð¸ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð¼Ñ€ÐµÐ¶Ð¸ Ð¸Ð· file:// urls (Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
 <!ENTITY torbutton.prefs.restore_defaults "ÐŸÐ¾Ð²Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°Ð½Ð¾">
 <!ENTITY torbutton.prefs.test_settings "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð° Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐ¸">
-<!ENTITY torbutton.prefs.test_auto "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸ Tor Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¾Ð´Ð¼Ð°Ñ… Ð½Ð°ÐºÐ¾Ð½ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐ° Ñ„Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑÐ°">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "ÐÐµ Ð¿Ð¸ÑˆÐ¸ Tor ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ÐÐµ Ð¿Ð¸ÑˆÐ¸ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.session_restore "Ð¡Ð¼ÐµÑˆÑ‚Ð°ÑšÐµ, Ñ‡ÑƒÐ²Ð°ÑšÐµ Ð¸ Ð²Ñ€Ð°Ñ›Ð°ÑšÐµ Ð¾Ð²Ð¸Ñ… Ñ˜ÐµÐ·Ð¸Ñ‡Ð°ÐºÐ°:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ð£Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ Ñ˜ÐµÐ·Ð¸Ñ‡Ñ†Ð¸ Ð²Ð°Ð½ Tor-Ð°">
-<!ENTITY torbutton.prefs.tor_tabs "Ð£Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ Ñ˜ÐµÐ·Ð¸Ñ‡Ñ†Ð¸ Ñƒ Tor-Ñƒ">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ð‘ÐµÐ· Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð°:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð£Ð¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ: Ð¸Ð·Ð±ÐµÐ³Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐµ Ð¸Ð·Ð½Ð°Ð´ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ðµ Ð½Ð°Ð·Ð¸Ð²Ðµ Ð´Ð¾Ð¼Ð°Ñ›Ð¸Ð½Ð°">
-<!ENTITY torbutton.prefs.spoofreresh "ÐœÐ°ÑÐºÐ¸Ñ€Ð°Ñ˜ Ð¾ÑÐ²ÐµÐ¶Ð°Ð²Ð°ÑšÐµ">
-<!ENTITY torbutton.prefs.refereroptions "ÐžÐ¿Ñ†Ð¸Ñ˜Ðµ Ð·Ð° Ð¼Ð°ÑÐºÐ¸Ñ€Ð°ÑšÐµ ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.nospoof "ÐÐµ Ð¼Ð°ÑÐºÐ¸Ñ€Ð°Ñ˜ ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ðµ">
-<!ENTITY torbutton.prefs.spoofroot "ÐœÐ°ÑÐºÐ¸Ñ€Ð°Ñ˜ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼ Ñƒ ÐºÐ¾Ð¼Ðµ ÑÐµ Ð½Ð°Ð»Ð°Ð·Ð¸ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°">
-<!ENTITY torbutton.prefs.spoofdomain "ÐœÐ°ÑÐºÐ¸Ñ€Ð°Ñ˜ Ð´Ð¾Ð¼ÐµÐ½ ÐºÐ°Ð¾ ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.spoofblank "ÐŸÐ¾Ð´ÑÐµÐ¸ Ð´Ð° ÑƒÐ¿ÑƒÑ›Ð¸Ð²Ð°Ñ‡ Ð±ÑƒÐ´Ðµ Ð¿Ñ€Ð°Ð·Ð°Ð½">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ñ€ÐµÐ´Ð¸ Ð·Ð°ÑˆÑ‚Ð¸Ñ‚Ñƒ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ð°">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÐ²Ðµ Ð¾ÑÐ¸Ð¼ Ð·Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¸Ñ…">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ ÑˆÑ‚Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ">
-<!ENTITY torbutton.prefs.disable_livemarks "ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°ÑšÐ° Ð´Ð¾Ð²Ð¾Ð´Ð° ÐºÐ°Ð´Ð° Ñ˜Ðµ Tor Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dtd_crucial "(ÐºÑ™ÑƒÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "ÐŸÑ€ÐµÑƒÑÐ¼ÐµÑ€Ð¸ Torbutton Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°ÑšÐ° Ð¿Ñ€ÐµÐºÐ¾ Tor-Ð°">
-<!ENTITY torbutton.prefs.dodge_google_captcha "ÐÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð°Ð»Ñ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ð¸ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡ Ð°ÐºÐ¾ Google Ñ‚Ñ€Ð°Ð¶Ð¸ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸ ÐºÃ´Ð´:">
-<!ENTITY torbutton.prefs.engine1 "IXQuick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Ð¢Ñ€Ð°Ð½ÑÐ¿Ð°Ñ€ÐµÐ½Ñ‚Ð° Ð¢Ð¾Ñ€Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° (Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð¿Ð¾ÑÐµÐ±Ð°Ð½ Tor Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð¸Ð»Ð¸ Tor Ñ€ÑƒÑ‚ÐµÑ€)">
 <!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index cc809ec..4978d15 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "InstÃ¤llningar fÃ¶r Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "InstÃ¤llningar fÃ¶r proxy">
 <!ENTITY torbutton.prefs.recommended_settings "AnvÃ¤nd rekommenderade proxy-instÃ¤llningar fÃ¶r min version av Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "AnvÃ¤nd Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "AnvÃ¤nd Polipo">
 <!ENTITY torbutton.prefs.custom_settings "AnvÃ¤nd egen instÃ¤llning fÃ¶r proxyn">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy fÃ¶r HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy fÃ¶r Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS vÃ¤rd:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Om Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Skyddar din personliga integritet med Tor.">
-<!ENTITY torbutton.about.code "Ã–vriga programmerare:">
-<!ENTITY torbutton.about.maintainer "UnderhÃ¥lls av:">
-<!ENTITY torbutton.about.security_review "SÃ¤kerhetsgranskning:">
-<!ENTITY torbutton.about.donate "Om du gillar Tor, Ã¶vervÃ¤g att">
-<!ENTITY torbutton.about.make_donation "donera.">
 <!ENTITY torbutton.pref_connection.notice "Inaktivera Torbutton fÃ¶r att Ã¤ndra dessa instÃ¤llningar.">
 <!ENTITY torbutton.pref_connection.more_info "Mer information">
 <!ENTITY torbutton.pref_connection_more_info.title "HjÃ¤lp">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets fÃ¶r den hÃ¤r webbsidan">
 <!ENTITY torbutton.context_menu.new_circuit_key "S">
-<!ENTITY torbutton.context_menu.toggle "SlÃ¥ pÃ¥/av Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "InstÃ¤llningar fÃ¶r privatliv och sÃ¤kerhet...">
 <!ENTITY torbutton.context_menu.preferences.key "I">
-<!ENTITY torbutton.context_menu.about "Om Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.context_menu.networksettings "Tor nÃ¤tverksinstÃ¤llningar...">
 <!ENTITY torbutton.context_menu.networksettings.key "Ã–">
 <!ENTITY torbutton.context_menu.downloadUpdate "SÃ¶k efter uppdateringar fÃ¶r Tor webblÃ¤sare...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
-<!ENTITY torbutton.context_menu.copyTor "Kopiera Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ã–ppna Tor URL i ny Flik">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ã–ppna Tor URL i nytt fÃ¶nster">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicka fÃ¶r att installera Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och sÃ¤kerhetsinstÃ¤llningar">
-<!ENTITY torbutton.prefs.block_thread "Blockera lÃ¤sning av historik medan Tor Ã¤r aktiverat (kritiskt)">
-<!ENTITY torbutton.prefs.block_thwrite "Blockera lagring av historik medan Tor Ã¤r aktiverat (rekommenderat)">
-<!ENTITY torbutton.prefs.block_nthread "Blockera lÃ¤sning av historik medan Tor Ã¤r inaktiverat (valfritt)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blockera lagring av historik medan Tor Ã¤r inaktiverat (valfritt)">
-<!ENTITY torbutton.prefs.clear_history "Rensa historik vid pÃ¥/avslagning av Tor (valfritt)">
-<!ENTITY torbutton.prefs.clear_cache "Rensa diskcache vid pÃ¥/avslagning av Tor">
-<!ENTITY torbutton.prefs.block_cache "Blockera Ã¥tkomst till disk- och minnescache medan Tor Ã¤r aktiverat">
-<!ENTITY torbutton.prefs.cookie_jars "Lagra icke-Tor kakor i en skyddad burk">
-<!ENTITY torbutton.prefs.cookie_protection "AnvÃ¤nd Skyddade kakor dialogen fÃ¶r att vÃ¤lja">
-<!ENTITY torbutton.prefs.mmm_cookies "Jag skÃ¶ter cookies manuellt (farligt)">
-<!ENTITY torbutton.prefs.clear_cookies "Rensa cookies vid pÃ¥/avaktivering av Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Inaktivera insticksmoduler nÃ¤r Tor anvÃ¤nds (kritiskt)">
-<!ENTITY torbutton.prefs.kill_bad_js "FÃ¥nga farligt javascript (kritiskt)">
-<!ENTITY torbutton.prefs.isolate_content "Isolera dynamiskt innehÃ¥ll till Tor stadium (kritiskt)">
-<!ENTITY torbutton.prefs.no_updates "Inaktivera uppdateringar under Tor anvÃ¤ndning">
-<!ENTITY torbutton.prefs.set_uagent "VÃ¤lj anvÃ¤ndaragent fÃ¶r Tor anvÃ¤ndning (kritiskt)">
-<!ENTITY torbutton.prefs.dynamic "Dynamiskt InnehÃ¥ll">
-<!ENTITY torbutton.prefs.cookies "Kakor">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Historik">
-<!ENTITY torbutton.prefs.no_search "StÃ¤ng av sÃ¶kmotorers fÃ¶rslag under anvÃ¤ndning av Tor (rekommenderas)">
-<!ENTITY torbutton.prefs.shutdown "StÃ¤ng av">
-<!ENTITY torbutton.prefs.tor_shutdown "Rensa Tor kakor under Tor-aktiverad webblÃ¤saravstÃ¤ngning">
-<!ENTITY torbutton.prefs.all_shutdown "Rensa kakor under alla webblÃ¤saravstÃ¤ngningar">
-<!ENTITY torbutton.prefs.no_shutdown "Rensa inte mina kakor vid avstÃ¤ngning">
-<!ENTITY torbutton.prefs.disable_sessionstore "Inaktivera Sessionssparande (rekommenderas)">
-<!ENTITY torbutton.prefs.headers "Huvuden">
-<!ENTITY torbutton.prefs.refererspoofing "Refererings hÃ¤rmning">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referat hÃ¤rmning under Tor anvÃ¤ndning (hÃ¤rmar kors domÃ¤n referat)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Inaktivera DOM lagring under Tor anvÃ¤ndning (kritiskt)">
-<!ENTITY torbutton.prefs.forms "Former">
-<!ENTITY torbutton.prefs.block_tforms "Blockera lagring av lÃ¶senord+formulÃ¤r medan Tor Ã¤r aktiverat (rekommenderas)">
-<!ENTITY torbutton.prefs.block_ntforms "Blockera lagring av lÃ¶senord+formulÃ¤r medan Tor Ã¤r inaktiverat (valfritt)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Icke-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Vid uppstart med sessionsÃ¥terstÃ¤llning, sÃ¤tt Tor lÃ¤ge till:">
-<!ENTITY torbutton.prefs.startup_tor "Vid webblÃ¤sarstart, sÃ¤tt Tor lÃ¤ge till:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ladda om kakburk/rensa kakor om Firefox krashar (rekommenderas)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Lagra bÃ¥de Tor och Icke-Tor kakor i skyddade burkar (farligt)">
-<!ENTITY torbutton.prefs.clear_http_auth "Rensa HTTP auth sessioner (rekommenderat)">
-<!ENTITY torbutton.prefs.block_js_history "Isolera tillgÃ¥ng till historienavigering till Tor lÃ¤ge (kritiskt)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Anpassa fÃ¶nsterstorlek till multiplar av 50px under Tor anvÃ¤nding (rekommenderas)">
-<!ENTITY torbutton.prefs.close_tor "StÃ¤ng alla Tor fÃ¶nster och flikar vid vÃ¤xling (valfritt)">
-<!ENTITY torbutton.prefs.close_nontor "StÃ¤ng alla Icke-Tor fÃ¶nster och flikar vid vÃ¤xling (valfritt)">
-<!ENTITY torbutton.prefs.block_links "Blockera lÃ¤nk klick och sidomladdningar frÃ¥n olika Tor lÃ¤gen (valfritt)">
-<!ENTITY torbutton.prefs.jar_certs "Lagra SSL certifikat i separata burkar fÃ¶r Tor / Icke-Tor (rekommenderas)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Lagra CA certifikat i separata burkar fÃ¶r Tor/Icke-Tor (rekommenderas)">
-<!ENTITY torbutton.prefs.locked_mode "Inaktivera knapp och kortkommando fÃ¶r att fÃ¶rhindra vÃ¤xling av misstag">
-<!ENTITY torbutton.prefs.startup_state "Vid normal uppstart, sÃ¤tt Tor lÃ¤ge till:">
-<!ENTITY torbutton.prefs.shutdown_state "NedstÃ¤ngningslÃ¤ge">
-<!ENTITY torbutton.prefs.startup "Uppstart">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blockera Tor tillgÃ¥ng till nÃ¤tverk frÃ¥n file:// lÃ¤nkar (rekommenderas)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blockera Icke-Tor tillgÃ¥ng till nÃ¤tverk frÃ¥n file:// lÃ¤nkar">
 <!ENTITY torbutton.prefs.restore_defaults "Ã…terstÃ¤ll till standard">
 <!ENTITY torbutton.prefs.test_settings "Testa instÃ¤llningar">
-<!ENTITY torbutton.prefs.test_auto "Testa mina Tor-instÃ¤llningar efter fÃ¶rsta gÃ¥ngen jag vÃ¤xlar vid varje start av Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Skriv inte Tor kakor till disken">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Skriv inte Icke-Tor kakor till disken">
-<!ENTITY torbutton.prefs.session_restore "LÃ¥t sessionen lagra, spara och Ã¥terstÃ¤lla dessa flikar:">
-<!ENTITY torbutton.prefs.nontor_tabs "Flikar laddade i Icke-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Flikar laddade i Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ingen proxy fÃ¶r:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Varning: Undvik att anvÃ¤nda vÃ¤rdnamn hÃ¤r ovan">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Uppdatering">
-<!ENTITY torbutton.prefs.refereroptions "Referens Spoofing Alternativ">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Spoofa den innefattande mappen av sidan">
-<!ENTITY torbutton.prefs.spoofdomain "Spoofa domain som referens">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor">
 <!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
 <!ENTITY torbutton.cookiedialog.domainCol "VÃ¤rd">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(rekommenderat)">
-<!ENTITY torbutton.prefs.dtd_optional "(valfritt)">
-<!ENTITY torbutton.prefs.dtd_crucial "(viktigt)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Dirigera om Torbutton-uppdateringar genom Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "AnvÃ¤nd automatiskt en alternativ sÃ¶kmotor nÃ¤r du presenteras med en Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent torifikation (KrÃ¤ver skrÃ¤ddarsydd transproxy eller Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "SekretessinstÃ¤llningar">
 <!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras fÃ¶r enskilda webbsidor via NoScript-knappen.">
 <!ENTITY torbutton.prefs.sec_high "HÃ¶g">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ã¤r normalt avaktiverat pÃ¥ alla webbsidor.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "De flesta ljud- och bildformat Ã¤r avaktiverade.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM Ã¤r den enda codec som fÃ¶rblir aktiverad.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahÃ¥lls av webbsidor Ã¤r blockerade.">
 <!ENTITY torbutton.prefs.sec_custom "Anpassad nivÃ¥">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index 1393021..ed4f8e1 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "à®‰à®¤à®µà®¿">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 0a0d7d2..6b7d4db 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸² Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "à¸™à¸³à¸„à¹ˆà¹‰à¸² Proxy à¸—à¸µà¹ˆà¹€à¸«à¸¡à¸²à¸°à¸ªà¸¡à¸¡à¸²à¹ƒà¸Šà¹‰à¸à¸±à¸š Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "à¸™à¸³ Privoxy à¸¡à¸²à¹ƒà¸Šà¹‰">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "à¸™à¸³ Proxy à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¸¡à¸²à¹ƒà¸Šà¹‰">
 <!ENTITY torbutton.prefs.proxy.host.http "à¸„à¹ˆà¸² HTTP Proxy :">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "à¸„à¹ˆà¸² Gopher Proxy :">
 <!ENTITY torbutton.prefs.proxy.host.socks "à¸„à¹ˆà¸² SOCKS Host :">
 <!ENTITY torbutton.prefs.proxy.port "à¸„à¹ˆà¸² Port :">
-<!ENTITY torbutton.about.title "à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡">
 <!ENTITY torbutton.pref_connection_more_info.title "à¸„à¸§à¸²à¸¡à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "à¸ªà¸£à¹‰à¸²à¸‡à¸•à¸±à¸§à¸•à¸™à¹ƒà¸«à¸¡à¹ˆ">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "A">
-<!ENTITY torbutton.context_menu.about "à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Torbutton ...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 3a03b4d..eb18fdb 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton AyarlarÄ±">
 <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu AyarlarÄ±">
 <!ENTITY torbutton.prefs.recommended_settings "Firefox sÃ¼rÃ¼mÃ¼m iÃ§in Ã¶nerilen vekil sunucu ayarlarÄ± kullanÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy KullanÄ±lsÄ±n">
 <!ENTITY torbutton.prefs.use_polipo "Polipo KullanÄ±lsÄ±n">
 <!ENTITY torbutton.prefs.custom_settings "Ã–zel vekil sunucu ayarlarÄ± kullanÄ±lsÄ±n">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Vekil Sunucusu:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:">
 <!ENTITY torbutton.prefs.proxy.port "KapÄ±:">
-<!ENTITY torbutton.about.title "Torbutton HakkÄ±nda">
-<!ENTITY torbutton.about.version "SÃ¼rÃ¼m:">
-<!ENTITY torbutton.about.summary "Tor tarama gizliliÄŸinizi korur.">
-<!ENTITY torbutton.about.code "GeliÅŸtirmeye KatkÄ±da Bulunanlar:">
-<!ENTITY torbutton.about.maintainer "YÃ¶netici:">
-<!ENTITY torbutton.about.security_review "GÃ¼venlik Ã–zeti:">
-<!ENTITY torbutton.about.donate "Tor yazÄ±lÄ±mÄ±nÄ± beÄŸendiyseniz">
-<!ENTITY torbutton.about.make_donation "baÄŸÄ±ÅŸ yapmayÄ± dÃ¼ÅŸÃ¼nÃ¼n.">
 <!ENTITY torbutton.pref_connection.notice "Bu ayarlarÄ± uygulamak iÃ§in Torbutton devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n.">
 <!ENTITY torbutton.pref_connection.more_info "AyrÄ±ntÄ±lÄ± bilgiler">
 <!ENTITY torbutton.pref_connection_more_info.title "YardÄ±m">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Bu site iÃ§in Tor devresini yenile">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Tor durumunu deÄŸiÅŸtir">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Gizlilik ve GÃ¼venlik AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "HakkÄ±nda">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor AÄŸ AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser GÃ¼ncelleme Denetimi...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ã‡erez KorumasÄ±...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Tor Ä°nternet adresini kopyala">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Tor Ä°nternet adresini yeni sekmede aÃ§">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Tor Ä°nternet adresini yeni pencerede aÃ§">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbutton uygulamasÄ±nÄ± baÅŸlatmak iÃ§in tÄ±klayÄ±n">
 <!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve GÃ¼venlik AyarlarÄ±">
-<!ENTITY torbutton.prefs.block_thread "Tor kullanÄ±lÄ±rken geÃ§miÅŸ okunamasÄ±n (Ã¶nemli)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor kullanÄ±lÄ±rken geÃ§miÅŸ kaydedilemesin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.block_nthread "Tor-DÄ±ÅŸÄ± kullanÄ±lÄ±rken geÃ§miÅŸ okunamasÄ±n (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.block_nthwrite "Tor-DÄ±ÅŸÄ± kullanÄ±lÄ±rken geÃ§miÅŸ kaydedilemesin (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.clear_history "Tor durumu deÄŸiÅŸtirildiÄŸinde geÃ§miÅŸ temizlensin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.clear_cache "Tor durumu deÄŸiÅŸtirildiÄŸinde Tor disk Ã¶n belleÄŸi engellenip tÃ¼m Ã¶n bellekler temizlensin">
-<!ENTITY torbutton.prefs.block_cache "Tor kullanÄ±lÄ±rken disk ve Ã¶n bellek eriÅŸimi engellensin">
-<!ENTITY torbutton.prefs.cookie_jars "Tor-DÄ±ÅŸÄ± Ã§erezler korumalÄ± bir jar dosyasÄ±nda saklansÄ±n">
-<!ENTITY torbutton.prefs.cookie_protection "SeÃ§mek iÃ§in Ã‡erez KorumasÄ± penceresini kullanÄ±n">
-<!ENTITY torbutton.prefs.mmm_cookies "Ã‡erezlerimi kendim yÃ¶neteceÄŸim (tehlikeli)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor durumu deÄŸiÅŸtirildiÄŸinde tÃ¼m Ã§erezler temizlensin">
-<!ENTITY torbutton.prefs.disable_plugins "Tor kullanÄ±lÄ±rken uygulama ekleri devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n (Ã¶nemli)">
-<!ENTITY torbutton.prefs.kill_bad_js "Tehlikeli javascriptler yakalansÄ±n (Ã¶nemli)">
-<!ENTITY torbutton.prefs.isolate_content "Tor Ã§alÄ±ÅŸÄ±rken devingen iÃ§erik korunsun (Ã¶nemli)">
-<!ENTITY torbutton.prefs.no_updates "Tor kullanÄ±lÄ±rken gÃ¼ncellemeler devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.set_uagent "Tor kullanÄ±lÄ±rken bildirilecek kullanÄ±cÄ± yazÄ±lÄ±mÄ± (Ã¶nemli)">
-<!ENTITY torbutton.prefs.dynamic "Devingen Ä°Ã§erik">
-<!ENTITY torbutton.prefs.cookies "Ã‡erezler">
-<!ENTITY torbutton.prefs.cache "Ã–n bellek">
-<!ENTITY torbutton.prefs.history "GeÃ§miÅŸ">
-<!ENTITY torbutton.prefs.no_search "Tor kullanÄ±lÄ±rken arama Ã¶nerileri devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.shutdown "Kapat">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor kullanÄ±lÄ±an tarayÄ±cÄ± kapatÄ±lÄ±rken Tor Ã§erezleri temizlensin">
-<!ENTITY torbutton.prefs.all_shutdown "TÃ¼m tarayÄ±cÄ±lar kapatÄ±lÄ±rken tÃ¼m Ã§erezler temizlensin">
-<!ENTITY torbutton.prefs.no_shutdown "ProgramÄ± kapatÄ±ÄŸÄ±mda Ã§erezlerim silinmesin">
-<!ENTITY torbutton.prefs.disable_sessionstore "Oturum Kaydedilmesin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.headers "Ãœst Bilgiler">
-<!ENTITY torbutton.prefs.refererspoofing "GÃ¶nderici aldatmasÄ±">
-<!ENTITY torbutton.prefs.spoofblank "Tor kullanÄ±lÄ±rken boÅŸ gÃ¶nderici aldatmasÄ± yapÄ±lsÄ±n (bazÄ± sitelerde Ã§alÄ±ÅŸmayabilir)">
-<!ENTITY torbutton.prefs.smartspoof "Tor kullanÄ±lÄ±rken akÄ±llÄ± gÃ¶nderici aldatmasÄ± yapÄ±lsÄ±n (siteler arasÄ± gÃ¶ndericileri deÄŸiÅŸtirir)">
-<!ENTITY torbutton.prefs.nospoof "Tor kullanÄ±lÄ±rken gÃ¶nderici aldatmasÄ± yapÄ±lmasÄ±n (normal gÃ¶nderici iletilir)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor kullanÄ±lÄ±rken DCOM belleÄŸi devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n (Ã¶nemli)">
-<!ENTITY torbutton.prefs.forms "Formlar">
-<!ENTITY torbutton.prefs.block_tforms "Tor kullanÄ±lÄ±rken parola ve formlarÄ±n kaydedilmesi engellensin (Ã¶nerilen)">
-<!ENTITY torbutton.prefs.block_ntforms "Tor-DÄ±ÅŸÄ± parola ve formlarÄ±n kaydedilmesi engellensin (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Tor-DÄ±ÅŸÄ±">
-<!ENTITY torbutton.prefs.restore_tor "BaÅŸlangÄ±Ã§ta oturum geri yÃ¼klendiÄŸinde ayarlanacak Tor durumu:">
-<!ENTITY torbutton.prefs.startup_tor "TarayÄ±cÄ± baÅŸlatÄ±ldÄ±ÄŸÄ±nda ayarlanacak Tor durumu:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox Ã§Ã¶ktÃ¼ÄŸÃ¼nde, Ã§erezler jar dosyasÄ±ndan yÃ¼klensin ya da temizlensin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tor ve Tor-DÄ±ÅŸÄ± tÃ¼m Ã§erezler korunan jar dosyalarÄ±nda saklansÄ±n (tehlikeli)">
-<!ENTITY torbutton.prefs.clear_http_auth "KimliÄŸi doÄŸrulanmÄ±ÅŸ tÃ¼m HTTP oturumlarÄ± temizlensin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.block_js_history "GeÃ§miÅŸ bilgilerine eriÅŸim Tor durumuna gÃ¶re engellensin (Ã¶nemli)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor kullanÄ±rken pencereler 50 piksel ve katlarÄ±yla boyutlandÄ±rÄ±lsÄ±n (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.close_tor "Tor durumu deÄŸiÅŸikliÄŸinde tÃ¼m Tor pencere ve sekmeleri kapatÄ±lsÄ±n (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.close_nontor "Tor durumu deÄŸiÅŸikliÄŸinde tÃ¼m Tor-DÄ±ÅŸÄ± pencere ve sekmeler kapatÄ±lsÄ±n (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.block_links "FarklÄ± Tor durumlarÄ±nda baÄŸlantÄ±lara tÄ±klama ve sayfayÄ± yenileme engellensin (isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.jar_certs "Tor/Tor-DÄ±ÅŸÄ± durumlarÄ±n SSL sertifikalarÄ± ayrÄ± jar dosyalarÄ±nda saklansÄ±n (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Tor/Tor-DÄ±ÅŸÄ± durumlarÄ±n CA sertifikalarÄ± ayrÄ± ayrÄ± jar dosyalarÄ±nda saklansÄ±n (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.locked_mode "Ä°stenmeyen durum deÄŸiÅŸikliÄŸini engellemek iÃ§in dÃ¼ÄŸme ve kÄ±sayol tuÅŸlarÄ± devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.startup_state "Normal baÅŸlangÄ±Ã§ta ayarlanacak Tor durumu:">
-<!ENTITY torbutton.prefs.shutdown_state "KapanÄ±ÅŸ durumu">
-<!ENTITY torbutton.prefs.startup "BaÅŸlangÄ±Ã§">
-<!ENTITY torbutton.prefs.block_tor_file_net "file:// Ä°nternet adresleri yoluyla Tor aÄŸ eriÅŸimi engellensin (Ã¶nerilir)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "file:// Ä°nternet adresleri yoluyla Tor-DÄ±ÅŸÄ± aÄŸ eriÅŸimi engellensin">
 <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± YÃ¼kle">
 <!ENTITY torbutton.prefs.test_settings "AyarlarÄ± SÄ±na">
-<!ENTITY torbutton.prefs.test_auto "Ä°lk durum deÄŸiÅŸikliÄŸinden sonra Firefox her baÅŸlatÄ±ldÄ±ÄŸÄ±nda Tor ayarlarÄ±m sÄ±nansÄ±n">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanÄ±lÄ±rken livemarks gÃ¼ncellemeleri devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor Ã§erezleri diske yazÄ±lmasÄ±n">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Tor-DÄ±ÅŸÄ± Ã§erezler diske yazÄ±lmasÄ±n">
-<!ENTITY torbutton.prefs.session_restore "Oturum kaydÄ±nda ÅŸu sekmeler kaydedilip geri yÃ¼klensin:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tor-DÄ±ÅŸÄ± YÃ¼klenen Sekmeler">
-<!ENTITY torbutton.prefs.tor_tabs "Tor Ä°le YÃ¼klenen Sekmeler">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Åžunun iÃ§in vekil sunucu yok:">
 <!ENTITY torbutton.prefs.no_proxy_warning "UyarÄ±: YukarÄ±daki sunucu adlarÄ±nÄ± kullanmaktan kaÃ§Ä±nÄ±n">
-<!ENTITY torbutton.prefs.spoofreresh "Aldatma Yenileme">
-<!ENTITY torbutton.prefs.refereroptions "GÃ¶nderici Aldatma AyarlarÄ±">
-<!ENTITY torbutton.prefs.nospoof "Tor kullanÄ±lÄ±rken gÃ¶nderici aldatmasÄ± yapÄ±lmasÄ±n (normal gÃ¶nderici iletilir)">
-<!ENTITY torbutton.prefs.spoofroot "SayfayÄ± iÃ§eren klasÃ¶rÃ¼ aldat">
-<!ENTITY torbutton.prefs.spoofdomain "Etki alanÄ±nÄ± gÃ¶nderici olarak aldat">
-<!ENTITY torbutton.prefs.spoofblank "Tor kullanÄ±lÄ±rken boÅŸ gÃ¶nderici aldatmasÄ± yapÄ±lsÄ±n (bazÄ± sitelerde Ã§alÄ±ÅŸmayabilir)">
 <!ENTITY torbutton.cookiedialog.title "Ã‡erez KorumasÄ± YÃ¶netimi">
 <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅŸ">
 <!ENTITY torbutton.cookiedialog.domainCol "Sunucu">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DÄ±ÅŸÄ±nda TÃ¼mÃ¼nÃ¼ Sil">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ã‡erezleri Koru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ã‡erezleri Koruma">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanÄ±lÄ±rken livemarks gÃ¼ncellemeleri devre dÄ±ÅŸÄ± bÄ±rakÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ã¶nerilir)">
-<!ENTITY torbutton.prefs.dtd_optional "(isteÄŸe baÄŸlÄ±)">
-<!ENTITY torbutton.prefs.dtd_crucial "(Ã¶nemli)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton gÃ¼ncellemeleri Tor Ã¼zerinden yapÄ±lsÄ±n">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha sunulduÄŸunda otomatik olarak baÅŸka bir arama motoru kullanÄ±lsÄ±n:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Saydam Tor Ä°letiÅŸimi (Ã¶zel transproxy yada Tor yÃ¶nelticisi gerekir)">
 <!ENTITY torbutton.prefs.priv_caption "Gizlilik AyarlarÄ±">
 <!ENTITY torbutton.prefs.block_disk "Tarama geÃ§miÅŸini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanÄ±lÄ±r)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araÃ§ Ã§ubuÄŸu dÃ¼ÄŸmesi kullanÄ±larak her site iÃ§in ayrÄ± ayrÄ± etkinleÅŸtirilebilir.">
 <!ENTITY torbutton.prefs.sec_high "YÃ¼ksek">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript varsayÄ±lan olarak tÃ¼m sitelerde devre dÄ±ÅŸÄ± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Ã‡oÄŸu ses ve gÃ¶rÃ¼ntÃ¼ biÃ§imi devre dÄ±ÅŸÄ± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "KodlayÄ±cÄ± Ã§Ã¶zÃ¼cÃ¼ olarak yalnÄ±z WebM etkin bÄ±rakÄ±lÄ±r.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "BazÄ± yazÄ± tipi ve simgeler dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lenemeyebilir.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafÄ±ndan sunulan yazÄ± tipi dosyalarÄ± engellenir.">
 <!ENTITY torbutton.prefs.sec_custom "Ã–zel DeÄŸerler">
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index e0e7e39..407d025 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð¿Ñ€Ð¾ÐºÑÑ–">
 <!ENTITY torbutton.prefs.recommended_settings "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ñ– Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð´Ð»Ñ Ð¼Ð¾Ñ”Ñ— Ð²ÐµÑ€ÑÑ–Ñ— Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐºÑÑ–">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿Ñ€Ð¾ÐºÑÑ–:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿Ñ€Ð¾ÐºÑÑ–:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Ð’ÑƒÐ·Ð¾Ð» SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "ÐŸÐ¾Ñ€Ñ‚:">
-<!ENTITY torbutton.about.title "ÐŸÑ€Ð¾ Torbutton">
-<!ENTITY torbutton.about.version "Ð’ÐµÑ€ÑÑ–Ñ:">
-<!ENTITY torbutton.about.summary "Ð—Ð°Ñ…Ð¸Ñ‰Ð°Ñ” Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ–ÑÑ‚ÑŒ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð±Ð»ÑƒÐºÐ°Ð½Ð½Ñ Ñ‚ÐµÐ½ÐµÑ‚Ð°Ð¼Ð¸ Ð· Tor.">
-<!ENTITY torbutton.about.code "Ð£Ñ‡Ð°ÑÐ½Ð¸ÐºÐ¸:">
-<!ENTITY torbutton.about.maintainer "Ð¡ÑƒÐ¿Ñ€Ð¾Ð²Ð¾Ð´Ð¶ÑƒÐ²Ð°Ñ‡:">
-<!ENTITY torbutton.about.security_review "ÐžÐ³Ð»ÑÐ´ Ð‘ÐµÐ·Ð¿ÐµÐºÐ¸:">
-<!ENTITY torbutton.about.donate "Ð¯ÐºÑ‰Ð¾ Ð²Ð°Ð¼ Ð¿Ð¾Ð´Ð¾Ð±Ð°Ñ”Ñ‚ÑŒÑÑ Tor â€“ Ð²Ð¸ Ð¼Ð¾Ð³Ð»Ð¸ Ð±">
-<!ENTITY torbutton.about.make_donation "Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð¶ÐµÑ€Ñ‚Ð²Ñƒ.">
 <!ENTITY torbutton.pref_connection.notice "Ð’Ð¸Ð¼ÐºÐ½Ñ–Ñ‚ÑŒ Torbutton, Ñ‰Ð¾Ð± Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ñ†Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ">
 <!ENTITY torbutton.pref_connection.more_info "Ð‘Ñ–Ð»ÑŒÑˆÐµ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð”Ð¾Ð²Ñ–Ð´ÐºÐ°">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð·Ð°Ñ€Ð°Ð· ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¾. Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐºÑÑ– (Ð½Ðµ Tor-Ð¿Ñ€Ð¾ÐºÑÑ–), Ð¿Ñ€Ð¾ÑˆÑƒ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Torbutton Ñ‚Ð° Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ ÑÑŽÐ´Ð¸. Ð¯ÐºÑ‰Ð¾ Ð¶ Ð±Ð°Ð¶Ð°Ð½Ð° Ð·Ð¼Ñ–Ð½Ð° Ñ‚Ð¾Ñ€ÐºÐ°Ñ‚Ð¸Ð¼ÐµÑ‚ÑŒÑÑ Tor-Ð¿Ñ€Ð¾ÐºÑÑ–, Ð¿Ñ€Ð¾ÑˆÑƒ Ñ†Ðµ Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð²Ñ–ÐºÐ½Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "ÐÐ¾Ð²Ð° Ð¾ÑÐ¾Ð±Ð¸ÑÑ‚Ñ–ÑÑ‚ÑŒ">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ÑÑ‚Ð°Ð½ Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "ÐŸÑ€Ð¾ Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐœÐµÑ€ÐµÐ¶Ñ–...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½ÑŒ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‡Ð° Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð—Ð°Ñ…Ð¸ÑÑ‚ ÐºÑƒÐºÐ¸">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ Ð°Ð´Ñ€ÐµÑÑƒ Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð°Ð´Ñ€ÐµÑÑƒ Tor Ñƒ Ð½Ð¾Ð²Ñ–Ð¹ Ð²ÐºÐ»Ð°Ð´Ñ†Ñ–">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð°Ð´Ñ€ÐµÑÑƒ Tor Ñƒ Ð½Ð¾Ð²Ð¾Ð¼Ñƒ Ð²Ñ–ÐºÐ½Ñ–">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ÐšÐ»Ð°Ñ†Ð½Ñ–Ñ‚ÑŒ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑÐºÑƒ Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸">
-<!ENTITY torbutton.prefs.block_thread "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ— Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_thwrite "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ— Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_nthread "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ— Ð±ÐµÐ· Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (Ð½Ð° Ð’Ð°Ñˆ Ð²Ð¸Ð±Ñ–Ñ€)">
-<!ENTITY torbutton.prefs.block_nthwrite "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ— Ð±ÐµÐ· Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (Ð½Ð° Ð’Ð°Ñˆ Ð²Ð¸Ð±Ñ–Ñ€)">
-<!ENTITY torbutton.prefs.clear_history "ÐžÑ‡Ð¸Ñ‰ÑƒÐ²Ð°Ñ‚Ð¸ Ñ–ÑÑ‚Ð¾Ñ€Ñ–ÑŽ Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– ÑÑ‚Ð°Ð½Ñƒ Tor (Ð½Ð° Ð’Ð°Ñˆ Ð²Ð¸Ð±Ñ–Ñ€)">
-<!ENTITY torbutton.prefs.clear_cache "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð¸ÑÐºÐ¾Ð²Ð¸Ð¹ ÐºÐµÑˆ Ñ‚Ð° Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐµÑˆ Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– ÑÑ‚Ð°Ð½Ñƒ Tor">
-<!ENTITY torbutton.prefs.block_cache "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ñ‚Ð° ÐºÐµÑˆÑƒ Ñƒ Ð¿Ð°Ð¼â€™ÑÑ‚Ñ– Ð¿Ñ€Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ Ð½Ðµ-Tor ÐºÑƒÐºÐ¸ Ñƒ Ð·Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾Ð¼Ñƒ ÑÑ‚Ð°Ð½Ñ–">
-<!ENTITY torbutton.prefs.cookie_protection "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ Ð´Ñ–Ð°Ð»Ð¾Ð³ Ð·Ð°Ñ…Ð¸ÑÑ‚Ñƒ ÐºÑƒÐºÑ–Ð²">
-<!ENTITY torbutton.prefs.mmm_cookies "Ð¯ Ñ…Ð¾Ñ‡Ñƒ ÑÐ°Ð¼ ÐºÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ²Ð¾Ñ—Ð¼Ð¸ ÐºÑƒÐºÐ°Ð¼Ð¸ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.clear_cookies "Ð§Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÑƒÐºÐ¸ Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– ÑÑ‚Ð°Ð½Ñƒ Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Ð’Ð¸Ð¼Ð¸ÐºÐ°Ñ‚Ð¸ Ð¼Ð¾Ð´ÑƒÐ»Ñ– Ð¿Ñ€Ð¾Ñ‚ÑÐ³Ð¾Ð¼ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ð—Ð°Ñ…Ð¾Ð¿Ð»ÑŽÐ²Ð°Ñ‚Ð¸ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÐ¸ Ñƒ javascript (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.isolate_content "Ð†Ð·Ð¾Ð»ÑŽÐ²Ð°Ñ‚Ð¸ Ð´Ð¸Ð½Ð°Ð¼Ñ–Ñ‡Ð½Ð¸Ð¹ Ð²Ð¼Ñ–ÑÑ‚ Ð´Ð¾ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÑ‚Ð°Ð½Ñƒ Tor (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.no_updates "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ‚ÑÐ³Ð¾Ð¼ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor">
-<!ENTITY torbutton.prefs.set_uagent "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ ÑŽÐ·ÐµÑ€ Ð°Ð³ÐµÐ½Ñ‚ Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dynamic "Ð”Ð¸Ð½Ð°Ð¼Ñ–Ñ‡Ð½Ð¸Ð¹ Ð²Ð¼Ñ–ÑÑ‚">
-<!ENTITY torbutton.prefs.cookies "ÐšÑƒÐºÐ¸">
-<!ENTITY torbutton.prefs.cache "ÐšÐµÑˆ">
-<!ENTITY torbutton.prefs.history "Ð†ÑÑ‚Ð¾Ñ€Ñ–Ñ">
-<!ENTITY torbutton.prefs.no_search "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿Ñ–Ð´ÐºÐ°Ð·ÐºÐ¸ Ð¿Ñ€Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.shutdown "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸">
-<!ENTITY torbutton.prefs.tor_shutdown "Ð§Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÑƒÐºÐ¸ Tor Ð¿Ñ€Ð¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ– Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‡Ð° Ñ–Ð· Tor ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¸Ð¼">
-<!ENTITY torbutton.prefs.all_shutdown "Ð§Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÑƒÐºÐ¸ Tor Ð¿Ñ€Ð¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ– Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.no_shutdown "ÐÐµ Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÑƒÐºÑ–Ð² Ð¿Ñ€Ð¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ– Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‡Ð°">
-<!ENTITY torbutton.prefs.disable_sessionstore "ÐÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ‚Ð¸ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ ÑÐµÑÑ–Ð¹ (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.headers "Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸">
-<!ENTITY torbutton.prefs.refererspoofing "ÐŸÑ–Ð´ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ñ€ÐµÑ„ÐµÑ€ÐµÑ€">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Ð Ð¾Ð·ÑƒÐ¼Ð½Ð° Ð¿Ñ–Ð´ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Tor (Ð¿Ñ–Ð´Ð¼Ñ–Ð½Ð° Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑÐ½Ð¸Ñ… Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¸Ñ… Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ñ–Ð²)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ DOM Ð¿Ñ€Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Tor (ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ€Ð¼Ð¸">
-<!ENTITY torbutton.prefs.block_tforms "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð² Ñ‚Ð° Ñ„Ð¾Ñ€Ð¼ Ð¿Ñ€Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_ntforms "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð² Ñ‚Ð° Ñ„Ð¾Ñ€Ð¼ (Ð½Ð° Ð’Ð°Ñˆ Ð²Ð¸Ð±Ñ–Ñ€)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ð½Ðµ-Tor">
-<!ENTITY torbutton.prefs.restore_tor "ÐŸÑ€Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– ÑÐµÑÑ–Ñ—, Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÑŽÐ²Ð°Ñ‚Ð¸ ÑÑ‚Ð°Ð½ Tor ÑÐº:">
-<!ENTITY torbutton.prefs.startup_tor "ÐŸÑ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÑƒ Ð²ÐµÐ±-Ð¾Ð³Ð»ÑÐ´Ð°Ñ‡Ð°, Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÑŽÐ²Ð°Ñ‚Ð¸ ÑÑ‚Ð°Ð½ Tor Ñƒ:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "ÐŸÐµÑ€ÐµÐ²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÐºÑƒÐºÐ¸/Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÑƒÐºÐ¸ Ð¿Ñ€Ð¸ Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ– Ð¤Ñ–Ñ€ÐµÑ„Ð¾Ñ…Ñƒ (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ ÑÐº Tor, Ñ‚Ð°Ðº Ñ– Ð½Ðµ-Tor ÐºÑƒÐºÐ¸ Ñƒ Ð·Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾Ð¼Ñƒ ÑÑ‚Ð°Ð½Ñ– (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.clear_http_auth "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÑÐµÑÑ–Ñ— HTTP Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_js_history "Ð’Ð¸Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ— Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ— Ð´Ð¾ Tor (Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¾)">
-<!ENTITY torbutton.prefs.resize_on_toggle "ÐœÐ°ÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ–ÐºÐ½Ð° ÐºÑ€Ð°Ñ‚Ð½Ð¾ 50 Ð¿Ñ–ÐºÑÐµÐ»ÑÐ¼ Ð¿Ñ€Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.close_tor "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ ÑƒÑÑ– Ð²Ñ–ÐºÐ½Ð° Ñ‚Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Tor Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ– (Ð½Ðµ Ð¾Ð±Ð¾Ð²â€™Ð·ÐºÐ¾Ð²Ð¾)">
-<!ENTITY torbutton.prefs.close_nontor "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ ÑƒÑÑ– Ð½Ðµ Tor Ð²Ñ–ÐºÐ½Ð° Ñ‚Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ– (Ð½Ðµ Ð¾Ð±Ð¾Ð²â€™Ð·ÐºÐ¾Ð²Ð¾)">
-<!ENTITY torbutton.prefs.block_links "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ»Ð°Ñ†Ð°Ð½Ð½Ñ Ð¿Ð¾ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½ÑÑ… Ñ– Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ÑÑ‚Ð¾Ñ€Ñ–Ð½Ð¾Ðº Ð· Ñ€Ñ–Ð·Ð½Ð¸Ñ… Ñ€ÐµÐ¶Ð¸Ð¼Ñ–Ð² Tor (Ð½ÐµÐ¾Ð±Ð¾Ð²'ÑÐ·ÐºÐ¾Ð²Ð¾)">
-<!ENTITY torbutton.prefs.jar_certs "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸ SSL Ñƒ Ñ€Ñ–Ð·Ð½Ð¸Ñ… jar`Ð°Ñ… Ð´Ð»Ñ Tor/Ð½Ðµ Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸ CA Ñƒ Ñ€Ñ–Ð·Ð½Ð¸Ñ… jar`Ð°Ñ… Ð´Ð»Ñ Tor/Ð½Ðµ Tor (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.locked_mode "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ ÐšÐ½Ð¾Ð¿ÐºÑƒ Ñ– Ð“Ð°Ñ€ÑÑ‡Ñ– ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ">
-<!ENTITY torbutton.prefs.startup_state "ÐŸÑ€Ð¸ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¼Ñƒ Ð·Ð°Ð¿ÑƒÑÐºÑƒ â€” Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÑŽÐ²Ð°Ñ‚Ð¸ ÑÑ‚Ð°Ð½ Tor Ñƒ:">
-<!ENTITY torbutton.prefs.shutdown_state "Ð’Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¸Ð¹ ÑÑ‚Ð°Ð½">
-<!ENTITY torbutton.prefs.startup "Ð—Ð°Ð¿ÑƒÑÐº">
-<!ENTITY torbutton.prefs.block_tor_file_net "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ñ– Tor Ð²Ñ–Ð´ Ð°Ð´Ñ€ÐµÑ Ñ‚Ð¸Ð¿Ñƒ file:// (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¼ÐµÑ€ÐµÐ¶Ñ– Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ñ– ÐÐµ-Tor Ð²Ñ–Ð´ Ð°Ð´Ñ€ÐµÑ Ñ‚Ð¸Ð¿Ñƒ file://">
 <!ENTITY torbutton.prefs.restore_defaults "Ð—Ð° Ð—Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼">
 <!ENTITY torbutton.prefs.test_settings "ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
-<!ENTITY torbutton.prefs.test_auto "ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€ÑÑ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Tor, Ð¿Ñ–ÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, ÑÐº Ñ Ð²Ð¿ÐµÑ€ÑˆÐµ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°ÑŽ Ñ†ÐµÐ¹ Ñ€ÐµÐ¶Ð¸Ð¼ Ð¿Ñ€Ð¸ ÐºÐ¾Ð¶Ð½Ð¾Ð¼Ñƒ Ð·Ð°Ð¿ÑƒÑÐºÑƒ Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "ÐÐµ Ð·Ð°Ð¿Ð¸ÑÑƒÐ²Ð°Ñ‚Ð¸ ÐºÑƒÐºÐ¸ Tor Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ÐÐµ Ð·Ð°Ð¿Ð¸ÑÑƒÐ²Ð°Ñ‚Ð¸ Ð½Ðµ Tor ÐºÑƒÐºÐ¸ Ð½Ð° Ð´Ð¸ÑÐº">
-<!ENTITY torbutton.prefs.session_restore "Ð§Ð¸ Ð¼Ð¾Ð¶Ðµ ÑÐµÑÑ–Ñ Ð¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ÑÑŒ, Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ÑÑŒ Ñ– Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÑŽÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð· Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¼Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸:">
-<!ENTITY torbutton.prefs.nontor_tabs "Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ñ– Ð½Ðµ Ð² Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Ð—Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ñ– Ð² Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ÐÐµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾ÐºÑÑ– Ð´Ð»Ñ: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð£Ð²Ð°Ð³Ð°: Ð£Ð½Ð¸ÐºÐ°Ð¹Ñ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð±ÑƒÐ´ÑŒ ÑÐºÐ¾Ð³Ð¾ Ð· Ð½Ð¸Ñ‰ÐµÐ·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ… Ñ…Ð¾ÑÑ‚Ñ–Ð²">
-<!ENTITY torbutton.prefs.spoofreresh "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ð¿Ñ–Ð´ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸">
-<!ENTITY torbutton.prefs.refereroptions "ÐžÐ¿Ñ†Ñ–Ñ— Ð¿Ñ–Ð´ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ñ–Ð²">
-<!ENTITY torbutton.prefs.nospoof "ÐÐµ Ð¿Ñ–Ð´Ð¼Ñ–Ð½ÑÑ‚Ð¸ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€">
-<!ENTITY torbutton.prefs.spoofroot "ÐŸÑ–Ð´Ð¼Ñ–Ð½Ð° ÑÑ‚Ð¾Ñ€Ñ–Ð½Ð¾Ðº, ÑÐºÑ– Ð¼Ñ–ÑÑ‚ÑÑ‚ÑŒ Ð¿Ð°Ð¿ÐºÐ¸">
-<!ENTITY torbutton.prefs.spoofdomain "ÐŸÑ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð´Ð¾Ð¼ÐµÐ½ Ð² ÑÐºÐ¾ÑÑ‚Ñ– Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð°">
-<!ENTITY torbutton.prefs.spoofblank "Ð—Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼">
 <!ENTITY torbutton.cookiedialog.title "ÐšÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð—Ð°Ñ…Ð¸ÑÑ‚Ð¾Ð¼ ÐšÑƒÐºÑ–Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð—Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð¥Ð¾ÑÑ‚">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð£ÑÑ–, ÐžÐºÑ€Ñ–Ð¼ Ð—Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¸Ñ…">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð—Ð°Ñ…Ð¸Ñ‰Ð°Ñ‚Ð¸ ÐÐ¾Ð²Ñ– ÐšÑƒÐºÐ¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ Ð—Ð°Ñ…Ð¸Ñ‰Ð°Ñ‚Ð¸ ÐÐ¾Ð²Ñ– ÐšÑƒÐºÐ¸">
-<!ENTITY torbutton.prefs.disable_livemarks "Ð’Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Livemarks Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Ð² Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
-<!ENTITY torbutton.prefs.dtd_optional "(Ð½Ðµ Ð¾Ð±Ð¾Ð²â€™Ð·ÐºÐ¾Ð²Ð¾)">
-<!ENTITY torbutton.prefs.dtd_crucial "(ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Torbutton Ñ‡ÐµÑ€ÐµÐ· Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñƒ Ð¿Ð¾ÑˆÑƒÐºÐ¾Ð²Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ñ– Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "ÐŸÑ€Ð¾Ð·Ð¾Ñ€Ð° Ð¢Ð¾Ñ€Ñ–Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ (Ð’Ð¸Ð¼Ð°Ð³Ð°Ñ” ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ†ÑŒÐºÐ¸Ñ… transproxy Ð°Ð±Ð¾ Tor-Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð°)">
 <!ENTITY torbutton.prefs.block_disk "ÐÐµ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ Ñ–ÑÑ‚Ð¾Ñ€Ñ–ÑŽ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ñ–Ð² Ð°Ð±Ð¾ Ð´Ð°Ð½Ñ– Ð· Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð¸Ñ… ÑÐ°Ð¹Ñ‚Ñ–Ð² (Ð°ÐºÑ‚Ð¸Ð²ÑƒÑ” Ñ„ÑƒÐ½ÐºÑ†Ñ–ÑŽ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ñƒ)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ ÑÑ‚Ð¾Ñ€Ð¾Ð½Ð½Ñ– ÐºÑƒÐºÐ¸ Ñ‚Ð° Ñ–Ð½ÑˆÑ– Ð´Ð°Ð½Ñ– Ð²Ñ–Ð´ÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ">
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 48d6ace..ec685a9 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "TÃ¹y chá»‰nh Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "CÃ¡c Thiáº¿t láºp Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "DÃ¹ng thiáº¿t láºp proxy khuyáº¿n nghá»‹ cho phiÃªn báº£n trÃ¬nh duyá»‡t Firefox cá»§a tÃ´i">
-<!ENTITY torbutton.prefs.use_privoxy "DÃ¹ng Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "DÃ¹ng Polipo">
 <!ENTITY torbutton.prefs.custom_settings "DÃ¹ng thiáº¿t láºp proxy tÃ¹y biáº¿n">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy giao thá»©c HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Cá»•ng:">
-<!ENTITY torbutton.about.title "ThÃ´ng tin vá» Torbutton">
-<!ENTITY torbutton.about.version "PhiÃªn báº£n:">
-<!ENTITY torbutton.about.summary "Báº£o vá»‡ sá»± riÃªng tÆ° cho trÃ¬nh duyá»‡t Tor cá»§a báº¡n.">
-<!ENTITY torbutton.about.code "MÃ£ sá»‘ Cá»™ng sá»±:">
-<!ENTITY torbutton.about.maintainer "Bá»™ Duy TrÃ¬:">
-<!ENTITY torbutton.about.security_review "ÄÃ¡nh giÃ¡ tÃnh Báº£o máºt:">
-<!ENTITY torbutton.about.donate "Náº¿u báº¡n muá»‘n sá» dá»¥ng Tor, báº¡n cáº§n cÃ¢n nháº¯c">
-<!ENTITY torbutton.about.make_donation "gá»i Ä‘Ã³ng gÃ³p á»§ng há»™.">
 <!ENTITY torbutton.pref_connection.notice "VÃ´ hiá»‡u Torbutton Ä‘á»ƒ thay Ä‘á»•i cÃ¡c thiáº¿t Ä‘áº·t nÃ y.">
 <!ENTITY torbutton.pref_connection.more_info "ThÃªm thÃ´ng tin">
 <!ENTITY torbutton.pref_connection_more_info.title "Trá»£ giÃºp">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "VÃ²ng Tor má»›i cho trang nÃ y">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Báºt/táº¯t tráº¡ng thÃ¡i cá»§a Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "CÃ i Ä‘áº·t RiÃªng tÆ° vÃ  Báº£o máºt...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "ThÃ´ng tin vá» Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "CÃ i Ä‘áº·t Máº¡ng Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Kiá»ƒm tra viá»‡c cáºp nháºt trÃ¬nh duyá»‡t Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Báº£o vá»‡ Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Sao chÃ©p Ä‘á»‹a chá»‰ URL cá»§a Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Má»Ÿ liÃªn káº¿t Tor URL trong Tháº» má»›i">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Má»Ÿ liÃªn káº¿t Tor URL trong Cá»a sá»• má»›i">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Nháº¥p Ä‘á»ƒ nháºn diá»‡n Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "CÃ i Ä‘áº·t RiÃªng tÆ° vÃ  Báº£o máºt">
-<!ENTITY torbutton.prefs.block_thread "Cháº·n viá»‡c Ä‘á»c lá»‹ch sá» h.Ä‘ trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.block_thwrite "Cháº·n viá»‡c ghi lá»‹ch sá» h.Ä‘ trong quÃ¡ trÃ¬nh dÃ¹ng Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.block_nthread "Cháº·n viá»‡c Ä‘á»c lá»‹ch sá» trong quÃ¡ trÃ¬nh khÃ´ng dÃ¹ng Tor (tÃ¹y chá»n)">
-<!ENTITY torbutton.prefs.block_nthwrite "Cháº·n viá»‡c ghi lá»‹ch sá» h.Ä‘ trong quÃ¡ trÃ¬nh khÃ´ng dÃ¹ng Tor (tÃ¹y chá»n)">
-<!ENTITY torbutton.prefs.clear_history "XÃ³a lá»‹ch sá» khi báºt/táº¯t Tor (tÃ¹y chá»n)">
-<!ENTITY torbutton.prefs.clear_cache "Cháº·n bá»™ nhá»› Ä‘á»‡m tá»« Tor vÃ  xÃ³a táº¥t cáº£ cÃ¡c táºp tin Ä‘á»‡m khi báºt táº¯t Tor">
-<!ENTITY torbutton.prefs.block_cache "Cháº·n truy cáºp bá»™ Ä‘á»‡m trÃªn Ä‘Ä©a vÃ  bá»™ nhá»› trong quÃ¡ trÃ¬nh dÃ¹ng Tor">
-<!ENTITY torbutton.prefs.cookie_jars "LÆ°u trá»¯ cookie khÃ´ng thuá»™c Tor trong má»™t táºp tin *.jar Ä‘Æ°á»£c báº£o vá»‡">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "TÃ´i sáº½ tá»± quáº£n lÃ cookie cá»§a tÃ´i (nguy hiá»ƒm)">
-<!ENTITY torbutton.prefs.clear_cookies "XÃ³a cookie khi báºt táº¯t Tor">
-<!ENTITY torbutton.prefs.disable_plugins "VÃ´ hiá»‡u hÃ³a pháº§n bá»• trá»£ trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.kill_bad_js "Treo cá»©ng cÃ¡c javascript nguy hiá»ƒm (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.isolate_content "CÃ´ láºp cÃ¡c ná»™i dung Ä‘á»™ng bÃªn ngoÃ i tÃ¬nh tráº¡ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.no_updates "VÃ´ hiá»‡u hÃ³a cáºp nháºt trong quÃ¡ trÃ¬nh dÃ¹ng Tor">
-<!ENTITY torbutton.prefs.set_uagent "Thiáº¿t láºp user agent cho viá»‡c dÃ¹ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.dynamic "Ná»™i dung Äá»™ng">
-<!ENTITY torbutton.prefs.cookies "Cookie">
-<!ENTITY torbutton.prefs.cache "Bá»™ Ä‘á»‡m">
-<!ENTITY torbutton.prefs.history "LÆ°á»£c sá»">
-<!ENTITY torbutton.prefs.no_search "VÃ´ hiá»‡u hÃ³a Ä‘á» xuáº¥t tÃ¬m kiáº¿m trong quÃ¡ trÃ¬nh Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.shutdown "Táº¯t trÃ¬nh duyá»‡t">
-<!ENTITY torbutton.prefs.tor_shutdown "XÃ³a cookie Tor trong quÃ¡ trÃ¬nh táº¯t trÃ¬nh duyá»‡t Ä‘ang cháº¡y Tor">
-<!ENTITY torbutton.prefs.all_shutdown "XÃ³a cookie trong má»i quÃ¡ trÃ¬nh táº¯t trÃ¬nh duyá»‡t">
-<!ENTITY torbutton.prefs.no_shutdown "KhÃ´ng xÃ³a cookie cá»§a tÃ´i khi táº¯t trÃ¬nh duyá»‡t">
-<!ENTITY torbutton.prefs.disable_sessionstore "VÃ´ hiá»‡u hÃ³a LÆ°u PhiÃªn Duyá»‡t Web (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.headers "Äáº§u Ä‘á»">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "VÃ´ hiá»‡u hÃ³a LÆ°u trá»¯ DOM trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.forms "Biá»ƒu máº«u">
-<!ENTITY torbutton.prefs.block_tforms "Cháº·n viá»‡c lÆ°u biá»ƒu máº«u+máºt kháº©u trong quÃ¡ trÃ¬nh Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.block_ntforms "Cháº·n viá»‡c lÆ°u biá»ƒu máº«u+máºt kháº©u trong quÃ¡ trÃ¬nh KhÃ´ng-Tor (phá»¥)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "KhÃ´ng-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Khi khá»Ÿi cháº¡y cÃ¹ng phiÃªn Ä‘Æ°á»£c khÃ´i phá»¥c, thiáº¿t láºp tÃ¬nh tráº¡ng Tor thÃ nh:">
-<!ENTITY torbutton.prefs.startup_tor "Khi trÃ¬nh duyá»‡t khá»Ÿi Ä‘á»™ng, thiáº¿t láºp tráº¡ng thÃ¡i Tor thÃ nh:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Táº£i láº¡i jar cookie/xÃ³a cookie khi Firefox bá»‹ Ä‘á»• vá»¡ (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "LÆ°u trá»¯ cáº£ Tor vÃ  KhÃ´ng-Tor trong cÃ¡c táºp tin jar Ä‘Æ°á»£c báº£o vá»‡ (nguy hiá»ƒm)">
-<!ENTITY torbutton.prefs.clear_http_auth "XÃ³a cÃ¡c phiÃªn xÃ¡c thá»±c HTTP (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.block_js_history "CÃ´ láºp viá»‡c truy cáºp lÆ°á»£c sá» khá»i tÃ¬nh tráº¡ng Tor (cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Chá»‰nh kÃch thÆ°á»›c cá»a sá»• thÃ nh bá»™i sá»‘ cá»§a 50px trong quÃ¡ trÃ¬nh dÃ¹ng Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.close_tor "ÄÃ³ng táº¥t cáº£ cÃ¡c cá»a sá»• vÃ  tháº» Tor khi báºt táº¯t (phá»¥)">
-<!ENTITY torbutton.prefs.close_nontor "ÄÃ³ng táº¥t cáº£ cÃ¡c cá»a sá»• vÃ  tháº» KhÃ´ng-Tor khi báºt táº¯t (phá»¥)">
-<!ENTITY torbutton.prefs.block_links "Cháº·n viá»‡c nháº¥p chuá»™t lÃªn liÃªn káº¿t vÃ  viá»‡c táº£i láº¡i trang trong cÃ¡c tÃ¬nh tráº¡ng Tor khÃ¡c nhau (phá»¥)">
-<!ENTITY torbutton.prefs.jar_certs "LÆ°u trá»¯ chá»©ng thÆ° SSL trong cÃ¡c táºp tin jar tÃ¡ch biá»‡t cho Tor/KhÃ´ng-Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.jar_ca_certs "LÆ°u trá»¯ chá»©ng thÆ° CA trong cÃ¡c táºp tin jar tÃ¡ch biá»‡t cho Tor/KhÃ´ng-Tor (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.locked_mode "VÃ´ hiá»‡u hÃ³a NÃºt vÃ  PhÃm NÃ³ng Ä‘á»ƒ ngÄƒn viá»‡c vÃ´ tÃ¬nh báºt táº¯t">
-<!ENTITY torbutton.prefs.startup_state "Khi khá»Ÿi cháº¡y bÃ¬nh thÆ°á»ng, thiáº¿t láºp tÃ¬nh tráº¡ng Tor thÃ nh:">
-<!ENTITY torbutton.prefs.shutdown_state "TÃ¬nh tráº¡ng táº¯t trÃ¬nh duyá»‡t">
-<!ENTITY torbutton.prefs.startup "Khá»Ÿi cháº¡y">
-<!ENTITY torbutton.prefs.block_tor_file_net "Cháº·n truy cáºp Tor tá»« cÃ¡c liÃªn káº¿t file:// (khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Cháº·n truy cáºp KhÃ´ng-Tor tá»« cÃ¡c liÃªn káº¿t file://">
 <!ENTITY torbutton.prefs.restore_defaults "KhÃ´i phá»¥c Máº·c Ä‘á»‹nh">
 <!ENTITY torbutton.prefs.test_settings "Thiáº¿t láºp Thá» nghiá»‡m">
-<!ENTITY torbutton.prefs.test_auto "Thá» nghiá»‡m thiáº¿t láºp Tor cá»§a tÃ´i sau láº§n báºt/táº¯t Ä‘áº§u tiÃªn má»—i khi khá»Ÿi Ä‘á»™ng Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "KhÃ´ng ghi cookie Tor vÃ o Ä‘Ä©a">
-<!ENTITY torbutton.prefs.nontor_memory_jar "KhÃ´ng ghi cookie KhÃ´ng-Tor vÃ o Ä‘Ä©a">
-<!ENTITY torbutton.prefs.session_restore "Äá»ƒ phiÃªn lÆ°u trá»¯ vÃ  khÃ´i phá»¥c cÃ¡c tháº» sau:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tháº» Ä‘Æ°á»£c má»Ÿ trong KhÃ´ng-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tháº» Ä‘Æ°á»£c má»Ÿ trong Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "KhÃ´ng cÃ³ á»¦y nhiá»‡m cho:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Cáº£nh bÃ¡o: TrÃ¡nh sá» dá»¥ng báº¥t ká»³ tÃªn mÃ¡y chá»§ á»Ÿ trÃªn">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(khuyáº¿n cÃ¡o)">
-<!ENTITY torbutton.prefs.dtd_optional "(phá»¥)">
-<!ENTITY torbutton.prefs.dtd_crucial "(cáº¥p thiáº¿t)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "CÃ i Ä‘áº·t RiÃªng tÆ°">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
 <!ENTITY torbutton.prefs.sec_high "High">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index d947470..280f682 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton é¦–é€‰é¡¹">
 <!ENTITY torbutton.prefs.tor_settings "ä»£ç†è®¾ç½®">
 <!ENTITY torbutton.prefs.recommended_settings "è¯¥ç‰ˆæœ¬çš„ Firefox ä½¿ç”¨æŽ¨èä»£ç†è®¾ç½®">
-<!ENTITY torbutton.prefs.use_privoxy "ä½¿ç”¨ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "ä½¿ç”¨ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "è‡ªå®šä¹‰ä»£ç†è®¾ç½®">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP ä»£ç†ï¼š">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher ä»£ç†ï¼š">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ä»£ç†ï¼š">
 <!ENTITY torbutton.prefs.proxy.port "ç«¯å£ï¼š">
-<!ENTITY torbutton.about.title "å…³äºŽ Torbutton">
-<!ENTITY torbutton.about.version "ç‰ˆæœ¬ï¼š">
-<!ENTITY torbutton.about.summary "ä½¿ç”¨ Tor è¿›è¡Œæµè§ˆä¿æŠ¤åœ¨çº¿éšç§ã€‚">
-<!ENTITY torbutton.about.code "ä»£ç è´¡çŒ®è€…ï¼š">
-<!ENTITY torbutton.about.maintainer "ç»´æŠ¤äººå‘˜ï¼š">
-<!ENTITY torbutton.about.security_review "å®‰å…¨è¯„å®¡ï¼š">
-<!ENTITY torbutton.about.donate "å¦‚æžœå–œæ¬¢ä½¿ç”¨ Torï¼Œä½ å¯ä»¥è€ƒè™‘">
-<!ENTITY torbutton.about.make_donation "ç»™äºˆæèµ ã€‚">
 <!ENTITY torbutton.pref_connection.notice "ç¦æ¢ Torbutton æ›´æ”¹è¿™äº›è®¾ç½®ã€‚">
 <!ENTITY torbutton.pref_connection.more_info "æ›´å¤šä¿¡æ¯">
 <!ENTITY torbutton.pref_connection_more_info.title "å¸®åŠ©">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ä¸ºæ¤ç«™ç‚¹ä½¿ç”¨æ–° Tor çº¿è·¯">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "åˆ‡æ¢ Tor çŠ¶æ€">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "éšç§ä¸Žå®‰å…¨è®¾ç½®â€¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "å…³äºŽ Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor ç½‘ç»œè®¾ç½®â€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser æ£€æŸ¥æ›´æ–°â€¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie ä¿æŠ¤â€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "å¤åˆ¶ Tor ç½‘å€">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "åœ¨æ–°æ ‡ç¾é¡µä¸æ‰“å¼€ Tor ç½‘å€">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "åœ¨æ–°çª—å£ä¸æ‰“å¼€ Tor ç½‘å€">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ç‚¹æ¤åˆå§‹åŒ– Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "éšç§ä¸Žå®‰å…¨è®¾ç½®">
-<!ENTITY torbutton.prefs.block_thread "ä½¿ç”¨ Tor æ—¶ç¦æ¢è¯»å–åŽ†å²è®°å½•ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.block_thwrite "ä½¿ç”¨ Tor æ—¶ç¦æ¢å†™å…¥åŽ†å²è®°å½•ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.block_nthread "ä½¿ç”¨ Tor ä¹‹å¤–çš„ä»£ç†æ—¶ç¦æ¢è¯»å–åŽ†å²è®°å½•ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.block_nthwrite "åœç”¨ Tor æ—¶ç¦æ¢åŽ†å²è®°å½•å†™å…¥ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.clear_history "åˆ‡æ¢ Tor çŠ¶æ€æ—¶æ¸…é™¤åŽ†å²è®°å½•ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.clear_cache "åˆ‡æ¢ Tor æ—¶ç¦ç”¨ç£ç›˜ç¼“å˜å¹¶æ¸…é™¤æ‰€æœ‰ç¼“å˜">
-<!ENTITY torbutton.prefs.block_cache "ä½¿ç”¨ Tor æ—¶ç¦æ¢è®¿é—®ç£ç›˜å’Œå†…å˜ç¼“å˜">
-<!ENTITY torbutton.prefs.cookie_jars "åœ¨å—ä¿æŠ¤çš„ jar ä¸ä¿å˜ Tor ä¹‹å¤–çš„ cookie">
-<!ENTITY torbutton.prefs.cookie_protection "è¯·åœ¨ cookie éšç§ä¿æŠ¤å¯¹è¯æ¡†å†…é€‰æ‹©">
-<!ENTITY torbutton.prefs.mmm_cookies "æ‰‹åŠ¨ç®¡ç† cookie ï¼ˆå±é™©ï¼‰">
-<!ENTITY torbutton.prefs.clear_cookies "åˆ‡æ¢ Tor æ—¶æ¸…é™¤ cookie">
-<!ENTITY torbutton.prefs.disable_plugins "ä½¿ç”¨ Tor æ—¶ç¦ç”¨æ’ä»¶ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.kill_bad_js "æŒ‚å‹¾å±é™©çš„ Java è„šæœ¬ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.isolate_content "å°†åŠ¨æ€å†…å®¹ä¸Ž Tor çŠ¶æ€éš”ç¦»ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.no_updates "ä½¿ç”¨ Tor æ—¶ç¦ç”¨æµè§ˆå™¨æ›´æ–°">
-<!ENTITY torbutton.prefs.set_uagent "ä½¿ç”¨ Tor ä½œä¸ºç”¨æˆ·ä»£ç†è®¾ç½®ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.dynamic "åŠ¨æ€ç½‘é¡µå†…å®¹">
-<!ENTITY torbutton.prefs.cookies "Cookie">
-<!ENTITY torbutton.prefs.cache "ç¼“å˜">
-<!ENTITY torbutton.prefs.history "åŽ†å²">
-<!ENTITY torbutton.prefs.no_search "ä½¿ç”¨ Tor æ—¶ç¦ç”¨æœç´¢å»ºè®®ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.shutdown "å…³é—">
-<!ENTITY torbutton.prefs.tor_shutdown "é€šè¿‡ Tor å¯åŠ¨çš„æµè§ˆå™¨å…³é—æ—¶æ¸…é™¤ cookie">
-<!ENTITY torbutton.prefs.all_shutdown "ä»»ä½•æµè§ˆå™¨å…³é—æ—¶éƒ½æ¸…é™¤ cookie">
-<!ENTITY torbutton.prefs.no_shutdown "å…³é—æ—¶ä¸æ¸…é™¤ cookies">
-<!ENTITY torbutton.prefs.disable_sessionstore "ç¦ç”¨ Firefox çš„ä¼šè¯ä¿å˜ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.headers "Header">
-<!ENTITY torbutton.prefs.refererspoofing "ä¼ªé€  Referer">
-<!ENTITY torbutton.prefs.spoofblank "ä½¿ç”¨ Tor æ—¶ä¼ªé€ ç©ºç™½ Refererï¼ˆå¯èƒ½é€ æˆæŸäº›ç½‘ç«™æ˜¾ç¤ºå¼‚å¸¸ï¼‰">
-<!ENTITY torbutton.prefs.smartspoof "ä½¿ç”¨ Tor æ—¶ä¼ªé€ æ™ºèƒ½ Refererï¼ˆä¼ªé€ è·¨åŸŸ Refererï¼‰">
-<!ENTITY torbutton.prefs.nospoof "ä½¿ç”¨Tor æ—¶ä¸ä½¿ç”¨ä¼ªé€  Rerererï¼ˆå‘é€æ£å¸¸ Refererï¼‰">
-<!ENTITY torbutton.prefs.disable_domstorage "ä½¿ç”¨ Tor æ—¶ç¦æ¢å˜å‚¨æµè§ˆå™¨çš„ DOMï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.forms "è¡¨å•">
-<!ENTITY torbutton.prefs.block_tforms "ä½¿ç”¨ Tor æ—¶ç¦æ¢ä¿å˜å¯†ç å’Œè¡¨å•ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.block_ntforms "åœç”¨ Tor æ—¶ç¦æ¢ä¿å˜å¯†ç å’Œè¡¨å•ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.tor "ä½¿ç”¨ Tor">
-<!ENTITY torbutton.prefs.non_tor "åœç”¨ Tor">
-<!ENTITY torbutton.prefs.restore_tor "æ¢å¤æµè§ˆå™¨ä¼šè¯æ—¶ï¼Œè®¾ç½® Tor çš„çŠ¶æ€ä¸ºï¼š">
-<!ENTITY torbutton.prefs.startup_tor "æµè§ˆå™¨å¯åŠ¨æ—¶,è®¾ç½® Tor çš„çŠ¶æ€ä¸º:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æºƒåŽ é‡è½½ cookie jar/æ¸…é™¤ cookieï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.dual_cookie_jars "åœ¨å—ä¿æŠ¤çš„ jar æ–‡ä»¶ä¸åŒæ—¶ä¿å˜ä½¿ç”¨ Tor å’Œåœç”¨ Tor æ—¶çš„ cookieï¼ˆå±é™©ï¼‰">
-<!ENTITY torbutton.prefs.clear_http_auth "æ¸…é™¤ HTTP è®¤è¯ä¼šè¯ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.block_js_history "Tor çŠ¶æ€å˜åŒ–åŽé™åˆ¶åœ¨å…ˆå‰çŠ¶æ€ä¸‹å·²æµè§ˆçš„ç½‘é¡µé—´è¿›è¡Œè·³è½¬ ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.resize_on_toggle "ä½¿ç”¨ Tor æ—¶è°ƒæ•´çª—å£å¤§å°ä¸º 50 åƒç´ çš„å€æ•°ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.close_tor "åˆ‡æ¢æ—¶å…³é—æ‰€æœ‰ä½¿ç”¨ Tor çš„çª—å£å’Œæ ‡ç¾ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.close_nontor "åˆ‡æ¢æ—¶å…³é—æ‰€æœ‰åœç”¨ Tor çš„çª—å£å’Œæ ‡ç¾ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.block_links "Tor çŠ¶æ€å‘ç”Ÿæ”¹å˜æ—¶ç¦æ¢ç‚¹å‡»é“¾æŽ¥å’ŒåŠ è½½é¡µé¢ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.jar_certs "å°†ä½¿ç”¨ Tor/åœç”¨ Tor æ—¶çš„ SSL è¯ä¹¦åˆ†å¼€å˜æ”¾ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.jar_ca_certs "å°†ä½¿ç”¨ Tor/åœç”¨ Tor æ—¶çš„ CA è¯ä¹¦åˆ†å¼€å˜æ”¾ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.locked_mode "ç¦ç”¨å·¥å…·æ æŒ‰é’®å’Œé”®ç›˜å¿«æ·é”®é˜²æ¢è¯¯åˆ‡æ¢">
-<!ENTITY torbutton.prefs.startup_state "æ£å¸¸å¯åŠ¨æ—¶ï¼Œè®¾ç½® Tor çš„çŠ¶æ€ä¸ºï¼š">
-<!ENTITY torbutton.prefs.shutdown_state "å…³é—çŠ¶æ€">
-<!ENTITY torbutton.prefs.startup "å¯åŠ¨">
-<!ENTITY torbutton.prefs.block_tor_file_net "ç¦æ¢æœ¬åœ°é“¾æŽ¥ï¼ˆfile://ï¼‰ä½¿ç”¨ Tor è®¿é—®ç½‘ç»œï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.block_nontor_file_net "ç¦æ¢æœ¬åœ°é“¾æŽ¥ï¼ˆfile://ï¼‰æœªç» Tor è®¿é—®ç½‘ç»œ">
 <!ENTITY torbutton.prefs.restore_defaults "æ¢å¤é»˜è®¤è®¾ç½®">
 <!ENTITY torbutton.prefs.test_settings "æµ‹è¯•ä»£ç†è®¾ç½®">
-<!ENTITY torbutton.prefs.test_auto "æ¯æ¬¡å¯åŠ¨ Firefox åŽè¿›è¡Œé¦–æ¬¡åˆ‡æ¢æ—¶è‡ªåŠ¨éªŒè¯ Tor è®¾ç½®">
-<!ENTITY torbutton.prefs.disable_livemarks "ä½¿ç”¨ Tor æ—¶ç¦ç”¨ Livemarkï¼ˆRSSä¹¦ç¾ï¼‰æ›´æ–°">
-<!ENTITY torbutton.prefs.tor_memory_jar "ä½¿ç”¨ Tor æ—¶ä¸å°† Cookie å†™å…¥ç£ç›˜">
-<!ENTITY torbutton.prefs.nontor_memory_jar "åœç”¨ Tor æ—¶ä¸å°† Cookie å†™å…¥ç£ç›˜">
-<!ENTITY torbutton.prefs.session_restore "è®© Firefox çš„ä¼šè¯ä¿å˜åŠŸèƒ½ä¿å˜å¹¶æ¢å¤å¦‚ä¸‹æ ‡ç¾é¡µï¼š">
-<!ENTITY torbutton.prefs.nontor_tabs "åœç”¨ Tor æ—¶åŠ è½½æ ‡ç¾é¡µ">
-<!ENTITY torbutton.prefs.tor_tabs "ä½¿ç”¨ Tor æ—¶åŠ è½½æ ‡ç¾é¡µ">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ä¸ä½¿ç”¨ä»£ç†çš„åœ°å€:">
 <!ENTITY torbutton.prefs.no_proxy_warning "è¦å‘Šï¼šè¯·ä¸è¦ä½¿ç”¨ä¸Šè¿°ä»»ä½•ä¸»æœºåã€‚">
-<!ENTITY torbutton.prefs.spoofreresh "ä¼ªé€ åˆ·æ–°">
-<!ENTITY torbutton.prefs.refereroptions "Referer æ¬ºéª—é€‰é¡¹">
-<!ENTITY torbutton.prefs.nospoof "ä½¿ç”¨Tor æ—¶ä¸ä½¿ç”¨ä¼ªé€  Rerererï¼ˆå‘é€æ£å¸¸ Refererï¼‰">
-<!ENTITY torbutton.prefs.spoofroot "ä¼ªé€ åŒ…å«æ–‡ä»¶å¤¹çš„é¡µé¢">
-<!ENTITY torbutton.prefs.spoofdomain "ä¼ªé€ åŸŸåä½œä¸º Referer">
-<!ENTITY torbutton.prefs.spoofblank "ä½¿ç”¨ Tor æ—¶ä¼ªé€ ç©ºç™½ Refererï¼ˆå¯èƒ½é€ æˆæŸäº›ç½‘ç«™æ˜¾ç¤ºå¼‚å¸¸ï¼‰">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç†å—ä¿æŠ¤çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å—ä¿æŠ¤">
 <!ENTITY torbutton.cookiedialog.domainCol "æœåŠ¡å™¨">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å…¨éƒ¨ç§»é™¤ä»…ä¿ç•™å—ä¿æŠ¤çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿æŠ¤æ–°çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸ä¿æŠ¤æ–°çš„ Cookie">
-<!ENTITY torbutton.prefs.disable_livemarks "ä½¿ç”¨ Tor æ—¶ç¦ç”¨ Livemarkï¼ˆRSSä¹¦ç¾ï¼‰æ›´æ–°">
-<!ENTITY torbutton.prefs.dtd_recommended "ï¼ˆæŽ¨èï¼‰">
-<!ENTITY torbutton.prefs.dtd_optional "ï¼ˆå¯é€‰ï¼‰">
-<!ENTITY torbutton.prefs.dtd_crucial "ï¼ˆé‡è¦ï¼‰">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "é€šè¿‡ Tor é‡å®šå‘ Torbutton çš„æ›´æ–°">
-<!ENTITY torbutton.prefs.dodge_google_captcha "å½“æç¤ºéœ€è¦ Google éªŒè¯ç æ—¶è‡ªåŠ¨è°ƒç”¨å¤‡ç”¨æœç´¢å¼•æ“Žï¼š">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Tor å¼ºåŒ–é€æ˜Žä»£ç†ï¼ˆéœ€è¦è‡ªè®¾ TransProxy æˆ– Tor è·¯ç”±ï¼‰">
 <!ENTITY torbutton.prefs.priv_caption "éšç§è®¾ç½®">
 <!ENTITY torbutton.prefs.block_disk "ç¦æ¢è®°å½•æµè§ˆåŽ†å²æˆ–ç½‘ç«™æ•°æ®ï¼ˆå¯ç”¨éšç§æµè§ˆæ¨¡å¼ï¼‰">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "å¯é€šè¿‡å·¥å…·æ ä¸Šçš„  NoScript æŒ‰é’®ï¼Œå¯ç”¨æŸä¸ªç½‘ç«™ä¸Šçš„ JavaScriptã€‚">
 <!ENTITY torbutton.prefs.sec_high "é«˜">
 <!ENTITY torbutton.prefs.sec_all_js_desc "é»˜è®¤ç¦ç”¨æ‰€æœ‰ç½‘ç«™ JavaScriptã€‚">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "ç¦ç”¨å¤§å¤šæ•°éŸ³é¢‘å’Œè§†é¢‘æ ¼å¼ã€‚">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "ä»…å¯ç”¨ WebM ç¼–è§£ç å™¨ã€‚">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "æŸäº›å—ä½“å’Œå›¾æ ‡å¯èƒ½æ— æ³•æ£ç¡®æ˜¾ç¤ºã€‚">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ç¦ç”¨ç½‘ç«™æä¾›çš„å—ä½“æ–‡ä»¶ã€‚">
 <!ENTITY torbutton.prefs.sec_custom "è‡ªå®šä¹‰">
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 726e1c7..dd8f504 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton è¨ç½®">
 <!ENTITY torbutton.prefs.tor_settings "Proxy è¨å®š">
 <!ENTITY torbutton.prefs.recommended_settings "åœ¨Firefox ä½¿ç”¨å»ºè°çš„ Proxy è¨å®š">
-<!ENTITY torbutton.prefs.use_privoxy "ä½¿ç”¨ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "ä½¿ç”¨ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "ä½¿ç”¨è‡ªè¨‚çš„Proxy è¨å®š">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "é—œæ–¼ Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "åœç”¨Torbuttonä¾†æ”¹è®Šè¨å®š">
 <!ENTITY torbutton.pref_connection.more_info "æ›´å¤šè³‡è¨Š">
 <!ENTITY torbutton.pref_connection_more_info.title "å¹«åŠ©">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton ç¾åœ¨å·²ç¶“å•Ÿç”¨ã€‚å¦‚æžœæ‚¨æƒ³æ”¹è®Šéž-Tor Proxyçš„è¨å®šï¼Œè«‹åœç”¨Torbuttonä¸¦å›žåˆ°é€™è£ã€‚å¦‚æžœæ‚¨æƒ³æ”¹è®ŠTorçš„è¨å®šï¼Œè«‹ä½¿ç”¨Torbutton è¨ç½®è¦–çª—ã€‚">
 <!ENTITY torbutton.context_menu.new_identity "æ›´æ›èº«ä»½">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "åˆ‡æ› Tor ç‹€æ…‹">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "è¨ç½®...(P)">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "é—œæ–¼Torbutton...(A)">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "è¤‡è£½ Tor ç¶²éš›ç¶²è·¯ä½å€">
-<!ENTITY torbutton.context_menu.copyTor.key "P">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "åœ¨æ–°çš„è¦–çª—é–‹å•Ÿ Tor ç¶²éš›ç¶²è·¯ä½å€">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "é»žæ“Šä»¥åˆå§‹ Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "å®‰å…¨è¨å®š">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "åœ¨å•Ÿç”¨ Tor æ™‚å°éŽ–ç€è¦½å™¨">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "æ¸…é™¤Tor toggleä¸Šçš„æ·å²è¨˜éŒ„(é¸é …)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "æˆ‘å°‡æ‰‹å‹•ç®¡ç†æˆ‘çš„cookies (å±éšª)">
-<!ENTITY torbutton.prefs.clear_cookies "æ¸…é™¤Tor toggleä¸Šçš„cookies">
-<!ENTITY torbutton.prefs.disable_plugins "ä½¿ç”¨Toræ™‚æš«åœpluginså•Ÿå‹• (åš´æ ¼çš„)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "å‹•æ…‹å…§å®¹">
-<!ENTITY torbutton.prefs.cookies "Coolies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "è¨˜éŒ„">
-<!ENTITY torbutton.prefs.no_search "ä½¿ç”¨Toræ™‚ä¸å•Ÿç”¨æœå°‹æŽ¨è–¦ (å»ºè°)">
-<!ENTITY torbutton.prefs.shutdown "é—œé–‰">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "å›žå¾©é è¨å€¼">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(å»ºè°å€¼)">
-<!ENTITY torbutton.prefs.dtd_optional "(é¸æ“‡æ€§)">
-<!ENTITY torbutton.prefs.dtd_crucial "(é‡è¦çš„)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index ca3741f..ed9793e 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -10,115 +8,27 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "More information">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -130,17 +40,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "startpage.com">
-<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">



