[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

Sat Jun 4 09:47:10 UTC 2016

commit 353245b040f1974c0507feb958ed800c0c993ad8
Author: Translation commit bot <translation at torproject.org>
Date:   Sat Jun 4 09:47:04 2016 +0000

    Update translations for torbutton-torbuttondtd
---
 ach/torbutton.dtd         | 102 --------------------------------------------
 ady/torbutton.dtd         | 102 --------------------------------------------
 af/torbutton.dtd          | 102 --------------------------------------------
 ak/torbutton.dtd          | 102 --------------------------------------------
 am/torbutton.dtd          | 102 --------------------------------------------
 ar/torbutton.dtd          | 102 --------------------------------------------
 arn/torbutton.dtd         | 102 --------------------------------------------
 ast/torbutton.dtd         | 102 --------------------------------------------
 az/torbutton.dtd          | 102 --------------------------------------------
 ba/torbutton.dtd          | 102 --------------------------------------------
 be/torbutton.dtd          | 102 --------------------------------------------
 bg/torbutton.dtd          | 105 ----------------------------------------------
 bn/torbutton.dtd          | 102 --------------------------------------------
 bn_BD/torbutton.dtd       | 102 --------------------------------------------
 bn_IN/torbutton.dtd       | 102 --------------------------------------------
 bo/torbutton.dtd          | 102 --------------------------------------------
 br/torbutton.dtd          | 102 --------------------------------------------
 brx/torbutton.dtd         | 102 --------------------------------------------
 bs/torbutton.dtd          | 102 --------------------------------------------
 ca/torbutton.dtd          | 102 --------------------------------------------
 ceb/torbutton.dtd         | 102 --------------------------------------------
 cs/torbutton.dtd          | 102 --------------------------------------------
 csb/torbutton.dtd         | 102 --------------------------------------------
 cv/torbutton.dtd          | 102 --------------------------------------------
 cy/torbutton.dtd          | 102 --------------------------------------------
 da/torbutton.dtd          | 102 --------------------------------------------
 de/torbutton.dtd          | 102 --------------------------------------------
 dz/torbutton.dtd          | 102 --------------------------------------------
 el/torbutton.dtd          | 102 --------------------------------------------
 en/torbutton.dtd          | 102 --------------------------------------------
 en_GB/torbutton.dtd       | 102 --------------------------------------------
 eo/torbutton.dtd          | 102 --------------------------------------------
 es/torbutton.dtd          | 102 --------------------------------------------
 es_AR/torbutton.dtd       | 102 --------------------------------------------
 es_CL/torbutton.dtd       | 102 --------------------------------------------
 es_CO/torbutton.dtd       | 102 --------------------------------------------
 es_MX/torbutton.dtd       | 102 --------------------------------------------
 et/torbutton.dtd          | 102 --------------------------------------------
 eu/torbutton.dtd          | 102 --------------------------------------------
 fa/torbutton.dtd          | 102 --------------------------------------------
 fi/torbutton.dtd          | 102 --------------------------------------------
 fil/torbutton.dtd         | 102 --------------------------------------------
 fo/torbutton.dtd          | 102 --------------------------------------------
 fr/torbutton.dtd          | 102 --------------------------------------------
 fr_CA/torbutton.dtd       | 102 --------------------------------------------
 fur/torbutton.dtd         | 102 --------------------------------------------
 fy/torbutton.dtd          | 102 --------------------------------------------
 ga/torbutton.dtd          | 102 --------------------------------------------
 gl/torbutton.dtd          | 102 --------------------------------------------
 gu/torbutton.dtd          | 102 --------------------------------------------
 gu_IN/torbutton.dtd       | 102 --------------------------------------------
 gun/torbutton.dtd         | 102 --------------------------------------------
 ha/torbutton.dtd          | 102 --------------------------------------------
 he/torbutton.dtd          | 102 --------------------------------------------
 hi/torbutton.dtd          | 102 --------------------------------------------
 hr/torbutton.dtd          | 102 --------------------------------------------
 hr_HR/torbutton.dtd       | 102 --------------------------------------------
 ht/torbutton.dtd          | 102 --------------------------------------------
 hu/torbutton.dtd          | 102 --------------------------------------------
 hy/torbutton.dtd          | 102 --------------------------------------------
 ia/torbutton.dtd          | 102 --------------------------------------------
 id/torbutton.dtd          | 102 --------------------------------------------
 is/torbutton.dtd          | 102 --------------------------------------------
 it/torbutton.dtd          | 102 --------------------------------------------
 ja/torbutton.dtd          | 102 --------------------------------------------
 jv/torbutton.dtd          | 102 --------------------------------------------
 ka/torbutton.dtd          | 102 --------------------------------------------
 kk/torbutton.dtd          | 102 --------------------------------------------
 km/torbutton.dtd          | 102 --------------------------------------------
 kn/torbutton.dtd          | 102 --------------------------------------------
 ko/torbutton.dtd          | 102 --------------------------------------------
 ko_KR/torbutton.dtd       | 102 --------------------------------------------
 ku/torbutton.dtd          | 102 --------------------------------------------
 ku_IQ/torbutton.dtd       | 102 --------------------------------------------
 kw/torbutton.dtd          | 102 --------------------------------------------
 ky/torbutton.dtd          | 102 --------------------------------------------
 la/torbutton.dtd          | 102 --------------------------------------------
 lb/torbutton.dtd          | 102 --------------------------------------------
 lg/torbutton.dtd          | 102 --------------------------------------------
 ln/torbutton.dtd          | 102 --------------------------------------------
 lo/torbutton.dtd          | 102 --------------------------------------------
 lt/torbutton.dtd          | 102 --------------------------------------------
 lv/torbutton.dtd          | 102 --------------------------------------------
 mg/torbutton.dtd          | 102 --------------------------------------------
 mi/torbutton.dtd          | 102 --------------------------------------------
 mk/torbutton.dtd          | 102 --------------------------------------------
 ml/torbutton.dtd          | 102 --------------------------------------------
 mn/torbutton.dtd          | 102 --------------------------------------------
 mr/torbutton.dtd          | 102 --------------------------------------------
 ms_MY/torbutton.dtd       | 102 --------------------------------------------
 mt/torbutton.dtd          | 102 --------------------------------------------
 my/torbutton.dtd          | 102 --------------------------------------------
 nah/torbutton.dtd         | 102 --------------------------------------------
 nap/torbutton.dtd         | 102 --------------------------------------------
 nb/torbutton.dtd          | 102 --------------------------------------------
 nds/torbutton.dtd         | 102 --------------------------------------------
 ne/torbutton.dtd          | 102 --------------------------------------------
 nl/torbutton.dtd          | 102 --------------------------------------------
 nl_BE/torbutton.dtd       | 102 --------------------------------------------
 nn/torbutton.dtd          | 102 --------------------------------------------
 nso/torbutton.dtd         | 102 --------------------------------------------
 oc/torbutton.dtd          | 102 --------------------------------------------
 or/torbutton.dtd          | 102 --------------------------------------------
 pa/torbutton.dtd          | 102 --------------------------------------------
 pap/torbutton.dtd         | 102 --------------------------------------------
 pl/torbutton.dtd          | 102 --------------------------------------------
 pms/torbutton.dtd         | 102 --------------------------------------------
 ps/torbutton.dtd          | 102 --------------------------------------------
 pt/torbutton.dtd          | 102 --------------------------------------------
 pt_BR/torbutton.dtd       | 102 --------------------------------------------
 ro/torbutton.dtd          | 102 --------------------------------------------
 ru/torbutton.dtd          | 102 --------------------------------------------
 ru at petr1708/torbutton.dtd | 105 ----------------------------------------------
 scn/torbutton.dtd         | 102 --------------------------------------------
 sco/torbutton.dtd         | 102 --------------------------------------------
 si_LK/torbutton.dtd       | 102 --------------------------------------------
 sk/torbutton.dtd          | 102 --------------------------------------------
 sk_SK/torbutton.dtd       | 102 --------------------------------------------
 sl/torbutton.dtd          | 102 --------------------------------------------
 sl_SI/torbutton.dtd       | 102 --------------------------------------------
 sn/torbutton.dtd          | 102 --------------------------------------------
 so/torbutton.dtd          | 102 --------------------------------------------
 son/torbutton.dtd         | 102 --------------------------------------------
 sq/torbutton.dtd          | 102 --------------------------------------------
 sr/torbutton.dtd          | 102 --------------------------------------------
 sr at latin/torbutton.dtd    | 102 --------------------------------------------
 st/torbutton.dtd          | 102 --------------------------------------------
 su/torbutton.dtd          | 102 --------------------------------------------
 sv/torbutton.dtd          | 102 --------------------------------------------
 sw/torbutton.dtd          | 102 --------------------------------------------
 szl/torbutton.dtd         | 102 --------------------------------------------
 ta/torbutton.dtd          | 102 --------------------------------------------
 te/torbutton.dtd          | 102 --------------------------------------------
 te_IN/torbutton.dtd       | 102 --------------------------------------------
 tg/torbutton.dtd          | 102 --------------------------------------------
 th/torbutton.dtd          | 102 --------------------------------------------
 ti/torbutton.dtd          | 102 --------------------------------------------
 tk/torbutton.dtd          | 102 --------------------------------------------
 tr/torbutton.dtd          | 102 --------------------------------------------
 tzm/torbutton.dtd         | 102 --------------------------------------------
 ug at Arab/torbutton.dtd     | 102 --------------------------------------------
 uk/torbutton.dtd          | 102 --------------------------------------------
 ur/torbutton.dtd          | 102 --------------------------------------------
 ur_PK/torbutton.dtd       | 103 ---------------------------------------------
 uz/torbutton.dtd          | 102 --------------------------------------------
 ve/torbutton.dtd          | 102 --------------------------------------------
 vi/torbutton.dtd          | 102 --------------------------------------------
 wa/torbutton.dtd          | 102 --------------------------------------------
 wo/torbutton.dtd          | 102 --------------------------------------------
 yo/torbutton.dtd          | 102 --------------------------------------------
 zh_CN/torbutton.dtd       | 102 --------------------------------------------
 zh_HK/torbutton.dtd       | 102 --------------------------------------------
 zh_TW/torbutton.dtd       | 102 --------------------------------------------
 zu/torbutton.dtd          | 102 --------------------------------------------
 154 files changed, 15715 deletions(-)

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ach/torbutton.dtd
+++ b/ach/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 "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 "(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/ady/torbutton.dtd b/ady/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ady/torbutton.dtd
+++ b/ady/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 "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 "(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/af/torbutton.dtd b/af/torbutton.dtd
index 32c680f..12364fc 100644
--- a/af/torbutton.dtd
+++ b/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,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 "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 "(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/ak/torbutton.dtd b/ak/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ak/torbutton.dtd
+++ b/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,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 "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 "(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/am/torbutton.dtd b/am/torbutton.dtd
index 6d1ae8d..a2829aa 100644
--- a/am/torbutton.dtd
+++ b/am/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 "New Tor Circuit for this Site">
 <!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 "Privacy and Security Settingsâ€¦">
 <!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 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 "á‹¨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 "Privacy and 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 á‹«áˆáˆ†áŠ‘ áŠ©áŠªá‹Žá‰½áŠ• á‰ á‰°áŒ á‰ á‰€ áŒ†áŒ á‹áˆµáŒ¥ áŠ áŠ¨áˆ›á‰½">
-<!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 "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 "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 "áˆáˆˆá‰±áŠ•áˆ á‹¨Tor áŠ¥áŠ“ á‹¨Tor á‹«áˆáˆ†áŠ‘ áŠ©áŠªá‹Žá‰½áŠ• á‰ á‰°áŒ á‰ á‰ áŒ†áŒŽá‰½ á‹áˆµáŒ¥ áŠ áŠ¨áˆ›á‰½ (áŠ á‹°áŒˆáŠ›)">
-<!ENTITY torbutton.prefs.clear_http_auth "á‹¨HTTP auth áŠááˆˆ-áŒŠá‹œá‹Žá‰½áŠ• áŠ áŒ½á‹³ (á‹¨áˆšáˆ˜áŠ¨áˆ)">
-<!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 á‹¨áˆ†áŠ‘/á‹«áˆáˆ†áŠ‘ áŒ†áŒŽá‰½ áŠ áŠ¨áˆ›á‰½ (á‹¨áˆšáˆ˜áŠ¨áˆ)">
-<!ENTITY torbutton.prefs.jar_ca_certs "á‹¨CA áŠ¥á‹á‰…áŠ“ áˆ›áˆ¨áŒ‹áŒˆáŒ«á‹Žá‰½áŠ• á‰ á‰°áˆˆá‹«á‹© á‹¨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 áˆ˜á‹³áˆ¨áˆ»áŠ• áŠ áŒá‹µ (á‹¨áˆšáˆ˜áŠ¨áˆ)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "áŠ¨á‹á‹áˆ:// á‹©áŠ áˆáŠ¤áˆŽá‰½ á‹ˆá‹° áŠ á‹á‰³áˆ¨ á‹¨áˆšáˆ„á‹± á‹¨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 áŠ©áŠªá‹Žá‰½áŠ• á‹²áˆµáŠ áˆ‹á‹ áŠ á‰µáŒ»á">
-<!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 "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 "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 "Transparent Torification (á‰¥áŒ transproxy á‹ˆá‹áˆ á‹¨Tor áˆ«á‹á‰°áˆ á‹«áˆµáˆáˆáŒˆá‹‹áˆ)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!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 "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/ar/torbutton.dtd b/ar/torbutton.dtd
index b9f7205..43601b2 100644
--- a/ar/torbutton.dtd
+++ b/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/arn/torbutton.dtd b/arn/torbutton.dtd
index 32c680f..12364fc 100644
--- a/arn/torbutton.dtd
+++ b/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,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 "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 "(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/ast/torbutton.dtd b/ast/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ast/torbutton.dtd
+++ b/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,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 "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 "(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/az/torbutton.dtd b/az/torbutton.dtd
index bf94de4..5f0e8af 100644
--- a/az/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -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 "A">
-<!ENTITY torbutton.context_menu.about "TordÃ¼ymÉ™si haqqÄ±nda...">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!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 "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.privacy_security_settings "ÅžÉ™xsilik vÉ™ TÉ™hlÃ¼kÉ™sizlik seÃ§imlÉ™ri">
-<!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 "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 "(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.priv_caption "ÅžÉ™xsilik seÃ§imlÉ™ri">
 <!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 "YuksÉ™k">
 <!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 "Manual dÉ™yÉ™rlÉ™r">
diff --git a/ba/torbutton.dtd b/ba/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ba/torbutton.dtd
+++ b/ba/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 "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 "(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/be/torbutton.dtd b/be/torbutton.dtd
index d0a9730..3b055d5 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ÐÐ°Ð»Ð°Ð´ÐºÑ– Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "ÐÐ°Ð»Ð°Ð´ÐºÑ– Proxy">
 <!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 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 "ÐÐ± 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 "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 "ÐÐ± 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 "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 "(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/bg/torbutton.dtd b/bg/torbutton.dtd
index ae1bd0e..ad91d97 100644
--- a/bg/torbutton.dtd
+++ b/bg/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 "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "ÐžÑ‚Ð³Ð¾Ð²Ð¾Ñ€Ð½Ð¸Ðº:">
-<!ENTITY torbutton.about.security_review "ÐŸÑ€ÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÑ‚Ñ‚Ð°:">
-<!ENTITY torbutton.about.donate "ÐÐºÐ¾ Ð²Ð¸ Ñ…Ð°Ñ€ÐµÑÐ²Ð° Tor,Ð²Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¾Ð±Ð¼Ð¸ÑÐ»Ð¸Ñ‚Ðµ">
-<!ENTITY torbutton.about.make_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 "ÐŸÐ¾Ð¼Ð¾Ñ‰">
@@ -26,104 +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 "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð° Ð²ÐµÑ€ÑÐ¸Ñ Ð½Ð°  Ð¢Ð¾Ñ€ Ð‘Ñ€Ð°ÑƒÐ·ÑŠÑ€ÑŠÑ‚">
 <!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 "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¹ Ñ‡ÐµÑ‚ÐµÐ½Ðµ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð¾ Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Non-Tor ÑÐµÑÐ¸Ñ
- (Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ðµ).">
-<!ENTITY torbutton.prefs.block_nthwrite "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¹ Ð¿Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð¾ Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Non-Tor ÑÐµÑÐ¸Ñ 
-(Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ðµ).">
-<!ENTITY torbutton.prefs.clear_history "Ð˜Ð·Ñ‡Ð¸ÑÑ‚Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸ÑÑ‚Ð° Ð¿Ñ€Ð¸ Tor Ð¿Ñ€ÐµÐ²ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ (Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ðµ).">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¹ Ð´Ð¾ÑÑ‚ÑŠÐ¿Ð° Ð´Ð¾ ÐºÐµÑˆÐ° Ð½Ð° Ð´Ð¸ÑÐºÐ° Ð¸ Ð¿Ð°Ð¼ÐµÑ‚Ñ‚Ð° Ð¿Ñ€Ð¸ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° 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 "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ð¸Ñ Ð¿Ð¾ Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Tor">
-<!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 "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð¸ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ÑÑ‚Ð° Ð·Ð° Ñ‚ÑŠÑ€ÑÐµÐ½Ðµ Ð¿Ñ€ÐµÐ· 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 "ÐÐµ Ð¸Ð·Ñ‡Ð¸ÑÑ‚Ð²Ð°Ð¹ Ð±Ð¸ÑÐºÐ²Ð¸Ñ‚ÐºÐ¸Ñ‚Ðµ Ð¿Ñ€Ð¸ Ð¸Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ">
-<!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 "Ð¢ÐµÑÑ‚Ð²Ð°Ð¹ ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ">
-<!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 "ÐÐµ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð¹ Ð±Ð¸ÑÐºÐ²Ð¸Ñ‚ÐºÐ¸Ñ‚Ðµ Ð½Ð° Tor Ð² Ð´Ð¸ÑÐºÐ°">
-<!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 "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 "Ð—Ð°Ñ‰Ð¸Ñ‚ÐµÐ½">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð¥Ð¾ÑÑ‚">
@@ -135,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 "(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 "Ð›Ð¸Ñ‡Ð½Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
@@ -179,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/bn/torbutton.dtd b/bn/torbutton.dtd
index 363c641..0413dac 100644
--- a/bn/torbutton.dtd
+++ b/bn/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 à¦ªà§à¦°à¦•à§à¦¸à¦¿:">
@@ -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 "à¦ªà§‹à¦°à§à¦Ÿ:">
-<!ENTITY torbutton.about.title "Torbutton à¦¸à¦®à§à¦ªà¦°à§à¦•à§‡">
-<!ENTITY torbutton.about.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 "à¦†à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦Ÿà¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦¤à§‡ à¦ªà¦›à¦¨à§à¦¦ à¦•à¦°à§‡à¦¨ à¦¤à¦¾à¦¹à¦²à§‡ à¦¦à§‡à¦–à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨">
-<!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 "à¦¸à¦¾à¦¹à¦¾à¦¯à§à¦¯">
@@ -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 "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 "(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/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd
index 32c680f..12364fc 100644
--- a/bn_BD/torbutton.dtd
+++ b/bn_BD/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 "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 "(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/bn_IN/torbutton.dtd b/bn_IN/torbutton.dtd
index 32c680f..12364fc 100644
--- a/bn_IN/torbutton.dtd
+++ b/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,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 "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 "(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/bo/torbutton.dtd b/bo/torbutton.dtd
index 32c680f..12364fc 100644
--- a/bo/torbutton.dtd
+++ b/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,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 "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 "(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/br/torbutton.dtd b/br/torbutton.dtd
index 76b12d9..15afd28 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "DibarzhioÃ¹ ar 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,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 "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 "(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/brx/torbutton.dtd b/brx/torbutton.dtd
index 0b9bf09..5edb571 100644
--- a/brx/torbutton.dtd
+++ b/brx/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 "à¤®à¤¦à¤¦">
@@ -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 "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 "(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/bs/torbutton.dtd b/bs/torbutton.dtd
index 5643d7d..b7412f2 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Postavke Tor-dugmeta">
 <!ENTITY torbutton.prefs.tor_settings ""Proxy" 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,14 +8,6 @@
 <!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Ä‡">
@@ -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 "O Torbutton-u...">
-<!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 "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.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 "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 "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 "(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 "PodeÅ¡avanja privatnosti">
 <!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/ca/torbutton.dtd b/ca/torbutton.dtd
index 28aecef..c3ff5a9 100644
--- a/ca/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Commuta l'estat de Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PreferÃ¨ncies de privadesa i seguretat...">
 <!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 "PreferÃ¨ncies de la Xarxa Tor...7">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualitzaciÃ³ del navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Proteccions 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.privacy_security_settings "PreferÃ¨ncies de privadesa i 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 "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 "(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.priv_caption "PreferÃ¨ncies de privadesa">
 <!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 "El JavaScript pot ser activat lloc per lloc mitjanÃ§ant el botÃ³ NoScript de la barra d'eines. ">
 <!ENTITY torbutton.prefs.sec_high "Alt">
 <!ENTITY torbutton.prefs.sec_all_js_desc "El JavaScript estÃ  desactivat per defecte a tots els llocs.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "La majoria de formats d'audio i video estan desactivats. ">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "El WebM Ã©s l'Ãºnic cÃ²dec que romÃ n activat. ">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipus de lletra i icones poden mostrar-se incorrectament. ">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Els fitxers de tipus de lletra provinents de llocs web estan bloquejats. ">
 <!ENTITY torbutton.prefs.sec_custom "Valors personalitzats">
diff --git a/ceb/torbutton.dtd b/ceb/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ceb/torbutton.dtd
+++ b/ceb/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 "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 "(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/cs/torbutton.dtd b/cs/torbutton.dtd
index efee8eb..ff91ff3 100644
--- a/cs/torbutton.dtd
+++ b/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,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 "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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "NovÃ© pÅ™ipojenÃ k Toru pro tuto strÃ¡nku">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "ZmÄ›nit Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "NastavenÃ zabezpeÄenÃ a ochrany osobnÃch ÃºdajÅ¯">
 <!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 "NastavenÃ sÃtÄ› Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Hledat aktualizace pro Tor Browser">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrany proti 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.privacy_security_settings "Ochrana osobnÃch ÃºdajÅ¯ a nastavenÃ zabezpeÄenÃ">
-<!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 "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 "(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.priv_caption "NastavenÃ soukromÃ">
 <!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 "PouÅ¾itÃm tlaÄÃtka NoScript mÅ¯Å¾ete zapnout JavaScript jen na nÄ›kterÃ½ch strÃ¡nkÃ¡ch.">
 <!ENTITY torbutton.prefs.sec_high "VysokÃ¡">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je defaultnÄ› vypnut na vÅ¡ech strÃ¡nkÃ¡ch.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "VÄ›tÅ¡ina formÃ¡tÅ¯ zvuku a videa je vypnutÃ½ch.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "JedinÃ½ WebM kodek zÅ¯stal zapnutÃ½.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "NÄ›kterÃ© fonty a ikony se mohou zobrazit Å¡patnÄ›.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Soubory fontÅ¯ poskytovanÃ© weby jsou blokovÃ¡ny.">
 <!ENTITY torbutton.prefs.sec_custom "VlastnÃ hodnoty">
diff --git a/csb/torbutton.dtd b/csb/torbutton.dtd
index 32c680f..12364fc 100644
--- a/csb/torbutton.dtd
+++ b/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,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 "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 "(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/cv/torbutton.dtd b/cv/torbutton.dtd
index 27a3405..90c1ea7 100644
--- a/cv/torbutton.dtd
+++ b/cv/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 "ÐŸÐ¾Ñ€Ñ‡Ä•:">
-<!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 "Ð˜ÑÑ‚Ð¾Ñ€Ð¸">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!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 "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 "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 "(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/cy/torbutton.dtd b/cy/torbutton.dtd
index 876dba8..1da390d 100644
--- a/cy/torbutton.dtd
+++ b/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 "Dirprwy HTTP:">
@@ -10,14 +8,6 @@
 <!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 "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°">
@@ -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 "Amdan Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "T">
 <!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 "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.privacy_security_settings "Privacy and Security Settings">
-<!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 "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 "(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.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/da/torbutton.dtd b/da/torbutton.dtd
index 1c5a0e7..493f033 100644
--- a/da/torbutton.dtd
+++ b/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,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 "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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nyt Tor Circuit for dette site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Skift Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Privatlivs- og sikkerhedsindstillinger...">
 <!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 "Tor netvÃ¦rksindstillinger...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Led efter Tor Browser opdateringer...">
 <!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.privacy_security_settings "Privatlivs- og 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 "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.spoofroot "Forfalsk den indeholdte mappe for siden">
-<!ENTITY torbutton.prefs.spoofdomain "Forfalsk domÃ¦net som henviser">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "HÃ¥ndtÃ©r Cookie-beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "VÃ¦rt">
@@ -132,17 +43,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 "Disable livemarks updates during Tor usage">
-<!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.priv_caption "Privatlivs-indstillinger">
 <!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveres pÃ¥ netsted-basis via NoScript knappen pÃ¥ vÃ¦rktÃ¸jlinjen.">
 <!ENTITY torbutton.prefs.sec_high "HÃ¸j">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er som standard deaktiveret pÃ¥ alle sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "De fleste lyd- og videoformater er deaktiveret.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM er den eneste codec som forbliver aktiveret.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Nogle fonte og ikoner vil mÃ¥ske vises forkert.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontfiler som kommer fra websteder, er blokeret.">
 <!ENTITY torbutton.prefs.sec_custom "Brugervalgte vÃ¦rdier:">
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 99ef7ba..5e4b0e3 100644
--- a/de/torbutton.dtd
+++ b/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/dz/torbutton.dtd b/dz/torbutton.dtd
index 32c680f..12364fc 100644
--- a/dz/torbutton.dtd
+++ b/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,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 "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 "(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/el/torbutton.dtd b/el/torbutton.dtd
index aeffbeb..0172360 100644
--- a/el/torbutton.dtd
+++ b/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,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 Î³Î¹Î± Î±Ï…Ï„Î®Î½ Ï„Î·Î½ Î¹ÏƒÏ„Î¿ÏƒÎµÎ»Î¯Î´Î±">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!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 "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Î”Î¹ÎºÏ„ÏÎ¿Ï… 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 "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± 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.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 "Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï‡ÏÎ®ÏƒÎ·Ï‚ Î»Î±Î½Î¸Î¬Î½Î¿Ï…ÏƒÎ±Ï‚ Î´Î¯ÏƒÎºÎ¿Ï… ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±Ï‚ (Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ)">
-<!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 "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 "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î±Ï‚ 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 "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 "Î”Î¹Î±Ï†Î±Î½Î®Ï‚ Torification  (Î‘Ï€Î±Î¹Ï„ÎµÎ¯ Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿  proxy Î® 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/en/torbutton.dtd b/en/torbutton.dtd
index 32c680f..12364fc 100644
--- a/en/torbutton.dtd
+++ b/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 "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 "(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/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index 3ce67ad..4dc53d9 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/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 "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 "(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/eo/torbutton.dtd b/eo/torbutton.dtd
index 0d81091..2e03847 100644
--- a/eo/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -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 "A">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!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 "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 "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.privacy_security_settings "Agordoj de privateco kaj sekureco">
-<!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 "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 "(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 "Agordoj de privateco">
 <!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 "Alta">
 <!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 "Propraj valoroj">
diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index 15c355e..31e2aca 100644
--- a/es/torbutton.dtd
+++ b/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/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 93cb563..cd1e4e1 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferencias de Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Configuraciones del Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuraciÃ³n recomendada del proxy 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 "Use las configuraciones proxy a medida
 
@@ -12,14 +10,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!ENTITY torbutton.about.title "Acerca de Torbutton">
-<!ENTITY torbutton.about.version "VersiÃ³n:">
-<!ENTITY torbutton.about.summary "Protege tu privacidad al navegar con Tor">
-<!ENTITY torbutton.about.code "Colaboradores de CÃ³digo:">
-<!ENTITY torbutton.about.maintainer "Mantenedor:">
-<!ENTITY torbutton.about.security_review "Revisiones de seguridad:">
-<!ENTITY torbutton.about.donate "Si te gusta Tor, podes considerar">
-<!ENTITY torbutton.about.make_donation "hacer una donaciÃ³n.">
 <!ENTITY torbutton.pref_connection.notice "Deshabilita Torbutton para cambiar estas configuraciones.">
 <!ENTITY torbutton.pref_connection.more_info "Mas informaciÃ³n">
 <!ENTITY torbutton.pref_connection_more_info.title "Ayuda">
@@ -28,101 +18,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 "Alternar el estado de Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Opciones 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 "Un">
 <!ENTITY torbutton.context_menu.networksettings "Configuraciones de la red Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Verificar actualizaciones para el Navegador de Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Proteccion de Cookie">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar URL de Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir URL Tor en una nueva pestaÃ±a">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL Tor en una nueva ventana">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clic para iniciar Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Opciones de Privacidad y Seguridad">
-<!ENTITY torbutton.prefs.block_thread "Bloquear la lectura del historial cuando Tor este activado (Crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquar el registro del historial mientras Tor este activado (Recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear la lectura del historial cuando Tor este desactivado (Opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquar el registro del historial mientras Tor este desactivado (Opcional)">
-<!ENTITY torbutton.prefs.clear_history "Vaciar el historial cuando active/desactive Tor (Opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear el cache de disco en Tor y vaciar todas los cache cuando se active/desactive Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquar el acceso a disco y memoria cuando Tor este activado">
-<!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies de sitios visitados sin Tor en un Jar protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Usar el dialogo de Proteccion de Cookies para elegir ">
-<!ENTITY torbutton.prefs.mmm_cookies "Voy a manejar manualmente mis cookies (Peligroso)">
-<!ENTITY torbutton.prefs.clear_cookies "Eliminar coockies cuando active/desactive Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Deshabilitar plugins cuando Tor este activado (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 "Historial">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Apagar">
-<!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 "Cabeceras">
-<!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 "No-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 "Puesta en marcha">
-<!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 "Restablecer valores por defecto">
 <!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 "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 "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -134,17 +45,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 "(recomendado)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!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)">
@@ -178,8 +78,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/es_CL/torbutton.dtd b/es_CL/torbutton.dtd
index d1feba5..12364fc 100644
--- a/es_CL/torbutton.dtd
+++ b/es_CL/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferencias de TorButton">
 <!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 "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 "(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/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 195e9fa..3ac30e7 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Configuraciones de proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuracion de proxy recomendada para mi version de 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 "Ayuda">
@@ -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 "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 "(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/es_MX/torbutton.dtd b/es_MX/torbutton.dtd
index 1591ea0..a8bd5be 100644
--- a/es_MX/torbutton.dtd
+++ b/es_MX/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 recomendada del proxy 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 personalizada del proxy.">
 <!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 "Puerto:">
-<!ENTITY torbutton.about.title "Acerca de Torbutton">
-<!ENTITY torbutton.about.version "VersiÃ³n:">
-<!ENTITY torbutton.about.summary "Protege la privacidad de tu navegaciÃ³n en Tor.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "RevisiÃ³n de seguridad:">
-<!ENTITY torbutton.about.donate "Si te gusta usar Tor, podrÃas considerar">
-<!ENTITY torbutton.about.make_donation "hacer una donaciÃ³n.">
 <!ENTITY torbutton.pref_connection.notice "Deshabilita Torbutton para cambiar esos ajustes.">
 <!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 "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 "Acerca de Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "G">
 <!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 "Restaurar 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 "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 "(recomendado)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
-<!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/et/torbutton.dtd b/et/torbutton.dtd
index 5b3b1ba..1cc89d2 100644
--- a/et/torbutton.dtd
+++ b/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,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 "f">
-<!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 "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 "(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.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/eu/torbutton.dtd b/eu/torbutton.dtd
index 43b5a18..a8b1aa2 100644
--- a/eu/torbutton.dtd
+++ b/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/fa/torbutton.dtd b/fa/torbutton.dtd
index 23864a3..f8a5ae7 100644
--- a/fa/torbutton.dtd
+++ b/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/fi/torbutton.dtd b/fi/torbutton.dtd
index 2c9ab25..2139841 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton-asetukset">
 <!ENTITY torbutton.prefs.tor_settings "VÃ¤lityspalvelinasetukset">
 <!ENTITY torbutton.prefs.recommended_settings "KÃ¤ytÃ¤ suositeltuja vÃ¤lityspalvelinasetuksia Firefox-versiolleni.">
-<!ENTITY torbutton.prefs.use_privoxy "KÃ¤ytÃ¤ vÃ¤lityspalvelinta">
 <!ENTITY torbutton.prefs.use_polipo "KÃ¤ytÃ¤ Polipo-vÃ¤lityspalvelinta">
 <!ENTITY torbutton.prefs.custom_settings "Aseta omat vÃ¤lityspalvelinasetukset">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-vÃ¤lityspalvelin:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-vÃ¤lityspalvelin:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-verkkotietokone:">
 <!ENTITY torbutton.prefs.proxy.port "Portti:">
-<!ENTITY torbutton.about.title "Tietoja Torbutton-painikkeesta">
-<!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 Tor-sovelluksesta, sinun on mahdollista">
-<!ENTITY torbutton.about.make_donation "antaa lahjoitus.">
 <!ENTITY torbutton.pref_connection.notice "Poista Torbutton kÃ¤ytÃ¶stÃ¤ muuttaaksesi nÃ¤itÃ¤ asetuksia.">
 <!ENTITY torbutton.pref_connection.more_info "LisÃ¤tietoja">
 <!ENTITY torbutton.pref_connection_more_info.title "Auta">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Uusi Tor-kiertotie tÃ¤lle sivustolle">
 <!ENTITY torbutton.context_menu.new_circuit_key "E">
-<!ENTITY torbutton.context_menu.toggle "Vaihda Tor-tila">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Yksityisyys- ja turva-asetukset...">
 <!ENTITY torbutton.context_menu.preferences.key "Y">
-<!ENTITY torbutton.context_menu.about "Tietoja Torbutton-painikkeesta...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor-verkkoasetukset...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tarkista Tor-selainpÃ¤ivitys...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "L">
 <!ENTITY torbutton.context_menu.cookieProtections "EvÃ¤stesuojelemiset...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "E">
-<!ENTITY torbutton.context_menu.copyTor "Kopioi Tor-verkko-osoite">
-<!ENTITY torbutton.context_menu.copyTor.key "K">
-<!ENTITY torbutton.context_menu.openTorTab "Avaa Tor-verkko-osoite uuteen vÃ¤lilehteen">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Avaa Tor-verkko-osoite uuteen ikkunaan">
-<!ENTITY torbutton.context_menu.openTorWindow.key "u">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Napsauta Torbutton-painikkeen alustamiseksi">
 <!ENTITY torbutton.prefs.privacy_security_settings "Yksityisyys- ja turva-asetukset">
-<!ENTITY torbutton.prefs.block_thread "EstÃ¤ historiatietojen lukeminen Tor-sovelluksen ollessa kÃ¤ytÃ¶ssÃ¤ (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.block_thwrite "EstÃ¤ historiatietojen tallentaminen Tor-sovelluksen ollessa kÃ¤ytÃ¶ssÃ¤ (suositeltua)">
-<!ENTITY torbutton.prefs.block_nthread "EstÃ¤ historiatietojen lukeminen Tor-sovelluksen ollessa pois kÃ¤ytÃ¶stÃ¤ (valinnaista)">
-<!ENTITY torbutton.prefs.block_nthwrite "EstÃ¤ historiatietojen tallentaminen Tor-sovelluksen 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Ã¤ levylle ja muistin vÃ¤limuistiin pÃ¤Ã¤sy Tor-sovelluksen ollessa kÃ¤ytÃ¶ssÃ¤">
-<!ENTITY torbutton.prefs.cookie_jars "Tallenna evÃ¤steet suojatussa sÃ¤iliÃ¶ssÃ¤, kun Tor ei ole kÃ¤ytÃ¶ssÃ¤">
-<!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 liitÃ¤nnÃ¤iset toiminnasta Tor-sovelluksen ollessa kÃ¤ytÃ¶ssÃ¤ (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.kill_bad_js "LiitÃ¤ vaarallinen javascript (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.isolate_content "EristÃ¤ dynaaminen sisÃ¤ltÃ¶ Tor-tilaan (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.no_updates "EstÃ¤ pÃ¤ivitykset Tor-sovelluksen ollessa kÃ¤ytÃ¶ssÃ¤">
-<!ENTITY torbutton.prefs.set_uagent "Aseta asiakas Tor-kÃ¤yttÃ¶lle (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 "Ota pois kÃ¤ytÃ¶stÃ¤ istuntotallennus (suositeltavaa)">
-<!ENTITY torbutton.prefs.headers "Otsakkeet">
-<!ENTITY torbutton.prefs.refererspoofing "Referer-tunnisteen vÃ¤Ã¤rentÃ¤minen">
-<!ENTITY torbutton.prefs.spoofblank "VÃ¤Ã¤rennÃ¤ blank referer-tunniste Tor-kÃ¤ytÃ¶n aikana (voi rikkoa joitakin sivustoja)">
-<!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 "Ei referer-tunnisteen vÃ¤Ã¤rentÃ¤mistÃ¤ Tor-kÃ¤ytÃ¶n aikana (lÃ¤hettÃ¤Ã¤ referer-tunnisteet normaalina)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ota pois kÃ¤ytÃ¶stÃ¤ DOM-sÃ¤ilytys Tor-kÃ¤ytÃ¶n aikana (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 istuntoa kÃ¤ynnistyksen yhteydessÃ¤, aseta Tor-tilaksi:">
-<!ENTITY torbutton.prefs.startup_tor "Kun selain kÃ¤ynnistyy, aseta Tor-tilaksi:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Lataa evÃ¤stesÃ¤iliÃ¶ uudelleen/poista evÃ¤steet kun Firefox kaatuu (suositeltava)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tallenna sekÃ¤ Tor- ettÃ¤ Ei-Tor-evÃ¤steet suojattuihin jar-tiedostoihin (vaarallista)">
-<!ENTITY torbutton.prefs.clear_http_auth "Poista HTTP-todennetut istunnot (suositeltava)">
-<!ENTITY torbutton.prefs.block_js_history "EristÃ¤ pÃ¤Ã¤sy historiaselailuun Tor-tilassa (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Muuta ikkunoiden kokoa 50 pikselin vÃ¤lein Tor-kÃ¤ytÃ¶n aikana (suositeltavaa)">
-<!ENTITY torbutton.prefs.close_tor "Sulje kaikki Tor-ikkunat ja -vÃ¤lilehdet Tor-tilaa vaihdettaessa (valinnainen)">
-<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki Ei-Tor-ikkunat ja -vÃ¤lilehdet Tor-tilaa vaihdettaessa (valinnainen)">
-<!ENTITY torbutton.prefs.block_links "EstÃ¤ linkkinapsautukset ja sivujen uudelleenlataukset eri Tor-tilojen vÃ¤lillÃ¤ (valinnainen)">
-<!ENTITY torbutton.prefs.jar_certs "Tallenna SSL-varmenteet eri sÃ¤iliÃ¶ihin Tor- ja Ei-Tor-tiloja varten (suositeltavaa) ">
-<!ENTITY torbutton.prefs.jar_ca_certs "Tallenna CA-varmenteet eri sÃ¤iliÃ¶ihin Tor- ja Ei-Tor-tiloja varten (suositeltavaa)">
-<!ENTITY torbutton.prefs.locked_mode "Ota pois kÃ¤ytÃ¶stÃ¤ Tor-painike ja pikanÃ¤ppÃ¤imet estÃ¤Ã¤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 verkkoon file://-verkko-osoitteista (suositeltu)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Jos Tor ei ole kÃ¤ytÃ¶ssÃ¤, estÃ¤ pÃ¤Ã¤sy verkkoon file://-verkko-osoitteista">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta oletukset">
 <!ENTITY torbutton.prefs.test_settings "Testausasetukset">
-<!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 "Ota pois kÃ¤ytÃ¶stÃ¤ livemarks-kirjanmerkkipÃ¤ivityksett Tor-kÃ¤ytÃ¶n aikana">
-<!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 istunnonvaraston tallentaa 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-vÃ¤Ã¤rennysvalitsimet">
-<!ENTITY torbutton.prefs.nospoof "Ei referer-tunnisteen vÃ¤Ã¤rentÃ¤mistÃ¤ Tor-kÃ¤ytÃ¶n aikana (lÃ¤hettÃ¤Ã¤ referer-tunnisteet normaalina)">
-<!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Ã¤ blank referer-tunniste Tor-kÃ¤ytÃ¶n aikana (voi rikkoa joitakin sivustoja)">
 <!ENTITY torbutton.cookiedialog.title "Hallitse evÃ¤steiden suojauksia">
 <!ENTITY torbutton.cookiedialog.lockCol "Suojattu">
 <!ENTITY torbutton.cookiedialog.domainCol "Palvelin">
@@ -132,17 +43,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 "Ota pois kÃ¤ytÃ¶stÃ¤ livemarks-kirjanmerkkipÃ¤ivityksett Tor-kÃ¤ytÃ¶n aikana">
-<!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-sovelluksen kautta">
-<!ENTITY torbutton.prefs.dodge_google_captcha "KÃ¤ytÃ¤ automaattisesti vaihtoehtoista hakukonetta, jos Google kysyy Captcha-koodia:">
-<!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Ã¤ Tor-sovellusta lÃ¤pinÃ¤kyvÃ¤sti (edellyttÃ¤Ã¤ mukautetun transproxyn tai Tor-reitittimen kÃ¤yttÃ¶Ã¤)">
 <!ENTITY torbutton.prefs.priv_caption "Yksityisyysasetukset">
 <!ENTITY torbutton.prefs.block_disk "Ã„lÃ¤ sÃ¤ilytÃ¤ selaushistoriaa tai verkkosivuston tietoja (kÃ¤ynnistÃ¤Ã¤ yksityisen selauksen)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript voidaan ottaa kÃ¤yttÃ¶Ã¶n sivustokohtaisesti NoScript-tyÃ¶kalupalkkipainikkeen kautta.">
 <!ENTITY torbutton.prefs.sec_high "Korkea">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript on oletuksena poissa kÃ¤ytÃ¶stÃ¤ kaikilla sivustoilla.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Useimmat audio- ja videomuodot ovat poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM on ainoa koodekki, joka jÃ¤Ã¤ kÃ¤yttÃ¶Ã¶n.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Jotkut kirjasimet ja kuvakkeet voivat nÃ¤kyÃ¤ virheellisesti.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webbisivuston tarjoamat kirjasintiedostot on estetty.">
 <!ENTITY torbutton.prefs.sec_custom "Omat arvot">
diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd
index bd2d925..caad6be 100644
--- a/fil/torbutton.dtd
+++ b/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 "Gamitin ang 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 "Mga Setting na Pang-Pribado at Seguridad">
-<!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 "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 "(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 "Mga Setting na Pang-Pribado">
 <!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 "Mataas">
 <!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 na Halaga">
diff --git a/fo/torbutton.dtd b/fo/torbutton.dtd
index acae6d1..c228d1d 100644
--- a/fo/torbutton.dtd
+++ b/fo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Stillingar fyri TorknÃ¸ttin">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-stillingar">
 <!ENTITY torbutton.prefs.recommended_settings "BrÃºka viÃ°mÃ¦ldu proxy-stillingar til mÃna ÃºtgÃ¡vu av Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "BrÃºka Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "BrÃºka Polipo">
 <!ENTITY torbutton.prefs.custom_settings "BrÃºka tillagaÃ°ar proxy-stillingar">
 <!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 vertur:">
 <!ENTITY torbutton.prefs.proxy.port "Portur:">
-<!ENTITY torbutton.about.title "Um TorknÃ¸ttin">
-<!ENTITY torbutton.about.version "ÃštgÃ¡va:">
-<!ENTITY torbutton.about.summary "Verjir persÃ³nligar upplÃ½singar, tÃ¡ iÃ° tÃº reikar viÃ° Tor-kaganum.">
-<!ENTITY torbutton.about.code "Kotuveitarar:">
-<!ENTITY torbutton.about.maintainer "RÃ¸ktarar:">
-<!ENTITY torbutton.about.security_review "TrygdarummÃ¦li:">
-<!ENTITY torbutton.about.donate "DÃ¡mar tÃ¦r at brÃºka Tor, Ã¡tti tÃº at roynt">
-<!ENTITY torbutton.about.make_donation "latiÃ° eitt oyra.">
 <!ENTITY torbutton.pref_connection.notice "Ã“gilda TorknÃ¸ttin fyri at broya hesar stillingar.">
 <!ENTITY torbutton.pref_connection.more_info "Meira upplÃ½singar">
 <!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 "New Tor Circuit for this Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "Ã°">
-<!ENTITY torbutton.context_menu.toggle "Broyt stÃ¸Ã°u Ã¡ Tor">
-<!ENTITY torbutton.context_menu.toggle.key "B">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "S">
-<!ENTITY torbutton.context_menu.about "Um TorknÃ¸ttin...">
-<!ENTITY torbutton.context_menu.about.key "U">
 <!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "L">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ€¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "T">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Avrita Tor-URL">
-<!ENTITY torbutton.context_menu.copyTor.key "s">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Lat upp Tor-URL Ã nÃ½ggjum kaga">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "TorknÃ¸ttur">
 <!ENTITY torbutton.button.tooltip "TrÃ½st fyri at lesa TorknÃ¸ttin inn">
 <!ENTITY torbutton.prefs.privacy_security_settings "Stillingar fyri trygd og privatar upplÃ½singar">
-<!ENTITY torbutton.prefs.block_thread "ForÃ°a afturlitslesing, meÃ°an Tor koyrir (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.block_thwrite "ForÃ°a afturlitsskriving, meÃ°an Tor koyrir (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.block_nthread "ForÃ°a afturlitsskriving, tÃ¡ iÃ° annaÃ° enn Tor koyrir (valfrÃtt)">
-<!ENTITY torbutton.prefs.block_nthwrite "ForÃ°a afturlitsskriving, tÃ¡ iÃ° annaÃ° enn Tor koyrir (valfrÃtt)">
-<!ENTITY torbutton.prefs.clear_history "Rudda afturlit, tÃ¡ iÃ° Tor er frÃ¡ (valfrÃtt)">
-<!ENTITY torbutton.prefs.clear_cache "ForÃ°a diskkova frÃ¡ Tor og rudda kovan, tÃ¡ iÃ° Tor er frÃ¡">
-<!ENTITY torbutton.prefs.block_cache "ForÃ°a atgongd til minnis- og diskkova, meÃ°an Tor koyrir">
-<!ENTITY torbutton.prefs.cookie_jars "Goym cookies frÃ¡ Ã¸Ã°rum enn Tor Ã smogu fyri seg">
-<!ENTITY torbutton.prefs.cookie_protection "BrÃºka verndarsamrÃ¸Ã°una fyri cookies til at velja">
-<!ENTITY torbutton.prefs.mmm_cookies "Eg skipi sjÃ¡lv/ur mÃnar cookies (vandamikiÃ°)">
-<!ENTITY torbutton.prefs.clear_cookies "Rudda cookies, tÃ¡ iÃ° Tor er frÃ¡">
-<!ENTITY torbutton.prefs.disable_plugins "Ã“gilda inntak, meÃ°an Tor er Ã nÃ½tlsu (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.kill_bad_js "KrÃ¸k fast vandamikiÃ° javascript (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.isolate_content "Skil frÃ¡ dynamiskt innihald til Tor-stÃ¸Ã°u (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.no_updates "Ã“gilda dagfÃ¸ringar, meÃ°an Tor er Ã nÃ½tslu">
-<!ENTITY torbutton.prefs.set_uagent "Set brÃºkaravegleiÃ°ing til Tor-nÃ½tslu (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.dynamic "Dynamiskt innihald">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Kovi">
-<!ENTITY torbutton.prefs.history "Afturlit">
-<!ENTITY torbutton.prefs.no_search "Ã“gilda viÃ°mÃ¦lda leiting, meÃ°an Tor er koyrir (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.shutdown "SlÃ¸kk">
-<!ENTITY torbutton.prefs.tor_shutdown "Rudda cookies frÃ¡ Tor, meÃ°an Tor-kagi verÃ°ur slÃ¸ktur">
-<!ENTITY torbutton.prefs.all_shutdown "Rudda cookies, tÃ¡ iÃ° einhvÃ¸r kagi verÃ°ur slÃ¸ktur">
-<!ENTITY torbutton.prefs.no_shutdown "Rudda ikki mÃnar cookies, tÃ¡ iÃ° slÃ¸kt verÃ°ur">
-<!ENTITY torbutton.prefs.disable_sessionstore "Goym ikki setur (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.headers "TeksthÃ¸vd">
-<!ENTITY torbutton.prefs.refererspoofing "Lumpa HTTP-tilvÃsing">
-<!ENTITY torbutton.prefs.spoofblank "Lumpa HTTP-tilvÃsing, tÃ¡ iÃ° Tor er Ã nÃ½tslu (riggar kanska ikki til allar sÃÃ°ur)">
-<!ENTITY torbutton.prefs.smartspoof "Lumpa HTTP-tilvÃsing snildliga, tÃ¡ iÃ° Tor er Ã nÃ½tslu (lumpar tvÃ¸rtur um umdÃ¸mi Ã¡ HTTP-tilvÃsing)">
-<!ENTITY torbutton.prefs.nospoof "Lumpa ikki HTTP-tilvÃsing, meÃ°an Tor er Ã nÃ½tslu (sendir HTTP-tilvÃsing sum vanligt)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ã“gilda DOM-goymslu, meÃ°an Tor er Ã nÃ½tslu (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.forms "Formar">
-<!ENTITY torbutton.prefs.block_tforms "Goym ikki loyniorÃ°+form, meÃ°an Tor koyrir (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.block_ntforms "Goym ikki loyniorÃ°+form, tÃ¡ iÃ° Tor ikki koyrir (valfrÃtt)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "AnnaÃ° enn Tor">
-<!ENTITY torbutton.prefs.restore_tor "TÃ¡ iÃ° setan er endurstillaÃ° viÃ° byrjan, set tÃ¡ Tor-stÃ¸Ã°una til:">
-<!ENTITY torbutton.prefs.startup_tor "TÃ¡ iÃ° kagin startar, set tÃ¡ Tor-stÃ¸Ã°una til:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Endurles cookie-smogu/rudda cookies, tÃ¡ iÃ° Firefox frystir (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Goym cookies fyri Tor o.a. Ã vardum smogum (vandamikiÃ°)">
-<!ENTITY torbutton.prefs.clear_http_auth "Rudda HTTP auth-setur (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.block_js_history "Skil atgongd frÃ¡ Ã afturlitsleiting til Tor-stÃ¸Ã°una (umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Umskapa gluggar til fleiri smÃ¡ar Ã¡ 50px, meÃ°an Tor er Ã nÃ½tslu (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.close_tor "Lat aftur allar Tor-gluggar og teigar, tÃ¡ sligiÃ° verÃ°ur frÃ¡ (valfrÃtt)">
-<!ENTITY torbutton.prefs.close_nontor "Lat aftur allar gluggar og teigar, sum ikki hava viÃ° Tor at gera, tÃ¡ sligiÃ° verÃ°ur frÃ¡ (valfrÃtt)">
-<!ENTITY torbutton.prefs.block_links "ForÃ°a fyri at leinki kunnu latast upp og sÃÃ°ur endurlesast frÃ¡ ymsum Tor-stÃ¸Ã°um (valfrÃtt)">
-<!ENTITY torbutton.prefs.jar_certs "Goym SSL-vÃ¡ttan Ã smogum fyri seg fyri Tor o.a. (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Goym CA-vÃ¡ttan Ã smogum fyri seg fyri Tor o.a. (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.locked_mode "Ã“gilda knÃ¸tt og snarleiÃ°is, so tÃº ikki viÃ° Ã³vart kemur at tendra nakaÃ°">
-<!ENTITY torbutton.prefs.startup_state "Eftir vanligum starti, set Tor-stÃ¸Ã°u til:">
-<!ENTITY torbutton.prefs.shutdown_state "SlÃ¸kkistÃ¸Ã°a">
-<!ENTITY torbutton.prefs.startup "StartstÃ¸Ã°a">
-<!ENTITY torbutton.prefs.block_tor_file_net "ForÃ°a Tor atgongd til netiÃ° frÃ¡ file:// url-um (viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "ForÃ°a Ã¸Ã°rum enn Tor atgongd til netiÃ° frÃ¡ file:// url-um">
 <!ENTITY torbutton.prefs.restore_defaults "Nullstilla ">
 <!ENTITY torbutton.prefs.test_settings "Royndarstillingar">
-<!ENTITY torbutton.prefs.test_auto "Royn mÃnar Tor-stillingar, aftan Ã¡ eg fyrstu ferÃ° starti Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Ã“gilda livemarks dagfÃ¸ringar, meÃ°an Tor er Ã nÃ½tslu">
-<!ENTITY torbutton.prefs.tor_memory_jar "Skriva ikki Tor-cookies til diskin">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Skriva ikki cookies frÃ¡ Ã¸Ã°rum til diskin">
-<!ENTITY torbutton.prefs.session_restore "Goym setur og endurstovna teigarnar:">
-<!ENTITY torbutton.prefs.nontor_tabs "Teigar lisnir inn av Ã¸Ã°rum enn Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Teigar lisnir inn Ã Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ongar proxy fyri: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ãvaring: BrÃºka ikki vertsnÃ¸vnini omanfyri">
-<!ENTITY torbutton.prefs.spoofreresh "Endurskapa og lumpa">
-<!ENTITY torbutton.prefs.refereroptions "Stillingar fyri at lumpa HTTP-tilvÃsing">
-<!ENTITY torbutton.prefs.nospoof "Lumpa ikki HTTP-tilvÃsing, meÃ°an Tor er Ã nÃ½tslu (sendir HTTP-tilvÃsing sum vanligt)">
-<!ENTITY torbutton.prefs.spoofroot "Lumpa mappur Ã hesari sÃÃ°u">
-<!ENTITY torbutton.prefs.spoofdomain "Lumpa umdÃ¸mi viÃ° HTTP-tilvÃsing">
-<!ENTITY torbutton.prefs.spoofblank "Lumpa HTTP-tilvÃsing, tÃ¡ iÃ° Tor er Ã nÃ½tslu (riggar kanska ikki til allar sÃÃ°ur)">
 <!ENTITY torbutton.cookiedialog.title "Skipa cookie-vernd">
 <!ENTITY torbutton.cookiedialog.lockCol "Vard/ur">
 <!ENTITY torbutton.cookiedialog.domainCol "Vertur">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Stika allar cookies uttan tÃ¦r vardu">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Verj nÃ½ggjar cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Verj ikki nÃ½ggjar cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Ã“gilda livemarks dagfÃ¸ringar, meÃ°an Tor er Ã nÃ½tslu">
-<!ENTITY torbutton.prefs.dtd_recommended "(viÃ°mÃ¦lt)">
-<!ENTITY torbutton.prefs.dtd_optional "(valfrÃtt)">
-<!ENTITY torbutton.prefs.dtd_crucial "(umrÃ¡Ã°andi)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Umstilla dagfÃ¸ringar av TorknÃ¸ttinum ÃgjÃ¸gnum Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "BrÃºka altÃÃ° aÃ°rar leitingar sjÃ¡lvvirkandi, tÃ¡ iÃ° tÃº fÃ¦st viÃ° 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 "GjÃ¸gnumskygd TorifikatiÃ³n (Krevur tillagaÃ° transproxy ella Tor beinara)">
 <!ENTITY torbutton.prefs.priv_caption "Privatir stilligar">
 <!ENTITY torbutton.prefs.block_disk "Goym ikki afturlit ella vevdÃ¡tu frÃ¡ kaga (gildar privata reiking)">
@@ -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 "HÃ¸gt">
 <!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 "TillagaÃ° virÃ°i">
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index ddc9137..b08a854 100644
--- a/fr/torbutton.dtd
+++ b/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/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index bb3037f..9855a8e 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PrÃ©fÃ©rences de BoutonTor">
 <!ENTITY torbutton.prefs.tor_settings "ParamÃ¨tres du mandataire">
 <!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramÃ¨tres de mandataire 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 mandataire personnalisÃ©s">
 <!ENTITY torbutton.prefs.proxy.host.http "Mandataire HTTP :">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Mandataire Gopher :">
 <!ENTITY torbutton.prefs.proxy.host.socks "HÃ´te SOCKS :">
 <!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.about.title "Ã€ propos de BoutonTor">
-<!ENTITY torbutton.about.version "Version :">
-<!ENTITY torbutton.about.summary "ProtÃ¨ge la confidentiallitÃ© de votre navigation avec Tor.">
-<!ENTITY torbutton.about.code "Contributeurs au code :">
-<!ENTITY torbutton.about.maintainer "Mainteneur :">
-<!ENTITY torbutton.about.security_review "Critique de sÃ©curitÃ© :">
-<!ENTITY torbutton.about.donate "Si vous aimez utiliser Tor, vous pourriez considÃ©rer">
-<!ENTITY torbutton.about.make_donation "faire une donation.">
 <!ENTITY torbutton.pref_connection.notice "DÃ©sactiver BoutonTor pour changer 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 l'Ã©tat de 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 "S">
-<!ENTITY torbutton.context_menu.about "Ã€ propos de BoutonTor...">
-<!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 mÃ j. du navigateur Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Protections des tÃ©moins...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "T">
-<!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 "BoutonTor">
 <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor">
 <!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 (crucial)">
-<!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 (optionnel)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquer l'Ã©criture Ã  l'historique en mode non-Tor (optionnel)">
-<!ENTITY torbutton.prefs.clear_history "Vider l'historique Ã  l'activation/dÃ©sactivation de Tor (optionnel)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquer le cache-disque Tor et vider tous les caches Ã  l'activation/dÃ©sactivation de Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquer l'accÃ¨s au cache-disque et au cache-mÃ©moire pendant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Conserver les tÃ©moins non-Tor dans un contenant sÃ©curisÃ©">
-<!ENTITY torbutton.prefs.cookie_protection "Choisir dans le dialogue des protections des tÃ©moins">
-<!ENTITY torbutton.prefs.mmm_cookies "Je gÃ©rerai mes tÃ©moins manuellement (dangereux)">
-<!ENTITY torbutton.prefs.clear_cookies "Vider les tÃ©moins Ã  l'activation/dÃ©sactivation de Tor">
-<!ENTITY torbutton.prefs.disable_plugins "DÃ©sactiver les plugiciels pendant l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Intercepter les javascripts dangereux (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isoler le contenu dynamique lorsque Tor fonctionne (crucial)">
-<!ENTITY torbutton.prefs.no_updates "DÃ©sactiver les mises Ã  jour durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.set_uagent "DÃ©finir l'agent d'utilisateur pour l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Contenu dynamique">
-<!ENTITY torbutton.prefs.cookies "TÃ©moins">
-<!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 tÃ©moins Tor lors de l'arrÃªt du navigateur torisÃ©">
-<!ENTITY torbutton.prefs.all_shutdown "Vider les tÃ©moins Ã  chaque fermeture du navigateur">
-<!ENTITY torbutton.prefs.no_shutdown "Ne pas vider mes tÃ©moins Ã  la fermeture">
-<!ENTITY torbutton.prefs.disable_sessionstore "DÃ©sactiver la sauvegarde de session (recommandÃ©)">
-<!ENTITY torbutton.prefs.headers "EntÃªtes">
-<!ENTITY torbutton.prefs.refererspoofing "DÃ©guisement du rÃ©fÃ©rent">
-<!ENTITY torbutton.prefs.spoofblank "Imiter un rÃ©fÃ©rent vide durant l'utilisation de Tor (peut briser certains sites)">
-<!ENTITY torbutton.prefs.smartspoof "Imitation intelligente du rÃ©fÃ©rent lorsque Tor est actif (imite les rÃ©fÃ©rents Ã  domaines croisÃ©s)">
-<!ENTITY torbutton.prefs.nospoof "Pas d'imitation de rÃ©fÃ©rent durant l'utilisation de Tor (envoi des rÃ©fÃ©rents normaux)">
-<!ENTITY torbutton.prefs.disable_domstorage "DÃ©sactiver l'entreposage 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 (optionnel)">
-<!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 du navigateur, mettre Tor dans l'Ã©tat :">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recharger le contenant Ã  tÃ©moins/supprimer les tÃ©moins lors d'un plantage de Firefox (recommandÃ©)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Entreposer les tÃ©moins Tor et non-Tor dans des contenants Ã  tÃ©moins sÃ©curisÃ©s (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 Ã  l'Ã©tat Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner les fenÃªtres en un multiple de 50 px lors de l'utilisation de Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenÃªtres et onglets Ã  l'activation/dÃ©sactivation (optionnel)">
-<!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 clics de lien et le rechargement des pages dans les diffÃ©rents Ã©tats de Tor (optionnel)">
-<!ENTITY torbutton.prefs.jar_certs "Entreposer les certificats SSL dans des contenants sÃ©parÃ©s poir Tor/Non-Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Entreposer les certificats CA dans des contenants sÃ©parÃ©s pour Tor/Non-Tor (recommandÃ©)">
-<!ENTITY torbutton.prefs.locked_mode "DÃ©sactiver le bouton et les raccourcis pour Ã©viter une activation/dÃ©sactivation accidentelle">
-<!ENTITY torbutton.prefs.startup_state "Lors d'un dÃ©marrage normal, dÃ©finir l'Ã©tat de Tor Ã  :">
-<!ENTITY torbutton.prefs.shutdown_state "Ã‰tat Ã©teint">
-<!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 pour chaque dÃ©marrage de Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "DÃ©activer les mises Ã  jour Â« livemarks Â» durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne pas Ã©crire les tÃ©moins de Tor sur le disque">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne pas Ã©crire les tÃ©moins non-Tor sur le disque">
-<!ENTITY torbutton.prefs.session_restore "Permettre Ã  la session de sauvegarder et de 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 "Aucun mandataire pour : ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Avertissement : Ã©vitez d'utiliser les noms d'hÃ´tes ci-dessus">
-<!ENTITY torbutton.prefs.spoofreresh "RafraÃ®chir l'imitation">
-<!ENTITY torbutton.prefs.refereroptions "Options de dÃ©guisement du rÃ©fÃ©rent">
-<!ENTITY torbutton.prefs.nospoof "Pas d'imitation de rÃ©fÃ©rent durant l'utilisation de Tor (envoi des rÃ©fÃ©rents normaux)">
-<!ENTITY torbutton.prefs.spoofroot "Imiter le dossier contenant la page">
-<!ENTITY torbutton.prefs.spoofdomain "Imiter le domaine comme rÃ©fÃ©rent">
-<!ENTITY torbutton.prefs.spoofblank "Imiter un rÃ©fÃ©rent vide durant l'utilisation de Tor (peut briser certains sites)">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections des tÃ©moins">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ´te">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Enlever tous les tÃ©moins non protÃ©gÃ©s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux tÃ©moins">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux tÃ©moins">
-<!ENTITY torbutton.prefs.disable_livemarks "DÃ©activer les mises Ã  jour Â« livemarks Â» durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommandÃ©)">
-<!ENTITY torbutton.prefs.dtd_optional "(optionnel)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "RÃ©acheminer les mises Ã  jour de BoutonTor par 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 (exige un transmandataire personnalisÃ© ou un routeur Tor)">
 <!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de confidentialitÃ©">
 <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites Web (active le mode de navigation privÃ©e)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut Ãªtre activÃ© par site avec le bouton NoScript de la barre d'outils">
 <!ENTITY torbutton.prefs.sec_high "Ã‰levÃ©">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut pour 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 Ã  Ãªtre encore activÃ©.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icÃ´nes pourraient ne pas s'afficher correctement.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquÃ©es.">
 <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisÃ©es">
diff --git a/fur/torbutton.dtd b/fur/torbutton.dtd
index 32c680f..12364fc 100644
--- a/fur/torbutton.dtd
+++ b/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,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 "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 "(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/fy/torbutton.dtd b/fy/torbutton.dtd
index 026f788..1ce3694 100644
--- a/fy/torbutton.dtd
+++ b/fy/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton foarkarren">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-ynstellingen">
 <!ENTITY torbutton.prefs.recommended_settings "De oanbefelle proxy-ynstellingen foar myn ferzje fan Firefox brÃ»ke">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy brÃ»ke">
 <!ENTITY torbutton.prefs.use_polipo "Polipo brÃ»ke">
 <!ENTITY torbutton.prefs.custom_settings "Oanpaste proxy-ynstellingen brÃ»ke">
 <!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 "Poarte:">
-<!ENTITY torbutton.about.title "Oer Torbutton">
-<!ENTITY torbutton.about.version "Ferzje:">
-<!ENTITY torbutton.about.summary "Befeiligd de privacy fan dyn Tor blÃªdzjen.">
-<!ENTITY torbutton.about.code "Code-bydragers:">
-<!ENTITY torbutton.about.maintainer "Behearder:">
-<!ENTITY torbutton.about.security_review "BefeiligingskontrÃ´le:">
-<!ENTITY torbutton.about.donate "As do graach Tor brÃ»kt, kinsto ek">
-<!ENTITY torbutton.about.make_donation "in donaasje meitsjen.">
 <!ENTITY torbutton.pref_connection.notice "Torbutton tsjinnet Ãºtskeakele te wurden om dizze ynstellingen te kinnen wizigjen.">
 <!ENTITY torbutton.pref_connection.more_info "Mear ynformaasje">
 <!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 "Tor-status wikseljen">
-<!ENTITY torbutton.context_menu.toggle.key "W">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "F">
-<!ENTITY torbutton.context_menu.about "Oer Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "O">
 <!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 "Kopiear 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- en befeiligingsynstellingen">
-<!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 "Dynamyske ynhÃ¢ld">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Skiednis">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Ofslute">
-<!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 "Formulieren">
-<!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 "net 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 ynstellingen">
-<!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 "Gjin proxies foar:">
 <!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 "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 "(oanbefelle)">
-<!ENTITY torbutton.prefs.dtd_optional "(opsjoneel)">
-<!ENTITY torbutton.prefs.dtd_crucial "(beskiedend)">
-<!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-ynstellingen">
 <!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 "Heech">
 <!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 "Oanpaste wearden">
diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd
index dd0bb2a..7cd0b52 100644
--- a/ga/torbutton.dtd
+++ b/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,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 "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 "(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 "Ard">
 <!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/gl/torbutton.dtd b/gl/torbutton.dtd
index 7f727af..695e53a 100644
--- a/gl/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -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 "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 "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 "(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 "Axustes de privacidade">
 <!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/gu/torbutton.dtd b/gu/torbutton.dtd
index b48521d..7ee03ee 100644
--- a/gu/torbutton.dtd
+++ b/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,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 "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 "àª®àª¦àª¦">
@@ -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 "àªŸà«‹àª° àª¸à«àª¥àª¿àª¤àª¿ àª¬àª¦àª²à«‹">
-<!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 "àªŸà«‹àª°àª¬àªŸàª¨ àªµàª¿àª¶à«‡...">
-<!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 "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.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 "àª¬àª¦àª²àª¾àª¤à«€ àªµàª¿àª—àª¤à«‹">
-<!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 "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 "(àª¸à«‚àªšàªµà«‡àª²)">
-<!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.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/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index a90c405..3101e10 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/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,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 "S">
 <!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 "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.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 "àªšàª•àª¾àª¸àª£à«€ àª—à«‹àª àªµàª£à«€àª“">
-<!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 "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 "(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 "àª…àª‚àª—àª¤àª¤àª¾ àª—à«‹àª àªµàª£à«€àª“">
 <!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/gun/torbutton.dtd b/gun/torbutton.dtd
index 32c680f..12364fc 100644
--- a/gun/torbutton.dtd
+++ b/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,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 "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 "(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/ha/torbutton.dtd b/ha/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ha/torbutton.dtd
+++ b/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,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 "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 "(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/he/torbutton.dtd b/he/torbutton.dtd
index 62ef24e..8ccf4cf 100644
--- a/he/torbutton.dtd
+++ b/he/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 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 "×¢×–×¨×”">
@@ -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...">
 <!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.privacy_security_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 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 "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 "×”×•×¨×“ ×¢×“×›×•× ×™× ×œ-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 "×”×¤×¢×œ×ª Tor ×‘×¦×•×¨×” ×‘×œ×ª×™ × ×¨××™×ª (×“×•×¨×©  transproxy ××• Tor router)">
 <!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/hi/torbutton.dtd b/hi/torbutton.dtd
index d641d75..fe2f6e2 100644
--- a/hi/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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 "à¤¸à¤‚à¤¸à¥à¤•à¤°à¤£:">
-<!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 "à¤¸à¤¹à¤¾à¤¯à¤¤à¤¾">
@@ -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 "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤•à¥‡ à¤¬à¤°à¥‡ à¤®à¥‡ ...">
-<!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 "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.privacy_security_settings "Privacy and Security 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 "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 "(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 "à¤à¤•à¤¾à¤‚à¤¤ à¤•à¥‡ à¤²à¤¿à¤ à¤ªà¤¤à¤¿à¤¸à¥à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤‚">
 <!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/hr/torbutton.dtd b/hr/torbutton.dtd
index ad18093..fffa55c 100644
--- a/hr/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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Ä‡">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor krug za ovu stranicu">
 <!ENTITY torbutton.context_menu.new_circuit_key "Z">
-<!ENTITY torbutton.context_menu.toggle "Promijeni Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "P">
 <!ENTITY torbutton.context_menu.preferences "Postavke Privatnosti i Sigurnosti...">
 <!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 "Tor MreÅ¾ne Postavke...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Provjeri Nadogradnje za Tor PretraÅ¾ivaÄ..">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita 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.privacy_security_settings "Postavke Privatnosti i Sigurnosti">
-<!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 "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 "(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 "Postavke Privatnosti">
 <!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 moÅ¾e biti omoguÄ‡en posebice za svaku stranicu putem gumba na NoScript alatnoj traci.">
 <!ENTITY torbutton.prefs.sec_high "Visoko">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je onemoguÄ‡en po zadanom na svim stranicama.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "VeÄ‡ina audio i video formata su onemoguÄ‡eni.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM je jedini kodek koji ostaje omoguÄ‡en.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Neki fontovi i ikone mogu biti netoÄno prikazani.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontovi pruÅ¾ani od strane web-stranica su blokirani.">
 <!ENTITY torbutton.prefs.sec_custom "PrilagoÄ‘ene vrijednosti">
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index 3642c72..69f53e5 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Postavke">
 <!ENTITY torbutton.prefs.tor_settings "Postavke Proxy-a">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene postavke proxy-a za moju verziju Firefox-a">
-<!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ‘ene postavke proxy-a">
 <!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 "O Torbutton-u">
-<!ENTITY torbutton.about.version "Verzija:">
-<!ENTITY torbutton.about.summary "Å titi privatnost VaÅ¡eg Tor preglednika.">
-<!ENTITY torbutton.about.code "Pridonijeli kodu:">
-<!ENTITY torbutton.about.maintainer "OdrÅ¾avatelj:">
-<!ENTITY torbutton.about.security_review "Pregled Sigurnosti:">
-<!ENTITY torbutton.about.donate "Ako Vam se sviÄ‘a Tor, razmislite o">
-<!ENTITY torbutton.about.make_donation "davanju donacije.">
 <!ENTITY torbutton.pref_connection.notice "OnemoguÄ‡ite Torbutton kako bi promijenili ove postavke.">
 <!ENTITY torbutton.pref_connection.more_info "ViÅ¡e informacija">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ‡">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor Krug za ovu Stranicu">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Promjeni Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Postavke Privatnosti i Sigurnosti...">
 <!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 "Tor MreÅ¾ne Postavke...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Provjeri za nadogradnju Tor Preglednika...">
 <!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 URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Otvori Tor URL u novoj kartici">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!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 "Klikni za pokretanje Torbuttona">
 <!ENTITY torbutton.prefs.privacy_security_settings "Postavke Privatnosti i Sigurnosti">
-<!ENTITY torbutton.prefs.block_thread "Blokiraj Äitanje povijesti za vrijeme Tor-a (kljuÄno)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokiraj pisanje povijesti za vrijeme Tor-a (preporuÄeno)">
-<!ENTITY torbutton.prefs.block_nthread "Blokiraj Äitanje povijesti za vrijeme ne-Tor-a (opcionalno)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokiraj zapisivanje povijesti za vrijeme ne-Tor-a (opcionalno)">
-<!ENTITY torbutton.prefs.clear_history "OÄisti povijest pri prebacivanju Tor-a (opcionalno)">
-<!ENTITY torbutton.prefs.clear_cache "Blokiraj Tor disk predmemoriju i oÄisti sve predmemorije pri prebacivanju Tor-a">
-<!ENTITY torbutton.prefs.block_cache "Blokiraj pristup predmemoriji diska i memorije za vrijeme Tor-a">
-<!ENTITY torbutton.prefs.cookie_jars "Spremi ne-Tor kolaÄiÄ‡e u zaÅ¡tiÄ‡enu zdjelu">
-<!ENTITY torbutton.prefs.cookie_protection "Upotrijebite Dijalog ZaÅ¡tite KolaÄiÄ‡a za izbor">
-<!ENTITY torbutton.prefs.mmm_cookies "RuÄno Ä‡u upravljati svojim kolaÄiÄ‡ima (opasno)">
-<!ENTITY torbutton.prefs.clear_cookies "IzbriÅ¡i kolaÄiÄ‡e pri prebacivanju Tor-a">
-<!ENTITY torbutton.prefs.disable_plugins "OnemoguÄ‡i dodatke za vrijeme koriÅ¡tenja Tor-a (vaÅ¾no)">
-<!ENTITY torbutton.prefs.kill_bad_js "ZakaÄi opasan javascript (vaÅ¾no)">
-<!ENTITY torbutton.prefs.isolate_content "Izoliraj dinamiÄki sadrÅ¾aj u stanje Tor-a (vaÅ¾no)">
-<!ENTITY torbutton.prefs.no_updates "OnemoguÄ‡i aÅ¾uriranja tokom upotrebe Tor-a">
-<!ENTITY torbutton.prefs.set_uagent "Postavite korisniÄkog agenta za upotrebu Tor-a (vaÅ¾no)">
-<!ENTITY torbutton.prefs.dynamic "DinamiÄki sadrÅ¾aj">
-<!ENTITY torbutton.prefs.cookies "KolaÄiÄ‡i">
-<!ENTITY torbutton.prefs.cache "Predmemorija">
-<!ENTITY torbutton.prefs.history "Povijest">
-<!ENTITY torbutton.prefs.no_search "OnemoguÄ‡i prijedloge za pretraÅ¾ivanje tijekom Tor-a (preporuÄeno)">
-<!ENTITY torbutton.prefs.shutdown "GaÅ¡enje">
-<!ENTITY torbutton.prefs.tor_shutdown "OÄisti Tor kolaÄiÄ‡e tijekom Tor-omoguÄ‡enog gaÅ¡enja preglednika">
-<!ENTITY torbutton.prefs.all_shutdown "OÄisti kolaÄiÄ‡e tijekom bilo kojeg gaÅ¡enja preglednika">
-<!ENTITY torbutton.prefs.no_shutdown "Nemoj oÄistiti moje kolaÄiÄ‡e na gaÅ¡enju">
-<!ENTITY torbutton.prefs.disable_sessionstore "OnemoguÄ‡i sesijsko spremanje (preporuÄeno)">
-<!ENTITY torbutton.prefs.headers "Zaglavlja">
-<!ENTITY torbutton.prefs.refererspoofing "Imitiranje referenta">
-<!ENTITY torbutton.prefs.spoofblank "Imitiraj praznog referenta tokom upotrebe Tor-a (moÅ¾e pokvariti neke stranice)">
-<!ENTITY torbutton.prefs.smartspoof "Pametno imitiranje referenta tokom upotrebe Tor-a (imitiranje domenskih referenata)">
-<!ENTITY torbutton.prefs.nospoof "Bez imitiranja referenta tokom uptrebe Tor-a (Å¡alje normalne referente)">
-<!ENTITY torbutton.prefs.disable_domstorage "Onesposobi DOM Pohranu tokom upotrebe Tor-a (vaÅ¾no)">
-<!ENTITY torbutton.prefs.forms "Obrasci">
-<!ENTITY torbutton.prefs.block_tforms "Blokiraj lozinka+obrazac spremanje tijekom Tor-a (preporuÄeno)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokiraj lozinka+obrazac spremanje tijekom ne-Tor-a (izborno)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ne-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Po pokretanju obnovljene sesije, postavi stanje Tor-a na:">
-<!ENTITY torbutton.prefs.startup_tor "Po pokretanju preglednika, postavi stanje Tor-a na:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ponovno uÄitaj kolaÄiÄ‡e/oÄisti kolaÄiÄ‡e nakon pada Firefox-a (preporuÄeno)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Pohrani Tor i ne-Tor kolaÄiÄ‡e u zaÅ¡tiÄ‡ene kutije (opasno)">
-<!ENTITY torbutton.prefs.clear_http_auth "OÄisti HTTP autentikacijske sesije (preporuÄeno)">
-<!ENTITY torbutton.prefs.block_js_history "Izoliraj pristup navigaciji po povijesti za Tor stanje (vaÅ¾no)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Promjeni veliÄinu prozora na viÅ¡ekratnike 50px tokom upotrebe Tor-a (preporuÄeno)">
-<!ENTITY torbutton.prefs.close_tor "Zatvori sve Tor prozore i kartice pri prebacivanju (opcionalno)">
-<!ENTITY torbutton.prefs.close_nontor "Zatvori sve ne-Tor prozore i kartice pri promjeni (opcionalno)">
-<!ENTITY torbutton.prefs.block_links "Blokiraj klikove na linkove i ponovna uÄitavanja stranica iz razliÄitih Tor stanja (opcionalno)">
-<!ENTITY torbutton.prefs.jar_certs "Pohrani SSL certifikate u odvojene kutije za Tor/ne-Tor (preporuÄeno)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Pohrani CA certifikate u odvojene kutije za Tor/ne-Tor (preporuÄeno)">
-<!ENTITY torbutton.prefs.locked_mode "Onesposobi Gumbe i VruÄ‡e tipke zbog spreÄavanja sluÄajne promjene">
-<!ENTITY torbutton.prefs.startup_state "Po normalno pokretanju, postavi stanje Tor-a na:">
-<!ENTITY torbutton.prefs.shutdown_state "Stanje gaÅ¡enja">
-<!ENTITY torbutton.prefs.startup "Pokretanje">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokiraj Tor pristup mreÅ¾i iz datoteke:// urls (preporuÄeno)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokiraj ne-Tor pristup mreÅ¾i iz datoteke:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati zadano">
 <!ENTITY torbutton.prefs.test_settings "Testiraj postavke">
-<!ENTITY torbutton.prefs.test_auto "Testiraj moje Tor postavke nakon Å¡to prvi put promjenim stanje na svakom pokretanju Firefox-a">
-<!ENTITY torbutton.prefs.disable_livemarks "Onesposobi aÅ¾uriranja Å¾ivih oznaka tokom upotrebe Tor-a">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne zapisuj Tor kolaÄiÄ‡e na disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne zapisuj ne-Tor kolaÄiÄ‡e na disk">
-<!ENTITY torbutton.prefs.session_restore "Neka pohrana sesije saÄuva i vrati ove kartice:">
-<!ENTITY torbutton.prefs.nontor_tabs "Kartice uÄitane u ne-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Kartice uÄitane u Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nema Proxy-a za:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Upozorenje: Izbjegavajte upotrebu bilo kojih domaÄ‡ina iznad">
-<!ENTITY torbutton.prefs.spoofreresh "OsvjeÅ¾i imitiranja">
-<!ENTITY torbutton.prefs.refereroptions "Opcije imitiranja referenta">
-<!ENTITY torbutton.prefs.nospoof "Bez imitiranja referenta tokom uptrebe Tor-a (Å¡alje normalne referente)">
-<!ENTITY torbutton.prefs.spoofroot "Imitiraj sadrÅ¾ajni direktorij stranice">
-<!ENTITY torbutton.prefs.spoofdomain "Imitiraj domenu kao referent">
-<!ENTITY torbutton.prefs.spoofblank "Imitiraj praznog referenta tokom upotrebe Tor-a (moÅ¾e pokvariti neke stranice)">
 <!ENTITY torbutton.cookiedialog.title "Upravljaj ZaÅ¡titom KolaÄiÄ‡a">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡tiÄ‡eno">
 <!ENTITY torbutton.cookiedialog.domainCol "DomaÄ‡in">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Makni sve osim zaÅ¡tiÄ‡enih">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡titi nove KolaÄiÄ‡e">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nemoj Å¡titi nove KolaÄiÄ‡e">
-<!ENTITY torbutton.prefs.disable_livemarks "Onesposobi aÅ¾uriranja Å¾ivih oznaka tokom upotrebe Tor-a">
-<!ENTITY torbutton.prefs.dtd_recommended "(preporuÄeno)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcionalno)">
-<!ENTITY torbutton.prefs.dtd_crucial "(vaÅ¾no)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Preusmjeri Torbutton aÅ¾uriranja kroz Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatski koristi alternativnu traÅ¾ilicu kad se pojavi 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 "Transparentna Torifikacija (zahtjeva modificirani transproxy ili Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "Postavke privatnosti">
 <!ENTITY torbutton.prefs.block_disk "Ne snimaj povijest pregledavanja ili podatke stranica (omoguÄ‡uje Mod Privatnog Pregledavanja)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript moÅ¾e biti omoguÄ‡en za sve ili pojedinaÄne stranice putem NoScript gumba.">
 <!ENTITY torbutton.prefs.sec_high "Visoka">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je onemoguÄ‡en pod zadano na svim stranicama.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "VeÄ‡ina audio i video formata su onemoguÄ‡eni.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM je jedini kodek koji ostaje omoguÄ‡en.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Neki fontovi i ikone se moÅ¾da neÄ‡e prikazati ispravno.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Datoteke fontova pruÅ¾ene od strane web stranice su blokirane.">
 <!ENTITY torbutton.prefs.sec_custom "PrilagoÄ‘ene Vrijednosti">
diff --git a/ht/torbutton.dtd b/ht/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ht/torbutton.dtd
+++ b/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,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 "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 "(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/hu/torbutton.dtd b/hu/torbutton.dtd
index 8d76dea..5a2bc23 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton PreferenciÃ¡k">
 <!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,14 +8,6 @@
 <!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Ã³">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "Ãšj Tor Ã¡ramkÃ¶r ehhez az oldalhoz">
 <!ENTITY torbutton.context_menu.new_circuit_key "S">
-<!ENTITY torbutton.context_menu.toggle "Tor Ã¡llapot vÃ¡ltÃ¡sa">
-<!ENTITY torbutton.context_menu.toggle.key "V">
 <!ENTITY torbutton.context_menu.preferences "BiztonsÃ¡gi Ã©s AdatvÃ©delmi 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 "Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok">
 <!ENTITY torbutton.context_menu.networksettings.key "M">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissÃtÃ©sek keresÃ©se">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SÃ¼ti vÃ©delmek...">
 <!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.privacy_security_settings "BiztonsÃ¡gi Ã©s adatvÃ©delmi 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 "No referer spoof during Tor usage (sends referers as normal)">
-<!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 "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "SÃ¼ti vÃ©delem kezelÃ©se">
 <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett">
 <!ENTITY torbutton.cookiedialog.domainCol "ÃllomÃ¡s">
@@ -132,17 +43,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 "Disable livemarks updates during Tor usage">
-<!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.priv_caption "AdatvÃ©delmi BeÃ¡llÃtÃ¡sok">
 <!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)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "A JavaScript oldalankÃ©nt engedÃ©lyezhetÅ‘ NoScript toolbar gombbal.">
 <!ENTITY torbutton.prefs.sec_high "Magas">
 <!ENTITY torbutton.prefs.sec_all_js_desc "A JavaScript alapÃ©rtelmezetten tiltott minden oldalon.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "A legtÃ¶bb audiÃ³ Ã©s videÃ³ formÃ¡tum tiltott.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "A WebM az egyetlen kodek ami bekapcsolva marad.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "NÃ©hÃ¡ny betÅ±kÃ©szlet vagy ikon rosszul jelenhet meg.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Weboldal-biztosÃtott font Ã¡llomÃ¡nyok tiltva.">
 <!ENTITY torbutton.prefs.sec_custom "EgyÃ©ni Ã©rtÃ©kek">
diff --git a/hy/torbutton.dtd b/hy/torbutton.dtd
index e004c28..b690ede 100644
--- a/hy/torbutton.dtd
+++ b/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,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 "Torbutton-Õ« Õ´Õ¡Õ½Õ«Õ¶">
-<!ENTITY torbutton.about.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 "Õ•Õ£Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶">
@@ -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 Õ‘Õ¡Õ¶ÖÕ« Ô¿Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€â€¦">
 <!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 "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 "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Ö‡ Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨">
-<!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 "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 "(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 "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€">
 <!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/ia/torbutton.dtd b/ia/torbutton.dtd
index 69386ea..5b4ffa9 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Configurationes de 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,14 +8,6 @@
 <!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 "Adjuta">
@@ -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 "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 "(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/id/torbutton.dtd b/id/torbutton.dtd
index 268ce41..22f4a09 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Preferensi TombolTor">
 <!ENTITY torbutton.prefs.tor_settings "Pengaturan Proksi">
 <!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proksi 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 proksi ubahsuai">
 <!ENTITY torbutton.prefs.proxy.host.http "Proksi HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proksi Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Hos SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Tentang Torbutton">
-<!ENTITY torbutton.about.version "Versi:">
-<!ENTITY torbutton.about.summary "Melindungi privasi penjelajahan Tor Anda.">
-<!ENTITY torbutton.about.code "Kontributor Kode:">
-<!ENTITY torbutton.about.maintainer "Pemelihara:">
-<!ENTITY torbutton.about.security_review "Tinjauan Keamanan:">
-<!ENTITY torbutton.about.donate "Jika Anda menyukai Tor, Anda bisa">
-<!ENTITY torbutton.about.make_donation "memberikan donasi.">
 <!ENTITY torbutton.pref_connection.notice "Nonfungsikan Torbutton untuk mengubah pengaturan ini.">
 <!ENTITY torbutton.pref_connection.more_info "Informasi lebih lanjut">
 <!ENTITY torbutton.pref_connection_more_info.title "Bantuan">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Alihkan Status Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Pengaturan Privasi dan Keamananâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Tentang TombolTor....">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Torâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Salin URL Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Buka URL Tor di Tab Baru">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Buka URL Tor di Jendela Baru">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "TombolTor">
 <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
 <!ENTITY torbutton.prefs.privacy_security_settings "Pengaturan Privasi dan Keamanan">
-<!ENTITY torbutton.prefs.block_thread "Blokir pembacaan riwayat selama sesi Tor (sangat penting)">
-<!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 proses cache ke harddisk dan bersihkan semua cache pada saat peralihan status Tor">
-<!ENTITY torbutton.prefs.block_cache "Blokir pengaksesan cache ke harddisk dan RAM selama sesi Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Simpan cookie Non-Tor ke dalam tempat terproteksi">
-<!ENTITY torbutton.prefs.cookie_protection "Gunakan jendela Perlindungan Cookie untuk memilih">
-<!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 pengaya selama menggunakan Tor (sangat penting)">
-<!ENTITY torbutton.prefs.kill_bad_js "Tahan javascript yang berbahaya (sangat penting)">
-<!ENTITY torbutton.prefs.isolate_content "Isolasi konten dinamis pada kondisi Tor (sangat penting)">
-<!ENTITY torbutton.prefs.no_updates "Nonaktifkan pembaharuan selama menggunakan Tor">
-<!ENTITY torbutton.prefs.set_uagent "Tetapkan user agent untuk penggunaan Tor (sangat penting)">
-<!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 peramban Tor">
-<!ENTITY torbutton.prefs.all_shutdown "Bersihkan cookie saat mematikan peramban apapun">
-<!ENTITY torbutton.prefs.no_shutdown "Jangan bersihkan cookie saya saat mematikan peramban">
-<!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 "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 "(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.priv_caption "Pengaturan Privasi">
 <!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 bisa diaktifkan per-halaman web melalui tombol NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Tinggi">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript dinonaktifkan di semua situs.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Mayoritas suara dan video dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "Codec WebM hanya satu-satunya yang tetap aktif.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Penampilan beberapa font dan ikon mungkin salah.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Font yang disediakan website diblokir.">
 <!ENTITY torbutton.prefs.sec_custom "Nilai Kustom">
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 3b60e1e..25bf320 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Eiginleikar Tor-hnapps">
 <!ENTITY torbutton.prefs.tor_settings "Stillingar milliÃ¾jÃ³ns (proxy)">
 <!ENTITY torbutton.prefs.recommended_settings "Nota Ã¾Ã¦r milliÃ¾jÃ³nsstillingar sem mÃ¦lt er meÃ° fyrir mÃna ÃºtgÃ¡fu Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Nota Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Nota Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Nota sÃ©rsniÃ°nar milliÃ¾jÃ³nsstillingar">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP milliÃ¾jÃ³nn:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher milliÃ¾jÃ³nn:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS hÃ½sill:">
 <!ENTITY torbutton.prefs.proxy.port "GÃ¡tt:">
-<!ENTITY torbutton.about.title "Um Tor-hnappinn">
-<!ENTITY torbutton.about.version "ÃštgÃ¡fa:">
-<!ENTITY torbutton.about.summary "Verndar gagnaleynd vafurs meÃ° Tor.">
-<!ENTITY torbutton.about.code "FramlÃ¶g kÃ³Ã°a:">
-<!ENTITY torbutton.about.maintainer "Utanumhald:">
-<!ENTITY torbutton.about.security_review "Ã–ryggisrÃ½ni:">
-<!ENTITY torbutton.about.donate "Ef Ã¾Ãº kannt viÃ° Tor Ã¦ttirÃ°u aÃ° Ãhuga">
-<!ENTITY torbutton.about.make_donation "aÃ° styrkja verkefniÃ°.">
 <!ENTITY torbutton.pref_connection.notice "SlÃ¶kkva Ã¡ Tor-hnappnum til aÃ° breyta Ã¾essum stillingum.">
 <!ENTITY torbutton.pref_connection.more_info "Meiri upplÃ½singar">
 <!ENTITY torbutton.pref_connection_more_info.title "HjÃ¡lp">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "NÃ½ Tor-rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "VÃxla stÃ¶Ã°u Tor af/Ã¡">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Stillingar gagnaleyndar og Ã¶ryggis...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Um Tor-hnappinn...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "AthugaÃ°u meÃ° uppfÃ¦rslur Tor-vafra...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Varnir gegn smÃ¡kÃ¶kum...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Afrita Tor-slÃ³Ã°">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Opna Tor-slÃ³Ã° Ã nÃ½jum flipa">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Opna Tor-slÃ³Ã° Ã nÃ½jum glugga">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Tor-hnappur">
 <!ENTITY torbutton.button.tooltip "Smelltu til aÃ° kveikja Ã¡ Tor-hnapp">
 <!ENTITY torbutton.prefs.privacy_security_settings "Stillingar gagnaleyndar og Ã¶ryggis">
-<!ENTITY torbutton.prefs.block_thread "StÃ¶Ã°va lestur ferilskrÃ¡r viÃ° notkun Tor (nauÃ°synlegt)">
-<!ENTITY torbutton.prefs.block_thwrite "StÃ¶Ã°va skrÃ¡ningu ferilskrÃ¡r viÃ° notkun Tor (mÃ¦lt meÃ°)">
-<!ENTITY torbutton.prefs.block_nthread "StÃ¶Ã°va lestur ferilskrÃ¡r viÃ° notkun Ã¡n Tor (valfrjÃ¡lst)">
-<!ENTITY torbutton.prefs.block_nthwrite "StÃ¶Ã°va skrÃ¡ningu ferilskrÃ¡r viÃ° notkun Ã¡n Tor (valfrjÃ¡lst)">
-<!ENTITY torbutton.prefs.clear_history "Hreinsa ferilskrÃ¡ viÃ° Tor stÃ¶Ã°uskipti (valfrjÃ¡lst) ">
-<!ENTITY torbutton.prefs.clear_cache "Loka Ã¡ aÃ°gang aÃ° skyndiminni og hreinsa allt skyndiminni viÃ° stÃ¶Ã°uskipti Tor">
-<!ENTITY torbutton.prefs.block_cache "Loka Ã¡ aÃ°gang aÃ° diski og skyndiminni viÃ° notkun Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Geyma Ã¡n-Tor smÃ¡kÃ¶kur Ã varinni krukku">
-<!ENTITY torbutton.prefs.cookie_protection "Nota gluggann 'Varnir gegn smÃ¡kÃ¶kum' til aÃ° velja">
-<!ENTITY torbutton.prefs.mmm_cookies "Ã‰g Ã¦tla aÃ° meÃ°hÃ¶ndla smÃ¡kÃ¶kurnar mÃnar handvirkt (varasamt)">
-<!ENTITY torbutton.prefs.clear_cookies "Hreinsa smÃ¡kÃ¶kur viÃ° stÃ¶Ã°uskipti Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Gera viÃ°bÃ¦tur Ã³virkar Ã¡ meÃ°an notkun Tor stendur (Ã³missandi)">
-<!ENTITY torbutton.prefs.kill_bad_js "KrÃ¦kja Ã hÃ¦ttulegar javascript-skriftur (Ã³missandi)">
-<!ENTITY torbutton.prefs.isolate_content "Einangra kvikt efni Ã Tor stÃ¶Ã°u (Ã³missandi)">
-<!ENTITY torbutton.prefs.no_updates "Gera uppfÃ¦rslur Ã³virkar Ã¡ meÃ°an notkun Tor stendur">
-<!ENTITY torbutton.prefs.set_uagent "Setja kennistreng (user agent) fyrir notkun Tor (Ã³missandi)">
-<!ENTITY torbutton.prefs.dynamic "Kvikt efni">
-<!ENTITY torbutton.prefs.cookies "SmÃ¡kÃ¶kur">
-<!ENTITY torbutton.prefs.cache "Skyndiminni">
-<!ENTITY torbutton.prefs.history "Ferill">
-<!ENTITY torbutton.prefs.no_search "Gera uppÃ¡stungur viÃ° leit Ã³virkar viÃ° notkun Tor (mÃ¦lt meÃ°)">
-<!ENTITY torbutton.prefs.shutdown "SlÃ¶kkva">
-<!ENTITY torbutton.prefs.tor_shutdown "Hreinsa Tor-smÃ¡kÃ¶kur viÃ° lokun Tor-vÃ¦ddra vafra">
-<!ENTITY torbutton.prefs.all_shutdown "Hreinsa smÃ¡kÃ¶kur viÃ° lokun hverskyns vafurs">
-<!ENTITY torbutton.prefs.no_shutdown "Ekki hreinsa smÃ¡kÃ¶kur viÃ° lokun">
-<!ENTITY torbutton.prefs.disable_sessionstore "Gera setuvistun Ã³virka (mÃ¦lt meÃ°)">
-<!ENTITY torbutton.prefs.headers "Hausar">
-<!ENTITY torbutton.prefs.refererspoofing "Gabba sÃÃ°uvÃsun (spoof referer)">
-<!ENTITY torbutton.prefs.spoofblank "Gabba meÃ° auÃ°um sÃÃ°uvÃsunum Ã¡ meÃ°an notkun Tor stendur (gÃ¦ti gert einhver vefsvÃ¦Ã°i illnothÃ¦f)">
-<!ENTITY torbutton.prefs.smartspoof "Gabba meÃ° snjÃ¶llum sÃÃ°uvÃsunum Ã¡ meÃ°an notkun Tor stendur (gabbar millilÃ©navÃsanir)">
-<!ENTITY torbutton.prefs.nospoof "Ekki rangar sÃÃ°uvÃsunum Ã¡ meÃ°an notkun Tor stendur (sendir venjulegar sÃÃ°uvÃsanir)">
-<!ENTITY torbutton.prefs.disable_domstorage "Gera DOM-vistun Ã³virka Ã¡ meÃ°an notkun Tor stendur (Ã³missandi)">
-<!ENTITY torbutton.prefs.forms "EyÃ°uform">
-<!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 "Ãn Tor">
-<!ENTITY torbutton.prefs.restore_tor "ViÃ° endurheimta rÃ¦singu setu, setja stÃ¶Ã°u Tor Ã¡:">
-<!ENTITY torbutton.prefs.startup_tor "ViÃ° rÃ¦singu vafra, setja stÃ¶Ã°u Tor Ã¡:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Geyma bÃ¦Ã°i meÃ°-Tor og Ã¡n-Tor smÃ¡kÃ¶kur Ã vernduÃ°um krukkum (varhugavert)">
-<!ENTITY torbutton.prefs.clear_http_auth "Hreinsa HTTP auth setur (mÃ¦lt meÃ°)">
-<!ENTITY torbutton.prefs.block_js_history "Einangra aÃ°gang aÃ° vafurferli Ã Tor stÃ¶Ã°u (Ã³missandi)">
-<!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 "ViÃ° venjulega rÃ¦singu, setja stÃ¶Ã°u Tor Ã¡:">
-<!ENTITY torbutton.prefs.shutdown_state "StaÃ°a Ã¾egar er slÃ¶kkt">
-<!ENTITY torbutton.prefs.startup "RÃ¦sing">
-<!ENTITY torbutton.prefs.block_tor_file_net "Loka Ã¡ Tor aÃ°gang aÃ° neti frÃ¡ file:// slÃ³Ã°um (mÃ¦lt meÃ°)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Loka Ã¡ Ã¡n-Tor aÃ°gang aÃ° neti frÃ¡ file:// slÃ³Ã°um">
 <!ENTITY torbutton.prefs.restore_defaults "Frumstilla Ã¡ sjÃ¡lfgefiÃ°">
 <!ENTITY torbutton.prefs.test_settings "PrÃ³fa stillingar">
-<!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 "Ekki skrifa Tor-smÃ¡kÃ¶kur Ã¡ disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ekki skrifa Ã¡n-Tor smÃ¡kÃ¶kur Ã¡ disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Flipar hlaÃ°nir Ã¡n Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Flipar hlaÃ°nir meÃ° Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Engir milliÃ¾jÃ³nar fyrir: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "AÃ°vÃ¶run: ForÃ°ast aÃ° nota nein hÃ½silheiti hÃ©r aÃ° ofan">
-<!ENTITY torbutton.prefs.spoofreresh "Gabba endurlestur">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Ekki rangar sÃÃ°uvÃsunum Ã¡ meÃ°an notkun Tor stendur (sendir venjulegar sÃÃ°uvÃsanir)">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Gabba meÃ° auÃ°um sÃÃ°uvÃsunum Ã¡ meÃ°an notkun Tor stendur (gÃ¦ti gert einhver vefsvÃ¦Ã°i illnothÃ¦f)">
 <!ENTITY torbutton.cookiedialog.title "SÃ½sla meÃ° varnir Ã¡ smÃ¡kÃ¶kum">
 <!ENTITY torbutton.cookiedialog.lockCol "VariÃ°">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ½sill">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "FjarlÃ¦gja allar aÃ°rar en verndaÃ°ar">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nÃ½jar smÃ¡kÃ¶kur">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nÃ½jar smÃ¡kÃ¶kur">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(mÃ¦lt meÃ° Ã¾essu)">
-<!ENTITY torbutton.prefs.dtd_optional "(valkvÃ¦tt)">
-<!ENTITY torbutton.prefs.dtd_crucial "(nauÃ°synlegt)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Endurbeina uppfÃ¦rslum Tor-hnapps Ã gegnum Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Nota sjÃ¡lfkrafa aÃ°ra leitarvÃ©l Ã¾egar rekist er Ã¡ Google Captcha auÃ°kenningu:">
-<!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 "GegnsÃ¦ Tor-notkun (krefst sÃ©rsniÃ°ins transproxy eÃ°a Tor-beini)">
 <!ENTITY torbutton.prefs.priv_caption "Stillingar gagnaleyndar">
 <!ENTITY torbutton.prefs.block_disk "Ekki skrÃ¡ feril vafurs eÃ°a gÃ¶gn vefsvÃ¦Ã°a (virkjar einkavafurham)">
@@ -177,8 +77,6 @@ breytingar (svÃfa yfir meÃ° bendli til aÃ° sjÃ¡ nÃ¡nar):">
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "HÃ¦gt er aÃ° virkja JavaScript fyrir hvert vefsvÃ¦Ã°i meÃ° NoScript-hnappnum Ã¡ verkfÃ¦raslÃ¡.">
 <!ENTITY torbutton.prefs.sec_high "HÃ¡tt">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er sjÃ¡lfgefiÃ° Ã³virkt Ã¡ Ã¶llum vefsvÃ¦Ã°um.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Flest hljÃ³Ã°- og myndskeiÃ°asniÃ° er Ã³virk.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM er eini kÃ³Ã°unarlykillinn sem eftir er virkur.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Sumar tÃ¡knmyndir og letur gÃ¦tu birst Ã³eÃ°lilega.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "LokaÃ° er Ã¡ leturskrÃ¡r sem eiga uppruna sinn Ã¡ vefsvÃ¦Ã°inu.">
 <!ENTITY torbutton.prefs.sec_custom "SÃ©rsniÃ°in gildi">
diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index f08b41d..75e3d36 100644
--- a/it/torbutton.dtd
+++ b/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/ja/torbutton.dtd b/ja/torbutton.dtd
index 64e91a4..c58bd68 100644
--- a/ja/torbutton.dtd
+++ b/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/jv/torbutton.dtd b/jv/torbutton.dtd
index 30139f9..e3b0c31 100644
--- a/jv/torbutton.dtd
+++ b/jv/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Pengaturan Proxi">
 <!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 "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 "(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/ka/torbutton.dtd b/ka/torbutton.dtd
index 14de837..504b3fa 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton-áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜">
 <!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,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 "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 "(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/kk/torbutton.dtd b/kk/torbutton.dtd
index 32c680f..12364fc 100644
--- a/kk/torbutton.dtd
+++ b/kk/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 "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 "(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/km/torbutton.dtd b/km/torbutton.dtd
index 237271b..7a14624 100644
--- a/km/torbutton.dtd
+++ b/km/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 "áž”áŸ’ážšáž¾â€‹áž”áŸ’ážšáž¼áž€ážŸáŸŠáž¸">
 <!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 "New Tor Circuit for this Site">
 <!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 "Privacy and Security Settingsâ€¦">
 <!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 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 "áž…áž˜áŸ’áž›áž„ 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 "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹áž¢áž¶áž“â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Tor (áž…áž¶áŸ†áž”áž¶áž…áŸ‹)">
-<!ENTITY torbutton.prefs.block_thwrite "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹ážŸážšážŸáŸážšâ€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Tor (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.block_nthread "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹áž¢áž¶áž“â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Non-Tor (áž‡áž¶â€‹áž‡áž˜áŸ’ážšáž¾ážŸ)">
-<!ENTITY torbutton.prefs.block_nthwrite "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹ážŸážšážŸáŸážšâ€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Non-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 "ážŸáŸ’ážŠáž¶ážšâ€‹ážáž¼áž‚áž¸ Non-Tor áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ jar ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž€áž¶ážšáž–áž¶ážš">
-<!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 "Hook dangerous 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 "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor (áž¢áž¶áž…â€‹áž”áŸ†áž”áŸ‚áž€â€‹ážáŸ†áž”áž“áŸ‹â€‹áž”ážŽáŸ’ážŠáž¶áž‰â€‹áž˜áž½áž™â€‹áž…áŸ†áž“áž½áž“â€‹)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor  (spoofs áž†áŸ’áž›áž„áž€áž¶ážáŸ‹ referers ážŠáŸ‚áž“)">
-<!ENTITY torbutton.prefs.nospoof "áž‚áŸ’áž˜áž¶áž“ referer spoof áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor  (áž•áŸ’áž‰áž¾ referers áž‡áž¶â€‹áž’áž˜áŸ’áž˜ážáž¶)">
-<!ENTITY torbutton.prefs.disable_domstorage "áž”áž·áž‘â€‹â€‹áž€áž¶ážšâ€‹áž•áŸ’áž‘áž»áž€â€‹ DOM áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor (áž…áž¶áŸ†áž”áž¶áž…áŸ‹)">
-<!ENTITY torbutton.prefs.forms "áž‘áž˜áŸ’ážšáž„áŸ‹">
-<!ENTITY torbutton.prefs.block_tforms "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€ password+form áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Tor (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.block_ntforms "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€ password+form áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž› Non-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 "áž•áŸ’áž‘áž»áž€â€‹ážáž¼áž‚áž¸ jar/clear cookies ážšáž”ážŸáŸ‹â€‹ážáž¼áž‚áž¸â€‹áž¡áž¾áž„â€‹ážœáž·áž‰â€‹áž“áŸ…â€‹áž›áž¾â€‹áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž„ Firefox (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€ ážáž¼áž‚áž¸ Non-Tor áž“áž·áž„ Tor  áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹ jars áž”áž¶áž“â€‹áž€áž¶ážšâ€‹áž–áž¶ážš (ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž˜áž¶áž“â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–)">
-<!ENTITY torbutton.prefs.clear_http_auth "ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáž˜áŸáž™â€‹áž€áž¶ážšâ€‹áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹â€‹ HTTP  (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.block_js_history "áž”áŸ†áž”áŸ‚áž€â€‹áž€áž¶ážšâ€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹áž€áž¶ážšâ€‹ážšáž»áž€ážšáž€â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž…áŸ†áž–áŸ„áŸ‡â€‹ážŸáž—áž¶áž– Tor (áž…áž¶áŸ†áž”áž¶áž…áŸ‹)">
-<!ENTITY torbutton.prefs.resize_on_toggle "áž”áŸ’ážŠáž¼ážšâ€‹áž‘áŸ†áž áŸ†â€‹áž•áŸ’áž‘áž¶áŸ†áž„â€‹áž‘áŸ…â€‹áž–áž áž»áž‚áž»ážŽâ€‹áž“áŸƒ 50px áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.close_tor "áž”áž·áž‘â€‹áž•áŸ’áž‘áž¶áŸ†áž„ Tor áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ áž“áž·áž„â€‹áž•áŸ’áž‘áž¶áŸ†áž„â€‹áž“áŸ…â€‹áž–áŸáž›â€‹áž”áž·áž‘/áž”áž¾áž€ (áž‡áž¶â€‹áž‡áž˜áŸ’ážšáž¾ážŸ)">
-<!ENTITY torbutton.prefs.close_nontor "áž”áž·áž‘â€‹áž•áŸ’áž‘áž¶áŸ†áž„ Non-Tor áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ áž“áž·áž„â€‹áž•áŸ’áž‘áž¶áŸ†áž„â€‹áž“áŸ…â€‹áž–áŸáž›â€‹áž”áž·áž‘/áž”áž¾áž€ (áž‡áž¶â€‹áž‡áž˜áŸ’ážšáž¾ážŸ)">
-<!ENTITY torbutton.prefs.block_links "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹áž…áž»áž…â€‹áž›áž¾â€‹ážáŸ†ážŽ áž“áž·áž„â€‹áž€áž¶ážšâ€‹áž•áŸ’áž‘áž»áž€â€‹â€‹áž‘áŸ†áž–áŸážšâ€‹áž¡áž¾áž„â€‹ážœáž·áž‰â€‹áž–áž¸â€‹ážŸáž—áž¶áž– Tor áž•áŸ’ážŸáŸáž„áŸ— (áž‡áž¶â€‹áž‡áž˜áŸ’ážšáž¾ážŸ)">
-<!ENTITY torbutton.prefs.jar_certs "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážš SSL certs áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ seperate jars ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ Tor/Non-Tor (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.jar_ca_certs "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážš CA áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ seperate jars ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ Tor/Non-Tor (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!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 "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹â€‹áž€áž¶ážšâ€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážš Tor áž‘áŸ…â€‹áž”ážŽáŸ’ážŠáž¶áž‰â€‹áž–áž¸â€‹áž¯áž€ážŸáž¶ážšáŸ–// urls (áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž€áž¶ážšâ€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážš Non-Tor áž‘áŸ…â€‹áž”ážŽáŸ’ážŠáž¶áž‰â€‹áž–áž¸â€‹áž¯áž€ážŸáž¶ážšáŸ–// urls">
 <!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 "áž€áž»áŸ†â€‹ážŸážšážŸáŸážšâ€‹ážáž¼áž‚áž¸ Non-Tor áž‘áŸ…â€‹ážáž¶ážŸ">
-<!ENTITY torbutton.prefs.session_restore "áž˜áž¶áž“â€‹ážŸáž˜áŸáž™â€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€ áž“áž·áž„â€‹ážŸáŸ’ážŠáž¶ážšâ€‹áž•áŸ’áž‘áž¶áŸ†áž„â€‹áž‘áž¶áŸ†áž„áž“áŸáŸ‡áŸ–">
-<!ENTITY torbutton.prefs.nontor_tabs "áž•áŸ’áž‘áž¶áŸ†áž„â€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áž»áž€â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ Non-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 "áž‚áŸ’áž˜áž¶áž“ referer spoof áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ Tor  (áž•áŸ’áž‰áž¾ referers áž‡áž¶â€‹áž’áž˜áŸ’áž˜ážáž¶)">
-<!ENTITY torbutton.prefs.spoofroot "Spoof áž˜áž¶áž“â€‹ážážâ€‹â€‹áž“áŸƒâ€‹áž‘áŸ†áž–áŸážš">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof ážŠáŸ‚áž“â€‹áž‡áž¶ referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer áž¢áŸ†áž¡áž»áž„â€‹áž–áŸáž›â€‹áž”áŸ’ážšáž¾áž”áŸ’ážšáž¶ážŸáŸ‹ 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 "Transparent Torification (áž‘áž¶áž˜áž‘áž¶ážš  transproxy áž¬â€‹ážšáŸ‰áŸ„ážáž‘áŸážš Tor áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!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 "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/kn/torbutton.dtd b/kn/torbutton.dtd
index f04e68b..4386566 100644
--- a/kn/torbutton.dtd
+++ b/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,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 "à²ˆ à²¸à³†à³–à²Ÿà³à²—à³† à²¹à³†à³‚à²¸ à²Ÿà²¾à²°à³ à²¸à²°à³à²•à³à²¯à³‚à²Ÿà³">
 <!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 "à²—à³Œà²ªà³à²¯à²¤à³† à²®à²¤à³à²¤à³ à²à²¦à³à²°à²¤à³† à²¸à³†à²Ÿà³à²Ÿà²¿à²‚à²—à³à²—à²³à³">
 <!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 "à²Ÿà²¾à²°à³ à²¨à³†à²Ÿà³à²µà²°à³à²•à³ à²¸à³†à²Ÿà³à²Ÿà²¿à²‚à²—à³à²—à²³à³ ...">
 <!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 "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 "à²—à³Œà²ªà³à²¯à²¤à³† à²®à²¤à³à²¤à³ à²à²¦à³à²°à²¤à³† à²¸à³†à²Ÿà³à²Ÿà²¿à²‚à²—à³à²—à²³à³">
-<!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 "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 "(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 "à²—à³Œà²ªà³à²¯à²¤à³† à²¸à³†à²Ÿà³à²Ÿà²¿à²‚à²—à³à²—à²³à³">
 <!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 "à²¹à³†à²šà³à²šà³">
 <!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 "à²µà²¾à²¡à²¿à²•à³† à²®à³Œà²²à³à²¯à²—à²³à³">
diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd
index 0ce3fce..d597085 100644
--- a/ko/torbutton.dtd
+++ b/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/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd
index 96f14af..7c1a324 100644
--- a/ko_KR/torbutton.dtd
+++ b/ko_KR/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 "ì´ë ‡ê²Œ ì„¤ì •ì„ ë°”ê¿€ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.">
 <!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 "New Tor Circuit for this Site">
 <!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 "Privacy and Security Settingsâ€¦">
 <!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 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 "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 "Privacy and 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 "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 "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 "(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/ku/torbutton.dtd b/ku/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ku/torbutton.dtd
+++ b/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,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 "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 "(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/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd
index 70b590e..16ad731 100644
--- a/ku_IQ/torbutton.dtd
+++ b/ku_IQ/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 "ÛŒØ§Ø±Ù…Û•ØªÛŒ">
@@ -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 "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 "(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/kw/torbutton.dtd b/kw/torbutton.dtd
index 32c680f..12364fc 100644
--- a/kw/torbutton.dtd
+++ b/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,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 "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 "(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/ky/torbutton.dtd b/ky/torbutton.dtd
index e74e4b1..94467a5 100644
--- a/ky/torbutton.dtd
+++ b/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,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 "Ð–Ð°Ñ€Ð´Ð°Ð¼">
@@ -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 "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 "(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/la/torbutton.dtd b/la/torbutton.dtd
index 32c680f..12364fc 100644
--- a/la/torbutton.dtd
+++ b/la/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 "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 "(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/lb/torbutton.dtd b/lb/torbutton.dtd
index 5ff29f0..b9af04e 100644
--- a/lb/torbutton.dtd
+++ b/lb/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Astellungen">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Astellungen">
 <!ENTITY torbutton.prefs.recommended_settings "Benotz dÃ©i recommandÃ©iert Proxy Astellungen fir meng Versioun vum Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy benotzen">
 <!ENTITY torbutton.prefs.use_polipo "Polipo benotzen">
 <!ENTITY torbutton.prefs.custom_settings "Individuell Proxy Astellungen benotzen">
 <!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 "Iwwert den Torbutton">
-<!ENTITY torbutton.about.version "Versioun:">
-<!ENTITY torbutton.about.summary "ProtegÃ©iert d'PrivatsphÃ¤r vun Ã¤rem Tor Brower">
-<!ENTITY torbutton.about.code "Programmcode BÃ¤idroer:">
-<!ENTITY torbutton.about.maintainer "Haaptbetreier:">
-<!ENTITY torbutton.about.security_review "SÃ©cherheetsiwwerprÃ©ifung:">
-<!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 "HÃ«llef">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Neien Tor-Pad fir des SÃ¤it">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Tor Status Ã«mschalten">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PrivatsphÃ¤r- an SÃ©cherheetsastellungen">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Iwwert den Torbutton">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Tor Netzwierk Astellungen">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Sich no Tor Browser AktualisÃ©ierungen">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutzâ€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopie Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Maach Tor URL an engem neien Reider op">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Maach Tor URL an enger neier FÃ«nster op">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klickt fir den Torbutton ze aktivÃ©ieren">
 <!ENTITY torbutton.prefs.privacy_security_settings "PrivatsphÃ¤r- an SÃ©cherheetsastellungen">
-<!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 "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 "(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 "PrivatsphÃ¤rastellungen">
 <!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 "HÃ©ich">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ass standardmÃ©isseg op all SÃ¤it aus.">
-<!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 "Individuell WÃ¤erter">
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index 8282ea4..12364fc 100644
--- a/lg/torbutton.dtd
+++ b/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,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 "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 "(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)">
 <!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/ln/torbutton.dtd b/ln/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ln/torbutton.dtd
+++ b/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,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 "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 "(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/lo/torbutton.dtd b/lo/torbutton.dtd
index 8069575..5a57194 100644
--- a/lo/torbutton.dtd
+++ b/lo/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "àºàº²àº™àº•àº±à»‰àº‡àº„à»ˆàº² Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "àºàº²àº™àº•àº±à»‰àº‡àº„à»ˆàº² Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "à»ƒàº«à»‰à»ƒàºŠà»‰àº„à»ˆàº²àºàº²àº™àº•àº±à»‰àº‡àº„à»ˆàº² proxy àº—àºµà»ˆà»àº™àº°àº™àº³ à»ƒàº«à»‰àºàº±àºš àº®àº¸à»ˆàº™ Firefox àº‚àºàº‡àº‚à»‰àºàº">
-<!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,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 "àºà»ˆàº½àº§àºàº±àºš Torbutton">
-<!ENTITY torbutton.about.version "àº®àº¸à»ˆàº™ "à»€àº§àºµàºŠàº±àº™":">
-<!ENTITY torbutton.about.summary "àº›àº»àºàº›à»‰àºàº‡àº„àº§àº²àº¡à»€àº›àº±àº™àºªà»ˆàº§àº™àº•àº»àº§ àº‚àºàº‡ àº•àº»àº§àº—à»ˆàºàº‡à»€àº§àº±àºš Tor àº‚àºàº‡àº—à»ˆàº²àº™.">
-<!ENTITY torbutton.about.code "àºœàº¹à»‰àº›àº°àºàºàºšàºªà»ˆàº§àº™ Code:">
-<!ENTITY torbutton.about.maintainer "àºœàº¹à»‰àº®àº±àºàºªàº²:">
-<!ENTITY torbutton.about.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 "Tor à»ƒà»à»ˆàºªàº³àº¥àº±àºšà»€àº§àº±àºšà»„àºŠàº™àºµà»‰">
 <!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 "àºàº²àº™àºàº³àº™àº»àº”àº„à»ˆàº²àº„àº§àº²àº¡à»€àº›àº±àº™àºªà»ˆàº§àº™àº•àº»àº§à»àº¥àº°àº„àº§àº²àº¡àº›àºàº”à»„àºž">
 <!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">
 <!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 "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 "àºàº²àº™àºàº³àº™àº»àº”àº„à»ˆàº²àº„àº§àº²àº¡à»€àº›àº±àº™àºªà»ˆàº§àº™àº•àº»àº§à»àº¥àº°àº„àº§àº²àº¡àº›àºàº”à»„àºž">
-<!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 "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 "(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 "àºàº²àº™àºàº³àº™àº»àº”àº„à»ˆàº²àº„àº§àº²àº¡à»€àº›àº±àº™àºªà»ˆàº§àº™à»‚àº•">
 <!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 àºªàº²àº¡àº²àº”à»€àº›àºµàº”à»ƒàºŠà»‰àº‡àº²àº™à»„àº”à»‰ à»€àº—àº´àº‡à»„àºŠàº•à»Œ à»‚àº”àºàºžàº·à»‰àº™àº–àº²àº™ à»‚àº”àºàºœà»ˆàº²àº™ àº›àº¸à»ˆàº¡àº„à»àº²àºªàº±à»ˆàº‡ 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/lt/torbutton.dtd b/lt/torbutton.dtd
index af5e9c5..414c805 100644
--- a/lt/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinÄ— Å¡iam saitui">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Pakeisti Tor statusÄ…">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Privatumo ir saugumo 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 "Tor tinklo nustatymai">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tikrinti ar yra Tor narÅ¡yklÄ—s atnaujinimÅ³...">
 <!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 "Atverti Tor nuorodÄ… naujame skirtuke">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Atverti 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.privacy_security_settings "Privatumo ir saugumo 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 "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 "(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 "Privatumo nustatymai">
 <!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 galima Ä¯galinti naudojantis NoScript Ä¯rankiÅ³ juostos mygtukÄ… pasirinktuose saituose.">
 <!ENTITY torbutton.prefs.sec_high "AukÅ¡tas">
 <!ENTITY torbutton.prefs.sec_all_js_desc "Pagal numatymÄ…, Javascript yra iÅ¡jungtas visose svetainÄ—se.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Dauguma garso ir vaizdo formatÅ³ yra iÅ¡jungta.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM yra vienintelis kodekas, kuris lieka Ä¯jungtas.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Kai kurie Å¡riftai ir piktogramos gali bÅ«ti rodomos neteisingai.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tinklalapio teikiami Å¡riftai blokuojami.">
 <!ENTITY torbutton.prefs.sec_custom "Tinkintos reikÅ¡mÄ—s">
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index 734832b..e1aa7ad 100644
--- a/lv/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Jauns Tor marÅ¡ruts Å¡ai vietnei">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "PÄrslÄ“gt Tor statusu">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PrivÄtuma un droÅ¡Ä«bas iestatÄ«jumi.">
 <!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 "TÄ«kla Tor iestatÄ«jumi.">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "PÄrbaudÄ«t atjauninÄjumus pÄrlÅ«kam Tor.">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba pret 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.privacy_security_settings "PrivÄtuma un 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 "No referer spoof during Tor usage (sends referers as normal)">
-<!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 "Spoof blank referer during Tor usage (may break some sites)">
 <!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">
@@ -132,17 +43,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 "Disable livemarks updates during Tor usage">
-<!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.priv_caption "PrivÄtuma iestatÄ«jumi">
 <!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)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "Ar NoScript rÄ«kjoslas pogu individuÄlai vietnei var iespÄ“jot JavaScript.">
 <!ENTITY torbutton.prefs.sec_high "Augsts">
 <!ENTITY torbutton.prefs.sec_all_js_desc "PÄ“c noklusÄ“juma visÄs vietnÄ“s ir atspÄ“jots JavaScript.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Ir atspÄ“jots vairums audio un video formÄtu.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM ir vienÄ«gais atlikuÅ¡ais iespÄ“jotais kodeks.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "DaÅ¾i fonti un ikoni var tikt attÄ“loti nepareizi.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tiek bloÄ·Ä“tas tÄ«mekÄ¼a lapu sniegtÄs fontu datnes.">
 <!ENTITY torbutton.prefs.sec_custom "PielÄgotas vÄ“rtÄ«bas">
diff --git a/mg/torbutton.dtd b/mg/torbutton.dtd
index 32c680f..12364fc 100644
--- a/mg/torbutton.dtd
+++ b/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,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 "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 "(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/mi/torbutton.dtd b/mi/torbutton.dtd
index 32c680f..12364fc 100644
--- a/mi/torbutton.dtd
+++ b/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,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 "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 "(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/mk/torbutton.dtd b/mk/torbutton.dtd
index 7ef3aa2..ff43259 100644
--- a/mk/torbutton.dtd
+++ b/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,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 "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 "ÐŸÐ¾Ð¼Ð¾Ñˆ">
@@ -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 "ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¢Ð¾Ñ€ ÑÑ‚Ð°Ñ‚ÑƒÑ">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!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 "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 "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.privacy_security_settings "Privacy and 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 "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð³Ð¾ Ð´Ð¸ÑÐº-ÐºÐµÑˆÐ¾Ñ‚ Ð½Ð° Ð¢Ð¾Ñ€ Ð¸ Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð³Ð¾ ÑÐ¸Ð¾Ñ‚ ÐºÐµÑˆ Ð¿Ñ€Ð¸ Ð²ÐºÐ»ÑƒÑ‡ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€">
-<!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 "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 "(Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾)">
-<!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.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/ml/torbutton.dtd b/ml/torbutton.dtd
index 417a666..aa4443e 100644
--- a/ml/torbutton.dtd
+++ b/ml/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 "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 "à´•àµ‚à´Ÿàµà´¤àµ½ à´µà´¿à´µà´°à´™àµà´™àµ¾">
 <!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 "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 "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 "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 "à´¸àµà´µà´•à´¾à´°àµà´¯à´¤, à´¸àµà´°à´•àµà´·à´¾ à´•àµà´°à´®àµ€à´•à´°à´£à´™àµà´™àµ¾">
-<!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 "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 "(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 "à´¸àµà´µà´•à´¾à´°àµà´¯à´¤à´¾ à´•àµà´°à´®àµ€à´•à´°à´£à´™àµà´™àµ¾">
 <!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 "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 " à´‡à´¨à´¿ à´¬à´¾à´•àµà´•à´¿à´¯àµà´³àµà´³à´¤àµ à´µàµ†à´¬àµM à´•àµ‡à´¾à´¡àµ†à´•àµ à´®à´¾à´¤àµà´°à´®à´¾à´£àµ.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "à´šà´¿à´² à´«àµ‡à´¾à´£àµà´Ÿàµà´•àµ¾ à´à´•àµà´•à´£àµà´•à´³àµà´‚ à´¤àµ†à´±àµà´±à´¾à´¯à´¿ à´ªàµà´°à´¦àµ¼à´¶à´¿à´ªàµà´ªà´¿à´•àµà´•àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨àµ.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip " à´«à´¯à´²àµà´•àµ¾ à´¤à´Ÿà´žàµà´žàµ à´µàµ†à´¬àµà´¸àµˆà´±àµà´±àµ-à´¨àµ½à´•à´¿à´¯ à´«àµ‡à´¾à´£àµà´Ÿàµ.">
 <!ENTITY torbutton.prefs.sec_custom "à´•à´¸àµà´±àµà´±à´‚ à´®àµ‚à´²àµà´¯à´™àµà´™àµ¾">
diff --git a/mn/torbutton.dtd b/mn/torbutton.dtd
index af6a0f2..de03d69 100644
--- a/mn/torbutton.dtd
+++ b/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,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 "Ð¥ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€:">
-<!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 "Ð¢ÑƒÑÐ»Ð°Ð¼Ð¶">
@@ -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 "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 "(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/mr/torbutton.dtd b/mr/torbutton.dtd
index 62b5f38..cbea412 100644
--- a/mr/torbutton.dtd
+++ b/mr/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 "à¤à¤š à¤Ÿà¥€ à¤Ÿà¥€ à¤ªà¥€ à¤ªà¥à¤°à¥‰à¤•à¥à¤¸à¥€:">
@@ -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 "à¤—à¥‹à¤ªà¤¨à¥€à¤¯à¤¤à¤¾ à¤†à¤£à¤¿ à¤¸à¥à¤°à¤•à¥à¤·à¤¾ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤œ ...">
 <!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 "à¤Ÿà¥‰à¤° à¤¨à¥‡à¤Ÿà¤µà¤°à¥à¤• à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤œ ...">
 <!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 "à¤•à¥à¤•à¥€ à¤¸à¤‚à¤°à¤•à¥à¤·à¤£ ...">
 <!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 "à¤—à¥‹à¤ªà¤¨à¥€à¤¯à¤¤à¤¾ à¤†à¤£à¤¿ à¤¸à¥à¤°à¤•à¥à¤·à¤¾ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤œ">
-<!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 "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 "(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 "à¤—à¥‹à¤ªà¤¨à¥€à¤¯à¤¤à¤¾ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤œ">
 <!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 "à¤‰à¤šà¥à¤š">
 <!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 "à¤•à¤¸à¥à¤Ÿà¤® à¤®à¥‚à¤²à¥à¤¯à¥‡">
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 72be4da..8ba22fc 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Tetapan Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Tetapan proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Guna tetapan proksi yang digalakkan untuk versi Firefox sekarang">
-<!ENTITY torbutton.prefs.use_privoxy "Guna Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Guna Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Guna tetapan proksi peribadi">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proksi:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Hos:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "Tentang Torbutton">
-<!ENTITY torbutton.about.version "Versi:">
-<!ENTITY torbutton.about.summary "Melindungi privasi pelayar Tor anda.">
-<!ENTITY torbutton.about.code "Penyumbang kod:">
-<!ENTITY torbutton.about.maintainer "Penyelenggara:">
-<!ENTITY torbutton.about.security_review "Ulasan Keselamatan:">
-<!ENTITY torbutton.about.donate "Jika anda suka menggunakan Tor, anda boleh mempertimbangkan">
-<!ENTITY torbutton.about.make_donation "untuk membuat derma.">
 <!ENTITY torbutton.pref_connection.notice "Mematikan Torbutton untuk menukar tetapan ini.">
 <!ENTITY torbutton.pref_connection.more_info "Informasi Lanjut">
 <!ENTITY torbutton.pref_connection_more_info.title "Bantuan">
@@ -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 "Tukar status Tor">
-<!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 "Tentang 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 "Salin ke URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Buka Tor URL di tab baru">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Buka Tor URL di tetingkap baru">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik untuk memulakan Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Sekat history daripada dibaca ketika Tor berjalan (penting)">
-<!ENTITY torbutton.prefs.block_thwrite "Sekat history daripada ditulis ketika Tor berjalan (digalakkan)">
-<!ENTITY torbutton.prefs.block_nthread "Sekat history daripada dibaca ketika Tor tidak berjalan (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 "Kandungan Dinamik">
-<!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 "Bukan-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 "Kembalikan tetapan asal">
 <!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 "Tiada proksi untuk:">
 <!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 "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 "Mengurus Perlindungan Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Hos">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Buang Semua Kecuali Yang Dilindungi">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Lindungi Cookies Baru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Jangan Melindungi Cookies Baru">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(digalakkan)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(penting)">
-<!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/mt/torbutton.dtd b/mt/torbutton.dtd
index 32c680f..12364fc 100644
--- a/mt/torbutton.dtd
+++ b/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,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 "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 "(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/my/torbutton.dtd b/my/torbutton.dtd
index 8a437ae..f02e69a 100644
--- a/my/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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 "á€¡á€€á€°á€¡á€Šá€®">
@@ -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 "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 "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 "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ€¦">
 <!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 "Privacy and 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 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 "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 "á€‚á€°á€‚á€² 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.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 "á€¡á€žá€¶á€–á€á€¯á€„á€ºá€”á€¾á€„á€ºá€·á€—á€½á€®á€’á€®á€šá€á€¯á€–á€á€¯á€„á€º á€¡á€™á€»á€á€¯á€¸á€…á€¬á€¸á€¡á€™á€»á€¬á€¸á€…á€¯á€€á€á€¯ á€œá€¯á€•á€ºá€†á€±á€¬á€„á€ºá€™á€¾á€¯á€•á€á€á€ºá€•á€„á€ºá€‘á€¬á€¸á€žá€Šá€ºá‹">
-<!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 "á€…á€á€á€ºá€€á€¼á€á€¯á€€á€ºá€á€”á€ºá€–á€á€¯á€¸">
diff --git a/nah/torbutton.dtd b/nah/torbutton.dtd
index 32c680f..12364fc 100644
--- a/nah/torbutton.dtd
+++ b/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,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 "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 "(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/nap/torbutton.dtd b/nap/torbutton.dtd
index 32c680f..12364fc 100644
--- a/nap/torbutton.dtd
+++ b/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,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 "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 "(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/nb/torbutton.dtd b/nb/torbutton.dtd
index 05ddb09..d964f59 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Innstillinger for Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Mellomtjenerinnstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte mellomtjenerinnstillinger 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 mellomtjenerinnstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-mellomtjener:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-mellomtjener:">
 <!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, kan du vurdere Ã¥">
-<!ENTITY torbutton.about.make_donation "donere">
 <!ENTITY torbutton.pref_connection.notice "Skru av Torbutton for Ã¥ endre disse innstillingene.">
 <!ENTITY torbutton.pref_connection.more_info "Mer informasjon">
 <!ENTITY torbutton.pref_connection_more_info.title "Hjelp">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Endre Tor-status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Personvern og sikkerhetsinnstillinger...">
 <!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 "Nettverksinnstillinger for TORâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for TOR-nettleserâ€¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelseâ€¦">
 <!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 Ã¥ igangsette Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Personvern og 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 ved bruk av Tor-toggle (valgfritt)">
-<!ENTITY torbutton.prefs.clear_cache "Blokker Tor-diskmellomlager og slett hele hurtiglagret  ved Tor-toggle">
-<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og hurtiglagringsminne 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 ved Tor-toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Skru av programtillegg 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 "Skru av oppdateringer under bruk av Tor">
-<!ENTITY torbutton.prefs.set_uagent "Sett bruker-agent for Tor-bruk (avgjÃ¸rende)">
-<!ENTITY torbutton.prefs.dynamic "Dynamisk Innhold">
-<!ENTITY torbutton.prefs.cookies "Informasjonskapsler">
-<!ENTITY torbutton.prefs.cache "Hurtiglager">
-<!ENTITY torbutton.prefs.history "Historikk">
-<!ENTITY torbutton.prefs.no_search "Skru av sÃ¸keforslag under Tor (anbefalt)">
-<!ENTITY torbutton.prefs.shutdown "SlÃ¥ 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 "Skru av lagring av Ã¸kter (anbefalt)">
-<!ENTITY torbutton.prefs.headers "Topptekst">
-<!ENTITY torbutton.prefs.refererspoofing "Referent-simulering">
-<!ENTITY torbutton.prefs.spoofblank "Simuler blank referent nÃ¥r du bruker Tor (kan gjÃ¸re at enkelte sider ikke fungerer)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referent-simulering nÃ¥r du bruker Tor (simulerer referenter pÃ¥ tvers av domener)">
-<!ENTITY torbutton.prefs.nospoof "Ingen referent-simulering nÃ¥r du bruker Tor (sender referenter som normalt)">
-<!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 ei gjenopprettet Ã¸kt, 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-filer (farlig)">
-<!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte Ã¸kter (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 ved veksling (valgfritt)">
-<!ENTITY torbutton.prefs.close_nontor "Lukk alle ikke-tor-vinduer og faner ved veksling (valgfritt)">
-<!ENTITY torbutton.prefs.block_links "Blokker klikking av lenker og oppdatering av sider fra forskjellige Tor-statuser (valgfritt)">
-<!ENTITY torbutton.prefs.jar_certs "Lagre SSL-sertifikater i forskjellige JAR-filer for Tor/ikke-Tor (anbefalt)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Lagre CA-sertifikater i forskjellige JAR-filer for Tor/ikke-Tor (anbefalt)">
-<!ENTITY torbutton.prefs.locked_mode "Skru av Knappen og Hurtigtaster for Ã¥ unngÃ¥ uhell med veksling">
-<!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 forvalg">
 <!ENTITY torbutton.prefs.test_settings "Test innstillinger">
-<!ENTITY torbutton.prefs.test_auto "Test mine Tor-innstillinger  fÃ¸rste gang jeg veksler hver gang Firefox starter opp">
-<!ENTITY torbutton.prefs.disable_livemarks "Skru av livemarks-oppdateringer under Tor-bruk">
-<!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 Ã¸kta 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 mellomtjenere for:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UnngÃ¥ Ã¥ bruke noen av vertsnavnene ovenfor">
-<!ENTITY torbutton.prefs.spoofreresh "Simuler oppdatering av siden">
-<!ENTITY torbutton.prefs.refereroptions "Innstillinger for referent-simulering">
-<!ENTITY torbutton.prefs.nospoof "Ingen referent-simulering nÃ¥r du bruker Tor (sender referenter som normalt)">
-<!ENTITY torbutton.prefs.spoofroot "Simuler mappen som inneholder siden">
-<!ENTITY torbutton.prefs.spoofdomain "Simuler domenet som referent">
-<!ENTITY torbutton.prefs.spoofblank "Simuler blank referent nÃ¥r du bruker Tor (kan gjÃ¸re at enkelte sider ikke fungerer)">
 <!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
@@ -132,17 +43,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 "Skru av livemarks-oppdateringer under Tor-bruk">
-<!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 "Omdiriger 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 transmellomtjener eller Tor-ruter)">
 <!ENTITY torbutton.prefs.priv_caption "Personvernsinnstillinger">
 <!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleserÃ¸kt)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "Javascript kan skrus pÃ¥ per side via NoScript-funksjonsknappen.">
 <!ENTITY torbutton.prefs.sec_high "HÃ¸y">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er som forvalg slÃ¥tt av for alle nettsteder.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "De fleste lyd- og video -formatene er avskrudd.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM er det eneste kodeket som fremdeles er pÃ¥skrudd.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Noen fonter og miniatyrbilder vises kanskje ikke riktig.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fonter som kommer fra nettsiden er blokkert.">
 <!ENTITY torbutton.prefs.sec_custom "Egendefinerte verdier">
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 32c680f..12364fc 100644
--- a/nds/torbutton.dtd
+++ b/nds/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 "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 "(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/ne/torbutton.dtd b/ne/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ne/torbutton.dtd
+++ b/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,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 "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 "(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/nl/torbutton.dtd b/nl/torbutton.dtd
index 5f4e8d6..1fac12d 100644
--- a/nl/torbutton.dtd
+++ b/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 "Geen verwijzer spoof tijdens Tor gebruik (verstuurd verwijzing als normaal)">
-<!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 "Deactiveren livemarks updates tijdend Tor gebruik">
-<!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 "Geen verwijzer spoof tijdens Tor gebruik (verstuurd verwijzing als normaal)">
-<!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 "Deactiveren livemarks updates tijdend Tor gebruik">
-<!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/nl_BE/torbutton.dtd b/nl_BE/torbutton.dtd
index fa36481..4a10a68 100644
--- a/nl_BE/torbutton.dtd
+++ b/nl_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 "Gebruik aangepaste 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 "Poort:">
-<!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 "Standaardinstellingen Herstellen">
 <!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 "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 "(aanbevolen)">
-<!ENTITY torbutton.prefs.dtd_optional "(optioneel)">
-<!ENTITY torbutton.prefs.dtd_crucial "(cruciaal)">
-<!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/nn/torbutton.dtd b/nn/torbutton.dtd
index f8a59f2..aa6f9ee 100644
--- a/nn/torbutton.dtd
+++ b/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 "Bruk 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 "Personvern- og tryggingsinnstillingar â€¦">
 <!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 "Innstillingar for Tor-nettverket">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "SjÃ¥ etter oppdatering for Tor Browser â€¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Infokapselvern â€¦">
 <!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 "Personvern- og tryggingsinnstillingar">
-<!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 "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 "(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 "Personverninnstillingar">
 <!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 "HÃ¸g">
 <!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 "SjÃ¸lvvalde verdiar">
diff --git a/nso/torbutton.dtd b/nso/torbutton.dtd
index 32c680f..12364fc 100644
--- a/nso/torbutton.dtd
+++ b/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,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 "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 "(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/oc/torbutton.dtd b/oc/torbutton.dtd
index 32c680f..12364fc 100644
--- a/oc/torbutton.dtd
+++ b/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,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 "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 "(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/or/torbutton.dtd b/or/torbutton.dtd
index 8abbd8f..192c309 100644
--- a/or/torbutton.dtd
+++ b/or/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "à¬Ÿà¬°à¬¬à¬Ÿà¬¨ à¬ªà¬¸à¬¨àà¬¦à¬®à¬¾à¬¨">
 <!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 "à¬ªàà¬°à¬¾à¬‡à¬à¬•àà¬¸à¬¿ à¬¬ààŸà¬¬à¬¹à¬¾à¬° à¬•à¬°à¬¨àà¬¤à">
 <!ENTITY torbutton.prefs.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 "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 "(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/pa/torbutton.dtd b/pa/torbutton.dtd
index defc8d8..43fac16 100644
--- a/pa/torbutton.dtd
+++ b/pa/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,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 "New Tor Circuit for this Site">
 <!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 "Privacy and Security Settingsâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "p">
-<!ENTITY torbutton.context_menu.about "...à¨Ÿà©‹à¨°à¨¬à¨Ÿà¨¨ à¨¬à¨¾à¨°à©‡">
-<!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 "à¨Ÿà©‹à¨° 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 "à¨Ÿà©‹à¨°à¨¬à¨Ÿà¨¨">
 <!ENTITY torbutton.button.tooltip "à¨Ÿà©‹à¨°à¨¬à¨Ÿà¨¨ à¨¶à©à¨°à©‚ à¨•à¨°à¨¨ à¨²à¨ˆ à¨•à¨²à¨¿à©±à¨• à¨•à¨°à©‹">
 <!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 "à¨¡à¨¾à¨‡à¨¨à©‡à¨®à¨¿à¨• à¨¸à¨®à¨—à¨°à©€">
-<!ENTITY torbutton.prefs.cookies "à¨•à©‚à¨•à©€à©›">
-<!ENTITY torbutton.prefs.cache "à¨•à©ˆà¨¶">
-<!ENTITY torbutton.prefs.history "à¨…à¨¤à©€à¨¤">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!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 "à¨¹à©ˆà©±à¨¡à¨°">
-<!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 "à¨—à¨¼à©ˆà¨°-à¨Ÿà©‹à¨°">
-<!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 "à¨¬à©°à¨¦ à¨•à¨°à¨¨ à¨¸à¨¥à¨¿à¨¤à©€">
-<!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 "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 "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 "(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 "à¨ªà¨°à¨¾à¨ˆà¨µà©‡à¨¸à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
 <!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/pap/torbutton.dtd b/pap/torbutton.dtd
index 32c680f..12364fc 100644
--- a/pap/torbutton.dtd
+++ b/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,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 "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 "(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/pl/torbutton.dtd b/pl/torbutton.dtd
index f617b53..eabc8ef 100644
--- a/pl/torbutton.dtd
+++ b/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/pms/torbutton.dtd b/pms/torbutton.dtd
index 32c680f..12364fc 100644
--- a/pms/torbutton.dtd
+++ b/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,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 "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 "(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/ps/torbutton.dtd b/ps/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ps/torbutton.dtd
+++ b/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,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 "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 "(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/pt/torbutton.dtd b/pt/torbutton.dtd
index 5e0ef84..67e8649 100644
--- a/pt/torbutton.dtd
+++ b/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/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 9d22863..5cd5932 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "PreferÃªncias do Torbutton">
 <!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 as configuraÃ§Ãµes de proxy personalizadas">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy de HTTP:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy do Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro de 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 do seu Navegador Tor.">
-<!ENTITY torbutton.about.code "Contribuem programando:">
-<!ENTITY torbutton.about.maintainer "Mantenedor:">
-<!ENTITY torbutton.about.security_review "RevisÃ£o de SeguranÃ§a:">
-<!ENTITY torbutton.about.donate "Se vocÃª gosta de usar Tor, considere fazer">
-<!ENTITY torbutton.about.make_donation "fazer uma doaÃ§Ã£o.">
 <!ENTITY torbutton.pref_connection.notice "Desabilitar o Torbutton para modificar essas configuraÃ§Ãµes.">
 <!ENTITY torbutton.pref_connection.more_info "Para mais informaÃ§Ãµes">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
 <!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 "Alternar o Status do Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a...">
 <!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 "Verificar atualizaÃ§Ãµes do Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes contra Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar o URL do Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir o URL do Tor em uma nova Aba">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir o URL do Tor em uma nova Janela">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a">
-<!ENTITY torbutton.prefs.block_thread "Bloquear as leituras do histÃ³rico durante a utilizaÃ§Ã£o do Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquear os registros no histÃ³rico durante a utilizaÃ§Ã£o do Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear as leituras do histÃ³rico durante o Non-Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear os registros no histÃ³rico durante o Non-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 cachÃª de memÃ³ria e de disco durante o uso do Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies nÃ£o-Tor em um recipiente protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Usar o DiÃ¡logo de ProteÃ§Ãµes dos Cookies para escolher">
-<!ENTITY torbutton.prefs.mmm_cookies "Eu gerenciarei meus cookies manualmente (perigoso)">
-<!ENTITY torbutton.prefs.clear_cookies "Limpar os cookies ao modificar o status do Tor">
-<!ENTITY torbutton.prefs.disable_plugins "Desabilitar plugins durante o uso do Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Bloquear os cÃ³digos perigosos de javascript  (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolar os conteÃºdos dinÃ¢micos do status atual do Tor (crucial)">
-<!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 (crucial)">
-<!ENTITY torbutton.prefs.dynamic "ConteÃºdo DinÃ¢mico">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "CachÃª">
-<!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 quando o navegador 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 da SessÃ£o (recomendado)">
-<!ENTITY torbutton.prefs.headers "CabeÃ§alhos">
-<!ENTITY torbutton.prefs.refererspoofing "Burlar o endereÃ§o da pÃ¡gina anterior (referer)">
-<!ENTITY torbutton.prefs.spoofblank "Burlar a identificaÃ§Ã£o de origem (referer) vazia durante o uso do Tor (pode quebrar alguns sites)">
-<!ENTITY torbutton.prefs.smartspoof "Falsificar de forma inteligente a origem da submissÃ£o de dados durante o uso do Tor (falsifica a origem em domÃnios cruzados)">
-<!ENTITY torbutton.prefs.nospoof "O nÃ£o envio de dados falsos durante o uso do Tor (envia apenas submissÃµes normais)">
-<!ENTITY torbutton.prefs.disable_domstorage "Desabilitar o armazenamento do DOM durante o uso do Tor (crucial)">
-<!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 iniciada, definir o status do Tor para:">
-<!ENTITY torbutton.prefs.startup_tor "Durante a inicializaÃ§Ã£o do navegador, definir o status do Tor para:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar o recipiente de cookies/limpar os cookies em caso de falha do Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Armazenar os cookies, Tor ou nÃ£o-Tor, em recipientes 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 do status atual do Tor (crucial)">
-<!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 (Secure Socket Layer) em recipientes distintos, para Tor/nÃ£o-Tor (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Armazenar certificados CA (Certificate of Authority) em recipientes distintos, para Tor/nÃ£o Tor (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Desabilitar botÃµes e atalhos para prevenir mudanÃ§as acidentais">
-<!ENTITY torbutton.prefs.startup_state "Durante inicializaÃ§Ã£o  normal, definir estado do Tor como:">
-<!ENTITY torbutton.prefs.shutdown_state "Modo de desligamento">
-<!ENTITY torbutton.prefs.startup "Iniciar">
-<!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Ãµes">
 <!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 "Desabilitar atualizaÃ§Ãµes dos livemarks ao utilizar o Tor">
-<!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 servidores acima">
-<!ENTITY torbutton.prefs.spoofreresh "AtualizaÃ§Ã£o de Fraudes">
-<!ENTITY torbutton.prefs.refereroptions "OpÃ§Ãµes para burlar o endereÃ§o de origem (referer)">
-<!ENTITY torbutton.prefs.nospoof "O nÃ£o envio de dados falsos durante o uso do Tor (envia apenas submissÃµes normais)">
-<!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 "Burlar a identificaÃ§Ã£o de origem (referer) vazia durante o uso do Tor (pode quebrar alguns sites)">
 <!ENTITY torbutton.cookiedialog.title "Gerenciar ProteÃ§Ãµes de 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 "Desabilitar atualizaÃ§Ãµes dos livemarks ao utilizar o 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.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
 <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou dados do website (permite NavegaÃ§Ã£o em Modo Privado)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado em uma base site po site atravÃ©s do botÃ£o da barra de ferramentas NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Alta">
 <!ENTITY torbutton.prefs.sec_all_js_desc "Por padrÃ£o o JavaScript Ã© desabilitado em todos os sites.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de Ã¡udio e vÃdeo foram desabilitados.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM Ã© o Ãºnico codec que permanece ativo.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Algumas fontes e Ãcones podem ser exibidos incorretamente.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sÃtio web estÃ£o bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd
index eb3c0b1..ffeb7e8 100644
--- a/ro/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Circuit Tor nou pentru acest site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "ConfigurÄƒri de securitate È™i intimitate...">
 <!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 "ConfigurÄƒri reÈ›eaua Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "VerificÄƒ pentru actualizÄƒri navigator Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProtecÈ›ie cookie...">
 <!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.privacy_security_settings "ConfigurÄƒri de intimitate È™i 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 "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 "GestioneazÄƒ ProtecÅ£ii Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protejat">
 <!ENTITY torbutton.cookiedialog.domainCol "Gazda">
@@ -132,17 +43,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 "Disable livemarks updates during Tor usage">
-<!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.priv_caption "ConfigurÄƒri de intimitate">
 <!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 poate fi activat Ã®n regim per-site prin butonul NoScript din bara de instrumente. ">
 <!ENTITY torbutton.prefs.sec_high "ÃŽnalt">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript este dezactivat implicit pe toate site-urile.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "Cele mai multe formate audio È™i video sunt dezactivate.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM este singurul codec care rÄƒmÃ¢ne activat.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Unele fonturi È™i pictograme pot fi afiÈ™ate incorect.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "FiÈ™ierele font oferite de site sunt blocate.">
 <!ENTITY torbutton.prefs.sec_custom "Valori personalizate">
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 80e6382..36a27e6 100644
--- a/ru/torbutton.dtd
+++ b/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/ru at petr1708/torbutton.dtd b/ru at petr1708/torbutton.dtd
index 3db6f27..c7c2f3a 100644
--- a/ru at petr1708/torbutton.dtd
+++ b/ru at petr1708/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 "Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°">
-<!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,94 +16,18 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð¯">
 <!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 "Ð˜Ð·Ð¼Ñ£Ð½Ð¸Ñ‚ÑŒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ñ–Ðµ Tor">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ€¦">
 <!ENTITY torbutton.context_menu.preferences.key "ÐÐª">
-<!ENTITY torbutton.context_menu.about "Ðž Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "Ðž">
 <!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 "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ URL Tor">
-<!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 "Privacy and 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 "ÐžÑ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ 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 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 "Ð’Ð¾Ð·ÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ/Ð¾Ñ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ cookies Ð¿Ð¾ÑÐ»Ñ£ Ð°Ð²Ð°Ñ€Ñ–Ð¸ Firefox (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð²ÑÑ£ cookies Ð²ÑŠ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ñ‹Ñ…ÑŠ Ñ„Ð°Ð¹Ð»Ð°Ñ…ÑŠ (Ð¾Ð¿Ð°ÑÐ½Ð¾)">
-<!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 "ÐÐµ Ð¿Ð¸ÑÐ°Ñ‚ÑŒ 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 4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS 5">
 <!ENTITY torbutton.prefs.no_proxies_on "ÐÑ£Ñ‚ÑŠ Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð´Ð»Ñ: ">
@@ -121,12 +35,6 @@
 Ð¿Ð¾Ð»Ðµ
 
  Ð²Ñ‹ÑˆÐµ">
-<!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 "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ–Ðµ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¾Ð¹ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð˜Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°">
@@ -147,17 +55,6 @@
 Ð½Ð¾Ð²Ñ‹Ðµ
 
  Cookies">
-<!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 "ÐŸÑ€Ð¾Ð·Ñ€Ð°Ñ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ€Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ñ–Ñ (Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚ÑŠ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ñ…ÑŠ transproxy Ð¸Ð»Ð¸ Tor-Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð°)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "ÐÐµ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð»ÑŠ Ð¾Ð±Ð¾Ð·Ñ€Ñ£Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ðµ ÑÑŠ Ð¿Ð¾ÑÑ£Ñ‰Ð°ÐµÐ¼Ñ‹Ñ…ÑŠ ÑÐ°Ð¹Ñ‚Ð¾Ð²ÑŠ (Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÐµÑ‚ÑŠ Ñ„ÑƒÐ½ÐºÑ†Ñ–ÑŽ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð°Ð³Ð¾ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð°)">
@@ -191,8 +88,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/scn/torbutton.dtd b/scn/torbutton.dtd
index 32c680f..12364fc 100644
--- a/scn/torbutton.dtd
+++ b/scn/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 "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 "(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/sco/torbutton.dtd b/sco/torbutton.dtd
index b7472f6..4d9b9d6 100644
--- a/sco/torbutton.dtd
+++ b/sco/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preeferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settins">
 <!ENTITY torbutton.prefs.recommended_settings "Uise the recommendit proxy settins fer ma version o Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Uise Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Uise Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Uise custom proxy settins">
 <!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 Hoast:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Pretects the preevacie o yer Tor brousin.">
-<!ENTITY torbutton.about.code "Code Contreebuters:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Securitie Luikower:">
-<!ENTITY torbutton.about.donate "Gif ye lyk uisin Tor, than ye micht conseeder">
-<!ENTITY torbutton.about.make_donation "donatin.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton tae chynge thir settins.">
 <!ENTITY torbutton.pref_connection.more_info "Mair information">
 <!ENTITY torbutton.pref_connection_more_info.title "Heelp">
@@ -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 "Aneat 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 "Capie Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Apen the Tor URL in ae new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Apen the Tor URL in ae new Windae">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clap tae ineetialise Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block histerie reads durin Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block histerie writes durin Tor (recommendit)">
-<!ENTITY torbutton.prefs.block_nthread "Block histerie reads durin Non-Tor (aen optie)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block histerie writes durin Non-Tor (aen optie)">
-<!ENTITY torbutton.prefs.clear_history "Clear histerie oan Tor toggle (aen optiel)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache n clear aw cache oan Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk n memorie cache access durin Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in ae fendit jar">
-<!ENTITY torbutton.prefs.cookie_protection "Uise the Cookie Fendins Dialog tae chuise">
-<!ENTITY torbutton.prefs.mmm_cookies "Ah'll manage ma cookies masel (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies oan Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins durin Tor uisage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Huik dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynameec content tae Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates durin Tor uissage">
-<!ENTITY torbutton.prefs.set_uagent "Set uiser agent fer Tor uissage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynameec Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Histerie">
-<!ENTITY torbutton.prefs.no_search "Disable rake suggestions durin Tor (recommendit)">
-<!ENTITY torbutton.prefs.shutdown "Turn-aff">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies durin Tor-enabled brouser turnaff">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies durin onie brouser turnaff">
-<!ENTITY torbutton.prefs.no_shutdown "Dinna clear ma cookies at turnaff">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Hainin (recommendit)">
-<!ENTITY torbutton.prefs.headers "Heiders">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofin">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer durin Tor uissage (micht break some steids)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof durin Tor uissage (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "Nae referer spoof durin Tor uissage (sends referers aes normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage durin Tor uissage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block passwaird+form hainin durin Tor (recommendit)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form hainin durin Non-Tor (aen optie)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Oan session restored stairtup, set Tor state tae:">
-<!ENTITY torbutton.prefs.startup_tor "Oan brouser stairtup, set Tor state tae:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Relaid cookie jar/clear cookies oan Firefox crash (recommendit)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store baith Tor n Non-Tor cookies in fendit jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommendit)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access tae histerie navigation tae Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windaes tae multiples o 50px durin Tor uissage (recommendit)">
-<!ENTITY torbutton.prefs.close_tor "Clase aw Tor windaes n tabs oan toggle (aen optie)">
-<!ENTITY torbutton.prefs.close_nontor "Clase aw Non-Tor windaes n tabs oan toggle (aen optie)">
-<!ENTITY torbutton.prefs.block_links "Block airtin claps n page relaids fae different Tor states (aen optie)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars fer Tor/Non-Tor (recommendit)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars fer Tor/Non-Tor (recommendit)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button n Hotkeys tae hinder accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "Oan normal stairtup, set Tor state tae:">
-<!ENTITY torbutton.prefs.shutdown_state "Turnaff state">
-<!ENTITY torbutton.prefs.startup "Stairtup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access tae netwairk fae file:// urls (recommendit)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access tae netwairrk fae file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defauts">
 <!ENTITY torbutton.prefs.test_settings "Test Settins">
-<!ENTITY torbutton.prefs.test_auto "Test ma Tor settins efter the first time that Ah toggle oan ilcka Firefox stairt">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemaurks updates durin Tor uissage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Dinna screeve Tor cookies tae disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Dinna screeve Non-Tor cookies tae disk">
-<!ENTITY torbutton.prefs.session_restore "Hae the session store hain n restore thir tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs laidit in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs laidit in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nae Proxies fer: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warnishment: Avoid uisin onie hostnames abuin">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofin Opties">
-<!ENTITY torbutton.prefs.nospoof "Nae referer spoof durin Tor uissage (sends referers aes normal)">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containin fauder o the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain aes referer">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer durin Tor uissage (micht break some steids)">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Fendins">
 <!ENTITY torbutton.cookiedialog.lockCol "Fendit">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remui Aw But Fendit">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Fend New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Dinna Fend New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemaurks updates durin Tor uissage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommendit)">
-<!ENTITY torbutton.prefs.dtd_optional "(aen optie)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Reguid Torbutton updates throo Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "AutÃ¦mateeclie uise ae different rake engine whan presented wi ae 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 Torifeecation (needs custom transproxy or Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "Dinna record brousin histerie or wabsteid data (enables Preevate Brousin 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/si_LK/torbutton.dtd b/si_LK/torbutton.dtd
index 6af9e51..e22ee55 100644
--- a/si_LK/torbutton.dtd
+++ b/si_LK/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Tor à¶¶à·œà¶à·Šà¶à¶¸à·š à·ƒà·à¶šà·ƒà·”à¶¸à·Š ">
 <!ENTITY torbutton.prefs.tor_settings "à¶¢à·à¶½ à¶…à¶à·”à¶»à·” à¶¸à·à¶»à·Šà¶œ à·ƒà·à¶šà·ƒà·”à¶¸à·Š">
 <!ENTITY torbutton.prefs.recommended_settings "à¶¸à¶œà·š Firefox à¶…à¶±à·”à·€à·à¶¯à¶º à·ƒà¶¯à·„à· à¶‹à¶ à·’à¶à¶¢à·à¶½ à¶…à¶à·”à¶»à·” à¶¸à·à¶»à·Šà¶œ à·ƒà·à¶šà·ƒà·”à¶¸à·Š à¶·à·à·€à·’à¶à· à¶šà¶»à¶±à·Šà¶±.">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy à¶·à·à·€à·’à¶à· à¶šà¶»à¶±à·Šà¶±">
 <!ENTITY torbutton.prefs.use_polipo "polipo à¶¢à·à¶½ à¶…à¶à·”à¶»à·” à¶¸à·à¶»à·Šà¶œ à·ƒà·à¶šà·ƒà·”à¶¸à·Š/proxy à¶·à·à·€à·’à¶à· à¶šà¶»à¶±à·Šà¶±">
 <!ENTITY torbutton.prefs.custom_settings "à¶”à¶¶à·š à¶»à·”à¶ à·’à¶º à¶…à¶±à·”à·€ à¶¢à·à¶½ à¶…à¶à·”à¶»à·” à¶¸à·à¶»à·Šà¶œ à·ƒà·à¶šà·ƒà·”à¶¸à·Š à¶·à·à·€à·’à¶à· à¶šà¶»à¶±à·Šà¶±.">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP à¶¢à·à¶½ à¶…à¶à·”à¶»à·” à¶¸à·à¶»à·Šà¶œ à·ƒà·à¶šà·ƒà·”à¶¸à·Š/proxy:">
@@ -10,14 +8,6 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher à¶±à·’à¶ºà·”à¶à·” à·ƒà·šà·€à·à¶¯à·à¶ºà¶š:">
 <!ENTITY torbutton.prefs.proxy.host.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 "New Tor Circuit for this Site">
 <!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 "Privacy and Security Settingsâ€¦">
 <!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 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 "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 "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Tor à¶…à¶à¶»à¶à·”à¶» à¶‰à¶à·’à·„à·à·ƒ à¶šà·’à¶ºà·€à·“à¶¸ à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶± (à¶à·“à¶»à¶«à·à¶à·Šà¶¸à¶š)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor à¶…à¶à¶»à¶à·”à¶» à¶‰à¶à·’à·„à·à·ƒ à¶½à·“à·€à·“à¶¸ à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶± (à¶±à·’à¶»à·Šà¶¯à·šà·à·’à¶)">
-<!ENTITY torbutton.prefs.block_nthread "Non-Tor à¶…à¶à¶»à¶à·”à¶» à¶‰à¶à·’à·„à·à·ƒ à¶šà·’à¶ºà·€à·“à¶¸ à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶± (à¶…à¶¸à¶à¶»)">
-<!ENTITY torbutton.prefs.block_nthwrite "Non-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 "Non-Tor à¶šà·”à¶šà·“ à¶†à¶»à¶šà·Šâ€à·‚à·’à¶ jar à¶‘à¶šà¶š à¶à·à¶±à·Šà¶´à¶à·Š à¶šà¶»à¶±à·Šà¶±">
-<!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 "Hook dangerous javascript (crucial)">
-<!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 "Referer spoofing">
-<!ENTITY torbutton.prefs.spoofblank "Tor à¶·à·à·€à·’à¶à¶ºà·™à¶¯à·“ Spoof blank referer (à·ƒà¶¸à·„à¶» à·ƒà¶ºà·’à¶§à·Š à¶¶à·’à¶¯à·“à¶¸à¶§ à·„à·à¶š)">
-<!ENTITY torbutton.prefs.smartspoof "Tor à¶·à·à·€à·’à¶à¶ºà·™à¶¯à·“  Smart referer spoof (spoofs cross domain referers)">
-<!ENTITY torbutton.prefs.nospoof "Referer spoof  à¶‘à¶šà¶šà·Š à¶±à·œà¶¸à·à¶ Tor à¶·à·à·€à·’à¶à¶ºà·™à¶¯à·“ (referers à·ƒà·à¶¸à·à¶±à·Šâ€à¶º à·€à·’à¶¯à·’à¶ºà¶§ à¶ºà·€à¶±à·Šà¶±)">
-<!ENTITY torbutton.prefs.disable_domstorage " Tor à¶·à·à·€à·’à¶à¶º à¶…à¶à¶»à¶à·”à¶» DOM à¶œà¶¶à¶©à·à·€ à¶…à¶¶à¶½ à¶šà¶»à¶±à·Šà¶± (à¶à·“à¶»à¶«à·à¶à·Šà¶¸à¶š) ">
-<!ENTITY torbutton.prefs.forms "à¶´à·à¶»à¶¸">
-<!ENTITY torbutton.prefs.block_tforms "Tor à¶…à¶à¶»à¶à·”à¶» à¶¸à·”à¶»à¶´à¶¯ à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶±+à¶´à·à¶»à¶¸ à·ƒà·”à¶»à¶šà·’à¶±à·Šà¶± (à¶±à·’à¶»à·Šà¶¯à·šà·‚à·’à¶)">
-<!ENTITY torbutton.prefs.block_ntforms "Non-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 "à·†à¶ºà¶»à·Šà·†à·œà¶šà·Šà·ƒà·Š à¶…à¶à·Šà·„à·’à¶§à·”à·€à·“à¶¸à¶šà¶¯à·“ à¶šà·”à¶šà·“  jar à¶±à·à·€à¶ à¶´à·Šâ€à¶»à·€à·šà·à¶±à¶º à¶šà¶»à¶±à·Šà¶±/à¶šà·”à¶šà·“ à¶‰à·€à¶à·Š à¶šà¶»à¶±à·Šà¶± (à¶±à·’à¶»à·Šà¶¯à·šà·à·’à¶)">
-<!ENTITY torbutton.prefs.dual_cookie_jars " Tor à·ƒà·„  Non-Tor à¶šà·”à¶šà·“ à¶†à¶»à¶šà·Šâ€à·‚à·’à¶ jars à·€à¶½ à¶œà¶¶à¶©à· à¶šà¶»à¶±à·Šà¶± (à¶…à¶±à¶à·”à¶»à·”à¶¯à·à¶ºà¶šà¶ºà·’)">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTP auth à·ƒà·à·ƒà·’ à¶‰à·€à¶à·Š à¶šà¶»à¶±à·Šà¶± (à¶±à·’à¶»à·Šà¶¯à·šà·à·’à¶)">
-<!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 "à¶§à·œà¶œà¶½à¶ºà·š à·ƒà·’à¶ºà¶½à·”à¶¸ Non-Tor à¶šà·€à·Šà·…à·” à·ƒà·„ à¶´à¶§à·’à¶à·’ à·€à·ƒà¶±à·Šà¶± (à¶…à¶¸à¶à¶»)">
-<!ENTITY torbutton.prefs.block_links "à·€à·’à·€à·’à¶° Tor à¶à¶à·Šà·€à¶ºà¶±à·Šà¶œà·š à·ƒà¶¶à·à¶¯à·”à¶¸à·Š à¶šà·Šà¶½à·’à¶šà·Š à¶šà·’à¶»à·“à¶¸à·Š à·ƒà·„ à¶´à·’à¶§à·” à¶±à·à·€à¶ à¶´à·Šâ€à¶»à·€à·šà·à¶±à¶º à·€à·“à¶¸à·Š à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶± (à¶…à¶¸à¶à¶»)">
-<!ENTITY torbutton.prefs.jar_certs "à·€à·™à¶±à¶¸ jars à·€à¶½ SSL certs à¶œà¶¶à¶©à· à¶šà¶»à¶±à·Šà¶± Tor/Non-Tor à·ƒà¶¯à·„à· (à¶…à¶±à·”à¶¸à¶)">
-<!ENTITY torbutton.prefs.jar_ca_certs "à·€à·™à¶±à¶¸ jars à·€à¶½ CA certs à¶œà¶¶à¶©à· à¶šà¶»à¶±à·Šà¶± Tor/Non-Tor à·ƒà¶¯à·„à· (à¶…à¶±à·”à¶¸à¶)">
-<!ENTITY torbutton.prefs.locked_mode "à·„à¶¯à·’à·ƒà·’ à¶§à·œà¶œà¶½à¶ºà¶±à·Š à·€à·à¶½à¶šà·Šà·€à·“à¶¸à¶§ Button and Hotkeys à¶¯à·”à¶¶à¶½ à¶šà¶»à¶±à·Šà¶± ">
-<!ENTITY torbutton.prefs.startup_state "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º à¶‡à¶»à¶¹à·”à¶¸à·šà¶¯à·“ Tor à¶à¶à·Šà·€à¶º à·ƒà·à¶šà·ƒà·™à¶±à·Šà¶±à·š: ">
-<!ENTITY torbutton.prefs.shutdown_state "à·€à·à·ƒà·”à¶¸à·Š à¶à¶à·Šà·€à¶º">
-<!ENTITY torbutton.prefs.startup "à¶‡à¶»à¶¹à·”à¶¸">
-<!ENTITY torbutton.prefs.block_tor_file_net "à¶œà·œà¶±à·”à·€à·™à¶±à·Š  à¶¢à·à¶½à¶ºà¶§ Tor à¶´à·Šâ€à¶»à·€à·šà·à¶±à¶º à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶±:// urls (à¶…à¶±à·”à¶¸à¶)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "à¶œà·œà¶±à·”à·€à·™à¶±à·Š  à¶¢à·à¶½à¶ºà¶§ Non-Tor à¶´à·Šâ€à¶»à·€à·šà·à¶±à¶º à¶…à·€à·„à·’à¶» à¶šà¶»à¶±à·Šà¶±:// urls ">
 <!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 à¶šà·”à¶šà·“ à¶à·à¶§à·’à¶ºà·™à·„à·’ à¶±à·œà¶½à·’à¶ºà¶±à·Šà¶±">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Non-Tor à¶šà·”à¶šà·“ à¶à·à¶§à·’à¶ºà·™à·„à·’ à¶±à·œà¶½à·’à¶ºà¶±à·Šà¶±">
-<!ENTITY torbutton.prefs.session_restore "à·ƒà·à·ƒà·’ à¶œà¶¶à¶©à· à·ƒà·”à¶»à·à¶šà·“à¶¸ à¶œà·™à¶± à¶¸à·™à¶¸ à¶´à¶§à·’à¶à·’ à¶±à·à·€à¶ à¶œà¶¶à¶©à· à¶šà¶»à¶±à·Šà¶±: ">
-<!ENTITY torbutton.prefs.nontor_tabs "Non-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 Spoofing à·€à·’à¶šà¶½à·Šà¶´ ">
-<!ENTITY torbutton.prefs.nospoof "Referer spoof  à¶‘à¶šà¶šà·Š à¶±à·œà¶¸à·à¶ Tor à¶·à·à·€à·’à¶à¶ºà·™à¶¯à·“ (referers à·ƒà·à¶¸à·à¶±à·Šâ€à¶º à·€à·’à¶¯à·’à¶ºà¶§ à¶ºà·€à¶±à·Šà¶±)">
-<!ENTITY torbutton.prefs.spoofroot "à¶´à·’à¶§à·”à·€ à¶…à¶©à¶‚à¶œà·” à·†à·à¶½à·Šà¶©à¶»à¶º à·€à·Šâ€à¶ºà·à¶¢ à¶šà¶»à¶±à·Šà¶±">
-<!ENTITY torbutton.prefs.spoofdomain "referer à·€à·’à¶¯à·’à¶ºà¶§ à·€à·ƒà¶¸ spoof  à¶šà¶»à¶±à·Šà¶± ">
-<!ENTITY torbutton.prefs.spoofblank "Tor à¶·à·à·€à·’à¶à¶ºà·™à¶¯à·“ Spoof blank referer (à·ƒà¶¸à·„à¶» à·ƒà¶ºà·’à¶§à·Š à¶¶à·’à¶¯à·“à¶¸à¶§ à·„à·à¶š)">
 <!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 "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 "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/sk/torbutton.dtd b/sk/torbutton.dtd
index a157dff..b9272be 100644
--- a/sk/torbutton.dtd
+++ b/sk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Nastavenia">
 <!ENTITY torbutton.prefs.tor_settings "Nastavenie proxy">
 <!ENTITY torbutton.prefs.recommended_settings "PouÅ¾iÅ¥ odporÃºÄanÃ© nastavenie proxy pre moju verziu Firefoxu">
-<!ENTITY torbutton.prefs.use_privoxy "PouÅ¾iÅ¥ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "PouÅ¾iÅ¥ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "PouÅ¾iÅ¥ vlastnÃ© nastavenie proxy">
 <!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 "O Torbutton">
-<!ENTITY torbutton.about.version "Verzia:">
-<!ENTITY torbutton.about.summary "StarÃ¡ sa o sÃºkromie vÃ¡Å¡ho prehÄ¾adania Toru">
-<!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">
@@ -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 " Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Nastavenia SÃºkromia a BezpeÄnosti...">
 <!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 "SieÅ¥ovÃ© Nastavenia Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "SkontrolovaÅ¥ aktualizÃ¡cie Tor Browsera">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana Cookies...">
 <!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 "Nastavenia SÃºkromia a BezpeÄnosti">
-<!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 "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 "(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.priv_caption "Nastavenia SÃºkromia">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
@@ -178,8 +78,6 @@ Press TAB to Save and go to next string">
 <!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 "VysokÃ½">
 <!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 "VlastnÃ© parametre">
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 80478f3..4428d6a 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Nastavenia Totbutton">
 <!ENTITY torbutton.prefs.tor_settings "Nastavenia proxy">
 <!ENTITY torbutton.prefs.recommended_settings "PouÅ¾i odporÃºÄanÃ© nastavenia proxy pre moju verziu Firefoxu">
-<!ENTITY torbutton.prefs.use_privoxy "PouÅ¾iÅ¥ Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "PouÅ¾iÅ¥ Polipo">
 <!ENTITY torbutton.prefs.custom_settings "VlastnÃ© nastavenia proxy">
 <!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 "O Torbutton">
-<!ENTITY torbutton.about.version "Verzia:">
-<!ENTITY torbutton.about.summary "ChrÃ¡ni sÃºkromie prehliadania cez Tor.">
-<!ENTITY torbutton.about.code "Prispievatelia do kÃ³du:">
-<!ENTITY torbutton.about.maintainer "SprÃ¡vca:">
-<!ENTITY torbutton.about.security_review "BezpeÄnostnÃ¡ previerka:">
-<!ENTITY torbutton.about.donate "Ak sa vÃ¡m pÃ¡Äi Tor, zvÃ¡Å¾te">
-<!ENTITY torbutton.about.make_donation "podporu darom.">
 <!ENTITY torbutton.pref_connection.notice "Pre zmenu tÃ½chto nastavenÃ vypnite Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "ÄŽaÄ¾Å¡ie informÃ¡cie">
 <!ENTITY torbutton.pref_connection_more_info.title "PomocnÃk">
@@ -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 "PrepnÃºÅ¥ stav Tor">
-<!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 "O 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 "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "KopÃrovaÅ¥ Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "OtvoriÅ¥ Tor URL v novom Liste">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "OtvoriÅ¥ Tor URL v novom Okne">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "KliknutÃm zaveÄte Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
-<!ENTITY torbutton.prefs.block_thread "BlokovaÅ¥ ÄÃtanie histÃ³rie poÄas Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.block_thwrite "BlokovaÅ¥ zapisovanie histÃ³rie poÄas Tor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.block_nthread "BlokovaÅ¥ ÄÃtanie histÃ³rie poÄas neTor (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.block_nthwrite "BlokovaÅ¥ zapisovanie histÃ³rie poÄas neTor (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.clear_history "VymazaÅ¥ histÃ³riu pri zmene stavu Tor (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.clear_cache "BlokovaÅ¥ zÃ¡sobnÃk disku pre Tor a vyÄistiÅ¥ vÅ¡etky zÃ¡sobnÃky pri zmene stavu Tor">
-<!ENTITY torbutton.prefs.block_cache "BlokovaÅ¥ zÃ¡sobnÃk disku a pamÃ¤te poÄas Tor">
-<!ENTITY torbutton.prefs.cookie_jars "SkladovaÅ¥ neTor cookies na chrÃ¡nenom mieste">
-<!ENTITY torbutton.prefs.cookie_protection "PouÅ¾iÅ¥ dialÃ³govÃ© okno na vÃ½ber Ochrany Cookie">
-<!ENTITY torbutton.prefs.mmm_cookies "Budem si sÃ¡m spravovaÅ¥ cookies (nebezpeÄnÃ©)">
-<!ENTITY torbutton.prefs.clear_cookies "VymazaÅ¥ cookies pri zmene stavu Tor">
-<!ENTITY torbutton.prefs.disable_plugins "ZakÃ¡zaÅ¥ prÃpojnÃ© moduly poÄas Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.kill_bad_js "ZachytiÅ¥ nebezpeÄnÃ½ javascript (kritickÃ©)">
-<!ENTITY torbutton.prefs.isolate_content "IzolovaÅ¥ dynamickÃ½ obsah pre Tor stav (kritickÃ©)">
-<!ENTITY torbutton.prefs.no_updates "ZakÃ¡zaÅ¥ aktualizÃ¡cie poÄas Tor">
-<!ENTITY torbutton.prefs.set_uagent "NastaviÅ¥ informÃ¡cie o zariadenÃ pri pouÅ¾ÃvanÃ Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.dynamic "DynamickÃ½ obsah">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "ZÃ¡sobnÃky">
-<!ENTITY torbutton.prefs.history "HistÃ³ria">
-<!ENTITY torbutton.prefs.no_search "ZakÃ¡zaÅ¥ nÃ¡vrhy vyhÄ¾adÃ¡vania poÄas Tor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.shutdown "Vypnutie">
-<!ENTITY torbutton.prefs.tor_shutdown "VymazaÅ¥ Tor cookies pri ukonÄenÃ prehliadaÄa so zapnutÃ½m Tor">
-<!ENTITY torbutton.prefs.all_shutdown "VymazaÅ¥ cookies pri kaÅ¾dom ukonÄenÃ prehliadaÄa">
-<!ENTITY torbutton.prefs.no_shutdown "NevymazÃ¡vaÅ¥ cookies pri vypnutÃ">
-<!ENTITY torbutton.prefs.disable_sessionstore "ZakÃ¡zaÅ¥ ukladanie relÃ¡cie (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.headers "HlaviÄky">
-<!ENTITY torbutton.prefs.refererspoofing "Referer predstieranie">
-<!ENTITY torbutton.prefs.spoofblank "PredstieraÅ¥ prÃ¡zdny referer poÄas Tor (mÃ´Å¾e znefunkÄniÅ¥ niektorÃ© strÃ¡nky)">
-<!ENTITY torbutton.prefs.smartspoof "InteligentnÃ© predstieranie referera poÄas Tor (predstiera referery medzi domÃ©nami)">
-<!ENTITY torbutton.prefs.nospoof "NepredstieraÅ¥ referer poÄas Tor (odosiela normÃ¡lne referery)">
-<!ENTITY torbutton.prefs.disable_domstorage "ZakÃ¡zaÅ¥ skladovanie DOM poÄas Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.forms "FormulÃ¡re">
-<!ENTITY torbutton.prefs.block_tforms "BlokovaÅ¥ ukladanie hesla a formulÃ¡ra poÄas Tor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.block_ntforms "BlokovaÅ¥ ukladanie hesla a formulÃ¡ra poÄas neTor (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "neTor">
-<!ENTITY torbutton.prefs.restore_tor "Pri spustenÃ s obnovenÃm relÃ¡cie nastaviÅ¥ stav Tor na:">
-<!ENTITY torbutton.prefs.startup_tor "Pri spustenÃ prehliadaÄa nastaviÅ¥ stav Tor na:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Znovu naÄÃtaÅ¥ cookie umiestnenie/vymazaÅ¥ cookies pri pÃ¡de Firefox (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "SkladovaÅ¥ Tor aj neTor cookies na chrÃ¡nenom mieste (nebezpeÄnÃ©)">
-<!ENTITY torbutton.prefs.clear_http_auth "VyÄiÅ¡tiÅ¥ HTTP auth relÃ¡cie (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.block_js_history "IzolovaÅ¥ prÃstup k navigÃ¡cii v histÃ³rii pre stav Tor (kritickÃ©)">
-<!ENTITY torbutton.prefs.resize_on_toggle "MeniÅ¥ veÄ¾kosÅ¥ okien po nÃ¡sobkoch 50px poÄas Tor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.close_tor "ZatvoriÅ¥ vÅ¡etky Tor oknÃ¡ a zÃ¡loÅ¾ky pri prepnutÃ stavu (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.close_nontor "ZatvoriÅ¥ vÅ¡etky neTor oknÃ¡ a zÃ¡loÅ¾ky pri prepnutÃ stavu (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.block_links "BlokovaÅ¥ kliknutia na odkazy a obnovenia strÃ¡nok z odliÅ¡nÃ½ch stavov Tor (voliteÄ¾nÃ©)">
-<!ENTITY torbutton.prefs.jar_certs "SkladovaÅ¥ SSL certifikÃ¡ty na oddelenom miesto pre Tor/neTor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.jar_ca_certs "SkladovaÅ¥ certifikÃ¡ty CertifikaÄnÃ½ch autorÃÅ¥ na oddelenom mieste pre Tor/neTor (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.locked_mode "ZakÃ¡zaÅ¥ tlaÄidlo a klÃ¡vesovÃ© skratky na zabrÃ¡nenie neÃºmyselnÃ©ho prepnutia">
-<!ENTITY torbutton.prefs.startup_state "Pri normÃ¡lnom spustenÃ nastaviÅ¥ stav Tor na:">
-<!ENTITY torbutton.prefs.shutdown_state "VypÃnanie">
-<!ENTITY torbutton.prefs.startup "SpÃºÅ¡Å¥anie">
-<!ENTITY torbutton.prefs.block_tor_file_net "BlokovaÅ¥ Tor prÃstup k sieti z file:// umiestnenÃ (odporÃºÄanÃ©)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "BlokovaÅ¥ neTor prÃstup k sieti z file:// umiestnenÃ">
 <!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ pÃ´vodnÃ©">
 <!ENTITY torbutton.prefs.test_settings "SkontrolovaÅ¥ nastavenia">
-<!ENTITY torbutton.prefs.test_auto "OtestovaÅ¥ moje nastavenia Tor po prvom prepnutÃ stavu pri kaÅ¾dom spustenÃ Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "ZakÃ¡zaÅ¥ aktualizÃ¡cie livemarks poÄas Tor">
-<!ENTITY torbutton.prefs.tor_memory_jar "NezapisovaÅ¥ Tor cookies na disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "NezapisovaÅ¥ neTor cookies na disk">
-<!ENTITY torbutton.prefs.session_restore "UloÅ¾iÅ¥ relÃ¡ciu a obnoviÅ¥ tieto zÃ¡loÅ¾ky:">
-<!ENTITY torbutton.prefs.nontor_tabs "ZÃ¡loÅ¾ky naÄÃtanÃ© v neTor">
-<!ENTITY torbutton.prefs.tor_tabs "ZÃ¡loÅ¾ky naÄÃtanÃ© v Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Bez proxy pre:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Upozornenie: Vyvarujte sa pouÅ¾itiu vÅ¡etkÃ½ch nÃ¡zvov hostiteÄ¾ov vyÅ¡Å¡ie">
-<!ENTITY torbutton.prefs.spoofreresh "PredstieraÅ¥ obnovenia strÃ¡nky">
-<!ENTITY torbutton.prefs.refereroptions "Nastavenia referer predstierania">
-<!ENTITY torbutton.prefs.nospoof "NepredstieraÅ¥ referer poÄas Tor (odosiela normÃ¡lne referery)">
-<!ENTITY torbutton.prefs.spoofroot "PredstieraÅ¥ obsahujÃºci prieÄinok strÃ¡nky">
-<!ENTITY torbutton.prefs.spoofdomain "PredstieraÅ¥ domÃ©nu ako referera">
-<!ENTITY torbutton.prefs.spoofblank "PredstieraÅ¥ prÃ¡zdny referer poÄas Tor (mÃ´Å¾e znefunkÄniÅ¥ niektorÃ© strÃ¡nky)">
 <!ENTITY torbutton.cookiedialog.title "SpravovaÅ¥ Ochranu cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ChrÃ¡nenÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "HostiteÄ¾">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "OdstrÃ¡niÅ¥ vÅ¡etky okrem chrÃ¡nenÃ½ch">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "OchrÃ¡niÅ¥ novÃ© Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NechrÃ¡niÅ¥ novÃ© Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "ZakÃ¡zaÅ¥ aktualizÃ¡cie livemarks poÄas Tor">
-<!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 "PresmerovaÅ¥ Torbutton aktualizÃ¡cie cez Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automaticky pouÅ¾iÅ¥ alternatÃvny vyhÄ¾adÃ¡vaÄ, keÄ sa ukÃ¡Å¾e 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 "PriehÄ¾adnÃ¡ torifikÃ¡cia (vyÅ¾aduje vlastnÃº transproxy alebo Tor smerovaÄ)">
 <!ENTITY torbutton.prefs.priv_caption "Nastavenia sÃºkromia">
 <!ENTITY torbutton.prefs.block_disk "NezaznamenÃ¡vaÅ¥ histÃ³riu prehliadania ani Ãºdaje strÃ¡nok (zapne mÃ³d SÃºkromnÃ©ho prehliadania)">
@@ -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 je v zÃ¡kladnom nastavenÃ zakÃ¡zanÃ½ na vÅ¡etkÃ½ch strÃ¡nkach.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "VÃ¤ÄÅ¡ina audio a video formÃ¡tov je zakÃ¡zanÃ½ch.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM je jedinÃ½ kodek, ktorÃ½ zostÃ¡va povolenÃ½.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "NiektorÃ© pÃsma a ikony sa mÃ´Å¾u zobrazovaÅ¥ nesprÃ¡vne.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "PÃsma poskytnutÃ© webovovou strÃ¡nkou boli zablokovanÃ©.">
 <!ENTITY torbutton.prefs.sec_custom "VlastnÃ© hodnoty">
diff --git a/sl/torbutton.dtd b/sl/torbutton.dtd
index d71d2d3..1f261d8 100644
--- a/sl/torbutton.dtd
+++ b/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,14 +8,6 @@
 <!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Ä">
@@ -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 "Zamenjaj status anonimizacije">
-<!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 "O razÅ¡iritvi 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 "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ€¦">
 <!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.privacy_security_settings "Privacy and Security Settings">
-<!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 "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 "ne zaÅ¡Äiti novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!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.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/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index 2584f83..308af66 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Izbire">
 <!ENTITY torbutton.prefs.tor_settings "Proxy nastavitve">
 <!ENTITY torbutton.prefs.recommended_settings "Uporabite priporoÄene nastavitve streÅ¾nika proxy za mojo razliÄico Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Uporabite Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Uporabite Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Uporabite obiÄajne proxy nastavitve">
 <!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 "Vhod:">
-<!ENTITY torbutton.about.title "Vizitka Torbutton">
-<!ENTITY torbutton.about.version "Verzija:">
-<!ENTITY torbutton.about.summary "Å Äiti zasebnost vaÅ¡ega Tor brskanja .">
-<!ENTITY torbutton.about.code "Koda SodelujoÄih:">
-<!ENTITY torbutton.about.maintainer "VzdrÅ¾evalec:">
-<!ENTITY torbutton.about.security_review "Varnostni pregled:">
-<!ENTITY torbutton.about.donate "ÄŒe vam je vÅ¡eÄ uporaba Tor, razmislite">
-<!ENTITY torbutton.about.make_donation "o donaciji.">
 <!ENTITY torbutton.pref_connection.notice "OnemogoÄite Torbutton za spremembo teh nastavitev.">
 <!ENTITY torbutton.pref_connection.more_info "VeÄ info">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Tor vezje za to stran">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "Preklopite Tor stanje">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Zasebnostne in varnostne nastavitve...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Vizitka Torbutton">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Nastavitve Tor omreÅ¾ja...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Preveri posodobitve Tor brskalnika">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Varnosti piÅ¡kotkov...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopiraj v URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Odpri Tor URL v novem tabulatorju">
-<!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 "Klik za zaÄetek Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Nastavitve zasebnosti in varnosti">
-<!ENTITY torbutton.prefs.block_thread "Blokiraj zgodovino branja med Tor (kljuÄno)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokiraj zgodovino zapisovanja med Tor (priporoÄljivo)">
-<!ENTITY torbutton.prefs.block_nthread "Blokiraj zgodovino branja med Ne-Tor (opcija)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokiraj zgodovino zapisovanja med Ne-Tor (opcija)">
-<!ENTITY torbutton.prefs.clear_history "OÄisti zgodovino Tor preklopov (opcija)">
-<!ENTITY torbutton.prefs.clear_cache "Blokiraj Tor disk predpomnilnik in oÄisti vse predpomnilnike Tor preklopov">
-<!ENTITY torbutton.prefs.block_cache "Blokiraj dostope diskovnih in spominskhi predpomnilnikov med Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Shrani Ne-Tor piÅ¡kotke v zaÅ¡Äitenih jar">
-<!ENTITY torbutton.prefs.cookie_protection "Uporabite zaÅ¡Äiteno pogovorno okno piÅ¡kotkov, za izbiro">
-<!ENTITY torbutton.prefs.mmm_cookies "Bom roÄno upravljal svoje piÅ¡kotke (nevarno)">
-<!ENTITY torbutton.prefs.clear_cookies "OÄisti piÅ¡kotke pri preklopu Tor">
-<!ENTITY torbutton.prefs.disable_plugins "OnemogoÄi vtiÄnike med Tor uporabo (kljuÄno)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ulovi nevaren javascript (kljuÄno)">
-<!ENTITY torbutton.prefs.isolate_content "Izolirati dinamiÄno vsebino Tor stanja (kljuÄno)">
-<!ENTITY torbutton.prefs.no_updates "OnemogoÄi posodobitev med uporabo Tor">
-<!ENTITY torbutton.prefs.set_uagent "Nastavite si zastopnika za uporabo Tor (kljuÄno)">
-<!ENTITY torbutton.prefs.dynamic "DinamiÄna vsebina">
-<!ENTITY torbutton.prefs.cookies "PiÅ¡kotki">
-<!ENTITY torbutton.prefs.cache "Predpomnilnik">
-<!ENTITY torbutton.prefs.history "Zgodovina">
-<!ENTITY torbutton.prefs.no_search "OnemogoÄite predloge iskanja med Tor (priporoÄljivo)">
-<!ENTITY torbutton.prefs.shutdown "Izklop">
-<!ENTITY torbutton.prefs.tor_shutdown "OÄisti Tor piÅ¡kotke med omogoÄeno-Tor iskalnik izklopom">
-<!ENTITY torbutton.prefs.all_shutdown "OÄisti piÅ¡kotke med izklopom poljubnega brskalnika">
-<!ENTITY torbutton.prefs.no_shutdown "Ne izbriÅ¡i moje piÅ¡kotke med izklopom">
-<!ENTITY torbutton.prefs.disable_sessionstore "OnemogoÄi shranjevanje seje (priporoÄljivo)">
-<!ENTITY torbutton.prefs.headers "Glave">
-<!ENTITY torbutton.prefs.refererspoofing "Napotek sleparjenja">
-<!ENTITY torbutton.prefs.spoofblank "Sleparski prazen napotek med uporabo Tor (lahko prekine nekaj spletnih mest)">
-<!ENTITY torbutton.prefs.smartspoof "Iznajdljiv napotek sleparjenja med uporabo Tor (slepari napotke kriÅ¾nih domen)">
-<!ENTITY torbutton.prefs.nospoof "Brez napotka sleparjenja med uporabo Tor (poÅ¡lje napotke kot je normalno)">
-<!ENTITY torbutton.prefs.disable_domstorage "OnemogoÄite DOM shranjevanje med uporabo Tor (kljuÄno)">
-<!ENTITY torbutton.prefs.forms "Obrazci">
-<!ENTITY torbutton.prefs.block_tforms "Blokiraj geslo+obrazec shranjevanja med Tor (priporoÄljivo)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokiraj geslo+obrazec shranjevanja med Ne-Tor (opcija)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Ne-Tor">
-<!ENTITY torbutton.prefs.restore_tor "Po obnovljeni seji nastavi stanje Tor kot:">
-<!ENTITY torbutton.prefs.startup_tor "Pri zagonu brskalnika nastavi stanje Tor kot:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ponovno naloÅ¾i piÅ¡kotke jar/ oÄisti piÅ¡kotke Firefox predpomnilnika (priporoÄljivo )">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Shrani oboje Tor in Ne-Tor piÅ¡kotke v zaÅ¡Äitenih jar datotekah ( nevarno )">
-<!ENTITY torbutton.prefs.clear_http_auth "OÄisti HTTP overjeno sejo ( priporoÄljivo )">
-<!ENTITY torbutton.prefs.block_js_history "Izolirati dostop do navigacije zgodovine stanja Tor ( kljuÄna )">
-<!ENTITY torbutton.prefs.resize_on_toggle "Med uporabo Tor spremenite velikost oken v mnogokratnik 50px ( priporoÄljivo )">
-<!ENTITY torbutton.prefs.close_tor "Pri preklopu zaprite okna in tab-e ( opcija )">
-<!ENTITY torbutton.prefs.close_nontor "Pri preklopu zaprite Ne-Tor okna in tab-e ( opcija )">
-<!ENTITY torbutton.prefs.block_links "Blokiraj povezave klikanja in ponovno naloÅ¾enih strani od razliÄnih stanj Tor-a ( opcija )">
-<!ENTITY torbutton.prefs.jar_certs "Shrani certifikate SSL v loÄene jar-e za Tor/Ne-Tor ( priporoÄljivo )">
-<!ENTITY torbutton.prefs.jar_ca_certs "Shrani certifikate CA v loÄene jar-e za Tor/Ne-Tor ( priporoÄljivo )">
-<!ENTITY torbutton.prefs.locked_mode "OnemogoÄi Gumbe in Hitre tipke za prepreÄitev sluÄajnega preklopa">
-<!ENTITY torbutton.prefs.startup_state "Ob normalnem zagonu nastavi stanje Tor v:">
-<!ENTITY torbutton.prefs.shutdown_state "Stanje Izklopa">
-<!ENTITY torbutton.prefs.startup "Zagon">
-<!ENTITY torbutton.prefs.block_tor_file_net "Blokiraj Tor dostop do omreÅ¾ja iz datoteke:// urls (priporoÄljivo )">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokiraj Ne-Tor dostop do omreÅ¾ja iz datoteke:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Obnovi privzeto">
 <!ENTITY torbutton.prefs.test_settings "Testiranje nastavitev">
-<!ENTITY torbutton.prefs.test_auto "Test mojih Tor nastavitev po prvem preklopu z vsakim zagonom Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "OnemogoÄi livemarks posodobitve med Tor uporabo">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ne zapisuj Tor piÅ¡kotke na disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ne zapisuj Ne-Tor piÅ¡kotke na disk">
-<!ENTITY torbutton.prefs.session_restore "Ima seja shrambe shranjevanje in obnavljanje teh tabulatorjev:">
-<!ENTITY torbutton.prefs.nontor_tabs "NaloÅ¾eni tabulatorji v Ne-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "NaloÅ¾eni tabulatorji v Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ni proxija za">
 <!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: Izogibajte se uporabi zgornjih imen domen">
-<!ENTITY torbutton.prefs.spoofreresh "OsveÅ¾i sleparjenje">
-<!ENTITY torbutton.prefs.refereroptions "MoÅ¾nosti napotkov sleparjenja">
-<!ENTITY torbutton.prefs.nospoof "Brez napotka sleparjenja med uporabo Tor (poÅ¡lje napotke kot je normalno)">
-<!ENTITY torbutton.prefs.spoofroot "Slepari vsebino mapo na strani">
-<!ENTITY torbutton.prefs.spoofdomain "Slepari domeno kot sklic">
-<!ENTITY torbutton.prefs.spoofblank "Sleparski prazen napotek med uporabo Tor (lahko prekine nekaj spletnih mest)">
 <!ENTITY torbutton.cookiedialog.title "Upravljaj zaÅ¡Äito piÅ¡kotkov">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡Äiteno">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Odstrani vse razen zaÅ¡Äitenih">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡Äiti Nove piÅ¡kotke">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne zaÅ¡Äiti Novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.disable_livemarks "OnemogoÄi livemarks posodobitve med Tor uporabo">
-<!ENTITY torbutton.prefs.dtd_recommended "(priporoÄljivo)">
-<!ENTITY torbutton.prefs.dtd_optional "(opcija)">
-<!ENTITY torbutton.prefs.dtd_crucial "(kljuÄno)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Preusmeri Torbutton posodobitev preko Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Avtomatsko uporabi nadomestni iskalnik pri prisotnosti 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 "Pregledna Torifikacija (potrebna pomeri transproxy ali Tor usmernik)">
 <!ENTITY torbutton.prefs.priv_caption "Nastavitve zasebnosti">
 <!ENTITY torbutton.prefs.block_disk "Ne zapisuj zgodovine brskanja ali podatke strani ( omogoÄeno zasebno brskanje)">
@@ -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 "Visok">
 <!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 "Vrednosti po meri">
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index e411b62..b9fa228 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Zvamada">
 <!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 "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 "(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/so/torbutton.dtd b/so/torbutton.dtd
index 32c680f..12364fc 100644
--- a/so/torbutton.dtd
+++ b/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,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 "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 "(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/son/torbutton.dtd b/son/torbutton.dtd
index 32c680f..12364fc 100644
--- a/son/torbutton.dtd
+++ b/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,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 "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 "(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/sq/torbutton.dtd b/sq/torbutton.dtd
index ddca8d8..ea62f92 100644
--- a/sq/torbutton.dtd
+++ b/sq/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "ParapÃ«lqimet pÃ«r Torbutton-in">
 <!ENTITY torbutton.prefs.tor_settings "Konfigurimi i Proxy-t">
 <!ENTITY torbutton.prefs.recommended_settings "PÃ«rdorni konfigurimin e rekomanduar pÃ«r proxy-n, pÃ«r versionin tim tÃ« Firefox-it">
-<!ENTITY torbutton.prefs.use_privoxy "PÃ«rdorni Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "PÃ«rdorni Polipo">
 <!ENTITY torbutton.prefs.custom_settings "PÃ«rdorni konfigurim tÃ« pÃ«rshtatur pÃ«r proxy-n">
 <!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 "Porta:">
-<!ENTITY torbutton.about.title "Rreth Torbutton">
-<!ENTITY torbutton.about.version "Versioni:">
-<!ENTITY torbutton.about.summary "Mbron privatÃ«sinÃ« e shfletuesit tuaj Tor.">
-<!ENTITY torbutton.about.code "Kontribuuesit pÃ«r Kodin:">
-<!ENTITY torbutton.about.maintainer "MirÃ«mbajtÃ«si:">
-<!ENTITY torbutton.about.security_review "Shqyrtimi i SigurisÃ«:">
-<!ENTITY torbutton.about.donate "NÃ«se ju pÃ«lqen ta pÃ«rdorni Tor-in, ju mund tÃ«">
-<!ENTITY torbutton.about.make_donation "bÃ«ni njÃ« dhurim.">
 <!ENTITY torbutton.pref_connection.notice "PaaftÃ«soni Torbutton-in qÃ« ta ndryshoni kÃ«tÃ« konfigurim.">
 <!ENTITY torbutton.pref_connection.more_info "MÃ« shumÃ« informacion">
 <!ENTITY torbutton.pref_connection_more_info.title "NdihmÃ«">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "NjÃ« Cirkuit i Ri Tor pÃ«r kÃ«tÃ« Webfaqe">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.toggle "KÃ«mbeni statusin e Tor-it">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Konfigurimi i PrivatÃ«sisÃ« dhe SigurisÃ«â€¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Rreth Torbutton-it...">
-<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Konfigurimi i Rrjetit Torâ€¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Kontrolloni pÃ«r PÃ«rditÃ«sime tÃ« Shfletuesit Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Mbrojtjet nga Cookie-tâ€¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Kopjojeni URL-nÃ« e Tor-it">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Hapeni URL-nÃ« e Tor-it nÃ« njÃ« tabelÃ« tjetÃ«r">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Hapeni URL-nÃ« e Tor-it nÃ« njÃ« Dritare tÃ« re">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikoni qÃ« ta nisni Torbutton-in">
 <!ENTITY torbutton.prefs.privacy_security_settings "Konfigurimi i PrivatÃ«sisÃ« dhe SigurisÃ«">
-<!ENTITY torbutton.prefs.block_thread "Pengoni leximin e historisÃ« gjatÃ« Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.block_thwrite "Pengoni shkrimin e historisÃ« gjatÃ« Tor-it (rekomandohet)">
-<!ENTITY torbutton.prefs.block_nthread "Pengoni leximin e historisÃ« gjatÃ« mosfunksionimit tÃ« Tor-it (me zgjedhje)">
-<!ENTITY torbutton.prefs.block_nthwrite "Pengoni shkrimin e historisÃ« gjatÃ« mosfunksionimit tÃ« Tor-it (me zgjedhje)">
-<!ENTITY torbutton.prefs.clear_history "Fshijeni historinÃ« kur Tor-i alternohet (me zgjedhje)">
-<!ENTITY torbutton.prefs.clear_cache "Pengoni depizitimin nÃ« disk tÃ« Tor-it dhe fshijeni tÃ« gjithÃ« depozitÃ«n kur Tor-i alternohet">
-<!ENTITY torbutton.prefs.block_cache "Pengoni qasjen tek depozita dhe kujtesa e diskut gjatÃ« Tor-it">
-<!ENTITY torbutton.prefs.cookie_jars "Vendosini cookie-t kur nuk funksionon Tor-i, nÃ« njÃ« Non-Tor cookies in a "vazo" tÃ« mbrojtur">
-<!ENTITY torbutton.prefs.cookie_protection "PÃ«rdoreni Dialogun e PÃ«rzgjedhjes sÃ« Cookie-t, pÃ«r tÃ« bÃ«rÃ« pÃ«rzgjedhje">
-<!ENTITY torbutton.prefs.mmm_cookies "Do t'i administroj me dorÃ« cookie-t e mi (e rrezikshme)">
-<!ENTITY torbutton.prefs.clear_cookies "Fshijini cookie-t kur Tor-i kÃ«mbehet">
-<!ENTITY torbutton.prefs.disable_plugins "Ã‡aktivizojini shtojcat gjatÃ« pÃ«rdorimit tÃ« Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.kill_bad_js "Fiksojini skriptet e rrezikshme tÃ« Java-s (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.isolate_content "Izolojeni pÃ«rmbajtjen dinamike tek gjendja e Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.no_updates "Ã‡aktivizojini pÃ«rditÃ«simet gjatÃ« pÃ«rdorimit tÃ« Tor-it">
-<!ENTITY torbutton.prefs.set_uagent "Rregullojeni agjentin e pÃ«rdoruesit pÃ«r pÃ«rdorimin e Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.dynamic "PÃ«rmbajtja Dinamike">
-<!ENTITY torbutton.prefs.cookies "Cookie-t">
-<!ENTITY torbutton.prefs.cache "DepozitÃ«">
-<!ENTITY torbutton.prefs.history "Histori">
-<!ENTITY torbutton.prefs.no_search "Ã‡aktivizojini sugjerimet e kÃ«rkimit gjatÃ« pÃ«rdorimit tÃ« Tor-it (rekomandohet)">
-<!ENTITY torbutton.prefs.shutdown "Mbylleni">
-<!ENTITY torbutton.prefs.tor_shutdown "Fshijini cookie-t e Tor-it gjatÃ« mbylljes sÃ« shfletuesit tÃ« pÃ«rshtatur pÃ«r Tor-in">
-<!ENTITY torbutton.prefs.all_shutdown "Fshijini cookie-t gjatÃ« mbylljes sÃ« Ã§do shfletuesi">
-<!ENTITY torbutton.prefs.no_shutdown "Mos i fshini cookie-t e mia gjatÃ« mbylljes">
-<!ENTITY torbutton.prefs.disable_sessionstore "PaaftÃ«sojeni Ruajtjen e Sesionit (rekomandohet)">
-<!ENTITY torbutton.prefs.headers "Blloqe tÃ« epÃ«rm">
-<!ENTITY torbutton.prefs.refererspoofing "Ndryshimi i identitetit tÃ« ndÃ«rmjetÃ«suesit">
-<!ENTITY torbutton.prefs.spoofblank "Ndryshojeni identitetin e ndÃ«rmjetÃ«suesit tÃ« zbrazÃ«t gjatÃ« pÃ«rdorimit tÃ« Tor-it (mund tÃ« dÃ«mtojÃ« disa faqe)">
-<!ENTITY torbutton.prefs.smartspoof "Ndryshojeni me inteligjencÃ« identitetin gjatÃ« pÃ«rdorimit tÃ« Tor-it (ndryshojani identitetin ndÃ«rmjetÃ«suesve, pÃ«rmes domeneve)">
-<!ENTITY torbutton.prefs.nospoof "AsnjÃ« ndÃ«rmjetÃ«suesi mos ja ndryshoni identitetin gjatÃ« pÃ«rdorimit tÃ« Tor-it (i dÃ«rgon ndÃ«rmjetÃ«suesit si normalÃ«)">
-<!ENTITY torbutton.prefs.disable_domstorage "PaaftÃ«soni Vendosjen e DOM gjatÃ« pÃ«rdorimit tÃ« Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.forms "Format">
-<!ENTITY torbutton.prefs.block_tforms "Pengojeni ruajtjen e fjalÃ«kalimit+formularit gjatÃ« pÃ«rdorimit tÃ« Tor-it (rekomandohet)">
-<!ENTITY torbutton.prefs.block_ntforms "Pengojeni ruajtjen e fjalÃ«kalimit+formularit gjatÃ« mospÃ«rdorimit tÃ« Tor-it (me zgjedhje)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Jo-Tor">
-<!ENTITY torbutton.prefs.restore_tor "NÃ« nisjen e rivendosjes sÃ« sesionit, vendoseni gjendjen e Tor-it tek:">
-<!ENTITY torbutton.prefs.startup_tor "NÃ« nisjen e shfletuesit, vendoseni gjendjen e Tor-it tek:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ringarkojini cookie-t nÃ« vazo / hiqini cookie-t pÃ«r thyerjen e Firefox-it (rekomandohet)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Vendosini nÃ« vazot e mbrojtura cookie-t pÃ«r Tor-in dhe Jo-Tor-in (e rrezikshme)">
-<!ENTITY torbutton.prefs.clear_http_auth "Fshijini sesionet e autentikimit tÃ« HTTP (rekomandohet)">
-<!ENTITY torbutton.prefs.block_js_history "Izoloni qasjen nÃ« lundrimi tek historia e gjendjes sÃ« Tor-it (thelbÃ«sore)">
-<!ENTITY torbutton.prefs.resize_on_toggle "RipÃ«rmasoni dritaret nÃ« shumÃ«fisha tÃ« 50px gjatÃ« pÃ«rdorimit tÃ« Tor-it (rekomandohet)">
-<!ENTITY torbutton.prefs.close_tor "Mbyllni tÃ« gjitha dritaret dhe skedat e Tor-it gjatÃ« kÃ«mbimit (me zgjedhje)">
-<!ENTITY torbutton.prefs.close_nontor "Mbyllini tÃ« gjitha dritaret dhe tabelat Jo-Tor-in gjatÃ« kÃ«mbimit (me zgjedhje)">
-<!ENTITY torbutton.prefs.block_links "Pengoni klikimet e lidhjeve dhe ringarkimin e faqeve nga gjendje tÃ« ndryshme tÃ« Tor-it (me zgjedhje)">
-<!ENTITY torbutton.prefs.jar_certs "Vendosini certifikatat nÃ« vazo tÃ« veÃ§anta pÃ«r Tor-in dhe Jo-Tor-in (rekomandohet)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Vendosini certifikatat CA nÃ« vazo tÃ« veÃ§anta pÃ«r Tor-in dhe Jo-Tor-in (rekomandohet)">
-<!ENTITY torbutton.prefs.locked_mode "PaaftÃ«soni Butonin dhe Hotkeys, qÃ« tÃ« parandaloni kÃ«mbimin aksidental">
-<!ENTITY torbutton.prefs.startup_state "NÃ« nisjen normale, vendoseni gjendjen e Tor-it tek:">
-<!ENTITY torbutton.prefs.shutdown_state "Gjendja e mbylljes">
-<!ENTITY torbutton.prefs.startup "Nisje">
-<!ENTITY torbutton.prefs.block_tor_file_net "Pengojeni qasjen e Tor-it nÃ« rrjet nga skedari:// urls (rekomandohet)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Pengojeni qasjen e Jo-Tor-it nÃ« rrjet nga skedari:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Rivendoseni Parazgjedhjen">
 <!ENTITY torbutton.prefs.test_settings "Provoni Konfigurimin">
-<!ENTITY torbutton.prefs.test_auto "Provoni konfigurimin e Tor-it tim, pas herÃ«s sÃ« parÃ« qÃ« kÃ«mbehem nÃ« Ã§do rinisje tÃ« Firefox-it">
-<!ENTITY torbutton.prefs.disable_livemarks "PaaftÃ«soni pÃ«rditÃ«simet e livemark gjatÃ« pÃ«rdorimit tÃ« Tor-it">
-<!ENTITY torbutton.prefs.tor_memory_jar "Mos i shkruani cookie-t e Tor-it nÃ« disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Mos i shkruani cookie-t e Jo-Tor-it nÃ« disk">
-<!ENTITY torbutton.prefs.session_restore "BÃ«ni qÃ« ruajtja e sesionit tÃ« ruaj dhe tÃ« rivendosÃ« kÃ«to skeda:">
-<!ENTITY torbutton.prefs.nontor_tabs "Skedat e ngarkuara nÃ« Jo-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Skedat e ngarkuara nÃ« Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "S'ka Proxy pÃ«r: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Kujdes: Shmangni pÃ«rdorimin e ndonjÃ« emri tÃ« pritÃ«sve tÃ« mÃ«sipÃ«rm">
-<!ENTITY torbutton.prefs.spoofreresh "Rifreskoni Ndryshimin e Identitetit">
-<!ENTITY torbutton.prefs.refereroptions "MundÃ«sitÃ« pÃ«r NdÃ«rmjetÃ«suesin e Ndryshimit tÃ« Identitetit">
-<!ENTITY torbutton.prefs.nospoof "AsnjÃ« ndÃ«rmjetÃ«suesi mos ja ndryshoni identitetin gjatÃ« pÃ«rdorimit tÃ« Tor-it (i dÃ«rgon ndÃ«rmjetÃ«suesit si normalÃ«)">
-<!ENTITY torbutton.prefs.spoofroot "Ndryshojani identitetin dosjes mbajtÃ«se tÃ« faqes">
-<!ENTITY torbutton.prefs.spoofdomain "Ndryshojani identitetin domenit si ndÃ«rmjetÃ«s">
-<!ENTITY torbutton.prefs.spoofblank "Ndryshojeni identitetin e ndÃ«rmjetÃ«suesit tÃ« zbrazÃ«t gjatÃ« pÃ«rdorimit tÃ« Tor-it (mund tÃ« dÃ«mtojÃ« disa faqe)">
 <!ENTITY torbutton.cookiedialog.title "Administroni Mbrojtjen e Cookie-ve">
 <!ENTITY torbutton.cookiedialog.lockCol "I mbrojtur">
 <!ENTITY torbutton.cookiedialog.domainCol "PritÃ«si">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Hiqini tÃ« GjithÃ« PÃ«rveÃ§ tÃ« Mbrojturve">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Mbrojini Cookie-t e Rinj">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Mos i Mbroni Cookie-t e Rinj">
-<!ENTITY torbutton.prefs.disable_livemarks "PaaftÃ«soni pÃ«rditÃ«simet e livemark gjatÃ« pÃ«rdorimit tÃ« Tor-it">
-<!ENTITY torbutton.prefs.dtd_recommended "(rekomandohet)">
-<!ENTITY torbutton.prefs.dtd_optional "(me zgjedhje)">
-<!ENTITY torbutton.prefs.dtd_crucial "(thelbÃ«sore)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Ridrejtojini pÃ«rditÃ«simet e Torbutton-it, pÃ«rmes Tor-it">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatikisht pÃ«rdorni njÃ« motor kÃ«rkimi tÃ« ndryshÃ«m, kur paraqitet me njÃ« 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 "Torifikim Transparent (KÃ«rkon transproxy tÃ« pÃ«rshtatur ose ruter Tor)">
 <!ENTITY torbutton.prefs.priv_caption "Parametrat e fshehtÃ«sisÃ«">
 <!ENTITY torbutton.prefs.block_disk "Mos regjistroni historinÃ« e kÃ«rkimit ose tÃ« dhÃ«nat e webfaqes (aktivizon MÃ«nyrÃ«n e Shfletimit Privatisht)">
@@ -176,8 +76,6 @@
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript-i mund tÃ« aftÃ«sohet nÃ« varÃ«si tÃ« webfaqes, pÃ«rmes njÃ« butoni nÃ« shiritin e mjeteve tÃ« NoScript-it.">
 <!ENTITY torbutton.prefs.sec_high "E lartÃ«">
 <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript-i Ã«shtÃ« i paaftÃ«suar me parazgjedhje, nÃ« tÃ« gjitha webfaqet.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc "ShumÃ« formate audio dhe video janÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM Ã«shtÃ« i vetmi codec qÃ« qÃ«ndron i aftÃ«suar.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Disa germa dhe ikona mund tÃ« shfaqen jo saktÃ«.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "SkedarÃ«t e germave tÃ« ofruara nga webfaqja janÃ« penguar.">
 <!ENTITY torbutton.prefs.sec_custom "Vlera tÃ« PÃ«rshtatura">
diff --git a/sr/torbutton.dtd b/sr/torbutton.dtd
index 74cbf4c..8a25bcc 100644
--- a/sr/torbutton.dtd
+++ b/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,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 "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 "ÐŸÐ¾Ð¼Ð¾Ñ›">
@@ -26,101 +16,22 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð˜">
 <!ENTITY torbutton.context_menu.new_circuit "ÐÐ¾Ð² Ð¢Ð¾Ñ€ Ð¡Ð¿Ð¾Ñ˜ Ð·Ð° Ð¾Ð²Ð°Ñ˜ Ð¡Ð°Ñ˜Ñ‚">
 <!ENTITY torbutton.context_menu.new_circuit_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 "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð¢Ð¾Ñ€ ÐœÑ€ÐµÐ¶Ðµ...">
 <!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 "Ð¦">
-<!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.privacy_security_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 "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 "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 Ñ‚Ñ€Ð°Ð¶Ð¸ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸ ÐºÃ´Ð´:">
-<!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 "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava 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 "Ð’Ð¸ÑÐ¾Ðº">
 <!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 "ÐÐ°Ð¼ÐµÐ½ÑÐºÐµ Ð²Ñ€ÐµÐ´Ð½Ð¾ÑÑ‚Ð¸">
diff --git a/sr at latin/torbutton.dtd b/sr at latin/torbutton.dtd
index 7aa7af4..12364fc 100644
--- a/sr at latin/torbutton.dtd
+++ b/sr at latin/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 "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 "(preporuÄeno)">
-<!ENTITY torbutton.prefs.dtd_optional "(proizvoljno)">
-<!ENTITY torbutton.prefs.dtd_crucial "(krucijalno)">
-<!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/st/torbutton.dtd b/st/torbutton.dtd
index 32c680f..12364fc 100644
--- a/st/torbutton.dtd
+++ b/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,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 "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 "(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/su/torbutton.dtd b/su/torbutton.dtd
index 32c680f..12364fc 100644
--- a/su/torbutton.dtd
+++ b/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,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 "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 "(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/sv/torbutton.dtd b/sv/torbutton.dtd
index cc809ec..4978d15 100644
--- a/sv/torbutton.dtd
+++ b/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/sw/torbutton.dtd b/sw/torbutton.dtd
index abd8fd0..080ebd7 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Mapendeleo ya Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Mapendeleo ya Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Tumia mapendeleo yaliyopendekezwa kwa toleo langu la Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Tumia Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Tumia mapandeleo tofauti ya proxy">
 <!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 "Kituo:">
-<!ENTITY torbutton.about.title "Kuhusu Torbutton">
-<!ENTITY torbutton.about.version "Toleo:">
-<!ENTITY torbutton.about.summary "Hulinda usiri wako ukitumia kisakuzi cha Tor">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Mdumishaji:">
-<!ENTITY torbutton.about.security_review "Mapitio ya usalama:">
-<!ENTITY torbutton.about.donate "Kama unapenda Tor, unaweza taka">
-<!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 "Maelezo zaidi">
 <!ENTITY torbutton.pref_connection_more_info.title "Usaidizi">
@@ -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 "Rejesha chaguo-msingi">
 <!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 "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 "(imependekezwa)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(muhimu)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Tumia injini tafuti nyingine kiautomatiki unapowasilishwa 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 "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 "Vipengele maalum">
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 32c680f..12364fc 100644
--- a/szl/torbutton.dtd
+++ b/szl/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 "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 "(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/ta/torbutton.dtd b/ta/torbutton.dtd
index 387031e..cee4868 100644
--- a/ta/torbutton.dtd
+++ b/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,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 "à®‰à®¤à®µà®¿">
@@ -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 "à®¤à®©à®¿à®¯à¯à®°à®¿à®®à¯ˆ à®®à®±à¯à®±à¯à®®à¯ à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯">
-<!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 "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 "(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 "à®¤à®©à®¿à®¯à¯à®°à®¿à®®à¯ˆ à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯">
 <!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 "à®‰à®¯à®°à¯">
 <!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 "à®µà®¿à®°à¯à®ªà¯à®ª à®•à®²à®¾à®šà¯à®šà®¾à®°à®®à¯">
diff --git a/te/torbutton.dtd b/te/torbutton.dtd
index 2a848d6..69edb5c 100644
--- a/te/torbutton.dtd
+++ b/te/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "à°Ÿà°¾à°°à±â€Œà°¬à°Ÿà°¨à± à°…à°à°¿à°°à±à°šà±à°²à±">
 <!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,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 "à°®à°°à°¿à°‚à°¤ à°¸à°®à°¾à°šà°¾à°°à°‚">
 <!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 "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 "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 "(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/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 32c680f..12364fc 100644
--- a/te_IN/torbutton.dtd
+++ b/te_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,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 "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 "(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/tg/torbutton.dtd b/tg/torbutton.dtd
index 32c680f..12364fc 100644
--- a/tg/torbutton.dtd
+++ b/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,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 "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 "(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/th/torbutton.dtd b/th/torbutton.dtd
index c2b440b..16619e4 100644
--- a/th/torbutton.dtd
+++ b/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,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 "à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š 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 "à¸„à¸§à¸²à¸¡à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸">
@@ -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 "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.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 "à¸„à¹ˆà¸²à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢  à¸˜à¸™à¸ž">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸ªà¸–à¸²à¸™à¸°à¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡ Tor à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "à¸à¸²à¸£à¸›à¸à¸›à¹‰à¸à¸‡à¸„à¸¸à¸à¸à¸µà¹‰">
 <!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 "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² à¸„à¸§à¸²à¸¡à¹€à¸›à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§ à¹à¸¥à¸° à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢">
-<!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 "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 "(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 "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸„à¸§à¸²à¸¡à¹€à¸›à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§">
 <!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 "à¸ªà¸¹à¸‡">
 <!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 "à¸„à¹ˆà¸²à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹€à¸à¸‡">
diff --git a/ti/torbutton.dtd b/ti/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ti/torbutton.dtd
+++ b/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,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 "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 "(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/tk/torbutton.dtd b/tk/torbutton.dtd
index 4383296..42af59e 100644
--- a/tk/torbutton.dtd
+++ b/tk/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "GÃ¼Ã½Ã§lendirme dÃ¼wmesi saÃ½lamasy">
 <!ENTITY torbutton.prefs.tor_settings "Proxy sazlamasy">
 <!ENTITY torbutton.prefs.recommended_settings "Maslahat berilen sazlamany meniÃ± Firefox wersiÃ½am Ã¼Ã§in ulan">
-<!ENTITY torbutton.prefs.use_privoxy "Proxy ulan">
 <!ENTITY torbutton.prefs.use_polipo "Polipo ulan">
 <!ENTITY torbutton.prefs.custom_settings "YÃ¶rite proxy sazlamasy">
 <!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 "Tiz dÃ¼gme hakynda">
-<!ENTITY torbutton.about.version "Wersiya:">
-<!ENTITY torbutton.about.summary "Bu gizlinligi sizin Tor gezmegiÃ±izde gora">
-<!ENTITY torbutton.about.code "GoÅŸant goÅŸma kodlary:">
-<!ENTITY torbutton.about.maintainer "SaklaÃ½yjy:">
-<!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 "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 "(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/tr/torbutton.dtd b/tr/torbutton.dtd
index 3a03b4d..eb18fdb 100644
--- a/tr/torbutton.dtd
+++ b/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/tzm/torbutton.dtd b/tzm/torbutton.dtd
index 32c680f..12364fc 100644
--- a/tzm/torbutton.dtd
+++ b/tzm/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 "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 "(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/ug at Arab/torbutton.dtd b/ug at Arab/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ug at Arab/torbutton.dtd
+++ b/ug at Arab/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 "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 "(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/uk/torbutton.dtd b/uk/torbutton.dtd
index 1da9979..4944a3f 100644
--- a/uk/torbutton.dtd
+++ b/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,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...">
 <!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 "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ Ð½Ðµ-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 "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 "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ 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/ur/torbutton.dtd b/ur/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ur/torbutton.dtd
+++ b/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,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 "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 "(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/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index 45efb15..b57b991 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -1,7 +1,5 @@
-<!ENTITY torbutton.prefs.title "Ù¹ÙˆØ± Ø¨Ù¹Ù† ØªØ±Ø¬ÛŒØØ§Øª">
 <!ENTITY torbutton.prefs.tor_settings "Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªØ±ØªÛŒØ¨Ø§Øª">
 <!ENTITY torbutton.prefs.recommended_settings "Ù…ÛŒØ±Û’ Firefox Ú©Û’ ÙˆØ±Ú˜Ù† Ú©ÛŒÙ„Ø¦Û’ Ø³ÙØ§Ø±Ø´ Ú©Ø±Ø¯Û Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªØ±ØªÛŒØ¨Ø§Øª Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº">
-<!ENTITY torbutton.prefs.use_privoxy "Prixoxy Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº">
 <!ENTITY torbutton.prefs.use_polipo "polipo Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº">
 <!ENTITY torbutton.prefs.custom_settings "Ø±Ø³Ù…ÛŒ Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªØ±ØªÛŒØ¨Ø§Øª Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Ù¾Ø±Ø§Ú©Ø³ÛŒ">
@@ -10,15 +8,6 @@
 <!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 "ÙˆØ±Ú˜Ù†: ">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Ú©ÙˆÚˆ Ù…ÛŒÚº ØØµÛ ÚˆØ§Ù„Ù†Û’ ÙˆØ§Ù„Û’ :">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "ØÙØ§Ø¸ØªÛŒ Ø¬Ø§Ø¦Ø²Û:">
-<!ENTITY torbutton.about.donate "Ø§Ú¯Ø± Ø§Ù“Ù¾ Ú©Ùˆ Ù¹Ø§Ø± Ù¾Ø³Ù†Ø¯ ÛÛ’
-ØªÙˆ Ø§Ù† Ù¾Û Ø¨Ú¾ÛŒ Ù†Ø¸Ø± ÚˆØ§Ù„ÛŒÚº">
-<!ENTITY torbutton.about.make_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 "Ù…Ø¯Ø¯">
@@ -27,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 "Ø§ÛŒØ³">
 <!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 "Ù¹Ø§Ø±Ø¨Ù¹Ù†">
 <!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 "ØªØ§Ø±ÛŒØ®">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!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 "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">
@@ -133,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 "(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.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
@@ -177,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/uz/torbutton.dtd b/uz/torbutton.dtd
index e3e3046..88f06f8 100644
--- a/uz/torbutton.dtd
+++ b/uz/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 "Andozalarni tiklash">
 <!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 "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 "Himoyalangan">
 <!ENTITY torbutton.cookiedialog.domainCol "Xost">
@@ -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 "(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/ve/torbutton.dtd b/ve/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ve/torbutton.dtd
+++ b/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,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 "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 "(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/vi/torbutton.dtd b/vi/torbutton.dtd
index 48d6ace..ec685a9 100644
--- a/vi/torbutton.dtd
+++ b/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/wa/torbutton.dtd b/wa/torbutton.dtd
index 32c680f..12364fc 100644
--- a/wa/torbutton.dtd
+++ b/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,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 "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 "(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/wo/torbutton.dtd b/wo/torbutton.dtd
index 32c680f..12364fc 100644
--- a/wo/torbutton.dtd
+++ b/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,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 "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 "(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/yo/torbutton.dtd b/yo/torbutton.dtd
index 32c680f..12364fc 100644
--- a/yo/torbutton.dtd
+++ b/yo/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 "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 "(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/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index d947470..280f682 100644
--- a/zh_CN/torbutton.dtd
+++ b/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/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd
index 8c0884a..ac24c39 100644
--- a/zh_HK/torbutton.dtd
+++ b/zh_HK/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æ´‹è”¥è·¯ç”±ç€è¦½å™¨å‡ç´šâ€¦">
 <!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æ´‹è”¥è·¯ç”±ç£ç¢Ÿå¿«å˜ï¼Œä¸¦å–ºåˆ‡æ›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 "ç‚ºæ´‹è”¥è·¯ç”±è¨å®šç”¨æˆ¶ä»£ç†(é‡è¦)">
-<!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æ´‹è”¥è·¯ç”±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 "éžToræ´‹è”¥è·¯ç”±">
-<!ENTITY torbutton.prefs.restore_tor "å•Ÿå‹•é‚„åŽŸå·¥ä½œéšŽæ®µæ™‚ï¼Œå°‡Toræ´‹è”¥è·¯ç”±ç‹€æ…‹è¨å®šæˆï¼š">
-<!ENTITY torbutton.prefs.startup_tor "å•Ÿå‹•ç€è¦½å™¨æ™‚ï¼Œå°‡Toræ´‹è”¥è·¯ç”±ç‹€æ…‹è¨å®šæˆï¼š">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefoxç¨‹å¼å´©å¡Œæ™‚é‡æ–°è¼‰å…¥Jarâ•±æ¸…ç†Cookies (å»ºè°)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "å°‡Toræ´‹è”¥è·¯ç”±åŒéžToræ´‹è”¥è·¯ç”±å˜…CookieåŒæ™‚å˜æ”¾å–ºå—ä¿è·å˜…Jarå…§(å±éšª)">
-<!ENTITY torbutton.prefs.clear_http_auth "æ¸…é™¤httpé©—è‰å·¥ä½œéšŽæ®µ(å»ºè°)">
-<!ENTITY torbutton.prefs.block_js_history "éš”é›¢ç€è¦½æ·ç¨‹è¨˜éŒ„å˜…å˜å–åˆ°Toræ´‹è”¥è·¯ç”±ç‹€æ…‹(é‡è¦)">
-<!ENTITY torbutton.prefs.resize_on_toggle "èª¿æ•´è¦–çª—å°ºå¯¸æˆ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æ†‘è‰åˆ†é–‹JaråšŸå˜æ”¾(å»ºè°)">
-<!ENTITY torbutton.prefs.jar_ca_certs "å°‡Toræ´‹è”¥è·¯ç”±å’ŒéžToræ´‹è”¥è·¯å˜…CAæ†‘è‰åˆ†é–‹JaråšŸå˜æ”¾(å»ºè°)">
-<!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 "é˜»æ¢éž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 "ä½¿ç”¨Toræ´‹è”¥è·¯ç”±æ™‚ï¼Œåœç”¨Livemarksæ›´æ–°">
-<!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æ´‹è”¥è·¯ç”±æ™‚ï¼Œåœç”¨Livemarksæ›´æ–°">
-<!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 "é€æ˜ŽTorification(é ˆè‡ªè¨‚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/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd
index fcdd1a2..ad7b04e 100644
--- a/zh_TW/torbutton.dtd
+++ b/zh_TW/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 Host:">
 <!ENTITY torbutton.prefs.proxy.port "é€£æŽ¥åŸ :">
-<!ENTITY torbutton.about.title "é—œæ–¼ Torbutton">
-<!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 "åœç”¨ 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 "å»ºç«‹æ–°çš„æ´‹è”¥è·¯ç”±è¿´è·¯ä¾†é€£æŽ¥ä¸Šæ¤ç¶²ç«™">
 <!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 "é—œæ–¼ 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 "Cookie ä¿è·">
 <!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 "Torbutton">
 <!ENTITY torbutton.button.tooltip "æŒ‰ä¸€ä¸‹ä»¥åˆå§‹åŒ– Torbutton">
 <!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 "å°éŽ–æ´‹è”¥è·¯ç”±ç£ç¢Ÿå¿«å–ï¼Œä¸¦åœ¨åˆ‡æ›æ´‹è”¥è·¯ç”±ç‹€æ…‹æ™‚æ¸…é™¤æ‰€æœ‰å¿«å–è¨˜éŒ„">
-<!ENTITY torbutton.prefs.block_cache "åœ¨æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“ï¼Œé˜»æ“‹ç£ç¢Ÿå’Œè¨˜æ†¶é«”å¿«å–çš„å˜å–">
-<!ENTITY torbutton.prefs.cookie_jars "å°‡éžæ´‹è”¥è·¯ç”±çš„ cookie å˜æ”¾åœ¨å—ä¿è·çš„ jar è£¡">
-<!ENTITY torbutton.prefs.cookie_protection "ä½¿ç”¨ Cookie ä¿è·å°è©±æ–¹å¡Šä¾†é¸æ“‡">
-<!ENTITY torbutton.prefs.mmm_cookies "æˆ‘å°‡æ‰‹å‹•ç®¡ç†æˆ‘çš„ cookie(å±éšª)">
-<!ENTITY torbutton.prefs.clear_cookies "æ´‹è”¥è·¯ç”±ç‹€æ…‹åˆ‡æ›æ™‚æ¸…é™¤ cookie">
-<!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 "Cookies">
-<!ENTITY torbutton.prefs.cache "å¿«å–">
-<!ENTITY torbutton.prefs.history "æ·ç¨‹è¨˜éŒ„">
-<!ENTITY torbutton.prefs.no_search "åœ¨æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“ï¼Œåœç”¨æœå°‹å»ºè°(å»ºè°ä½¿ç”¨)">
-<!ENTITY torbutton.prefs.shutdown "é—œé–‰">
-<!ENTITY torbutton.prefs.tor_shutdown "ç•¶å•Ÿç”¨äº†æ´‹è”¥è·¯ç”±çš„ç€è¦½å™¨é—œé–‰æ™‚ï¼Œæ¸…é™¤æ´‹è”¥è·¯ç”± 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 "åœ¨æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“å½é€ ç©ºç™½åƒç…§é (å¯èƒ½æœƒä¸æ–·æŸäº›ç¶²ç«™)">
-<!ENTITY torbutton.prefs.smartspoof "referer spoof during Tor usage">
-<!ENTITY torbutton.prefs.nospoof "æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“ç„¡åƒç…§é å‡å†’(æ£å¸¸ç™¼é€åƒç…§é )">
-<!ENTITY torbutton.prefs.disable_domstorage "åœ¨æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“ï¼Œåœç”¨ 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 "å°‡ Tor å’Œéž Tor cookie åŒæ™‚å˜æ”¾åœ¨å—ä¿è·çš„ jar ä¸(å±éšª)">
-<!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 å°‡ SSL æ†‘è‰å˜æ”¾åœ¨å–®ç¨çš„ jar ä¸(å»ºè°ä½¿ç”¨)">
-<!ENTITY torbutton.prefs.jar_ca_certs "å°æ–¼ Tor/éž Tor å°‡ CA æ†‘è‰å˜æ”¾åœ¨å–®ç¨çš„ jar ä¸(å»ºè°ä½¿ç”¨)">
-<!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 "é˜»æ¢éž 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 "Tor ä½¿ç”¨æœŸé–“åœç”¨ livemarks æ›´æ–°">
-<!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 "æ´‹è”¥è·¯ç”±ä½¿ç”¨æœŸé–“ç„¡åƒç…§é å‡å†’(æ£å¸¸ç™¼é€åƒç…§é )">
-<!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 "ä¸»æ©Ÿ">
@@ -132,17 +43,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å…¨éƒ¨åˆªé™¤ï¼Œä½†å—ä¿è·">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿è·æ–°çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸ä¿è·æ–°çš„ Cookie">
-<!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 "é€éŽ 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 "é€æ˜Ž Torification(éœ€è¦è‡ªè¨‚ 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/zu/torbutton.dtd b/zu/torbutton.dtd
index 32c680f..12364fc 100644
--- a/zu/torbutton.dtd
+++ b/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,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 "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 "(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">

