[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
From: translation@xxxxxxxxxxxxxx
Date: Sat, 4 Jun 2016 09:47:10 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 04 Jun 2016 05:48:38 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 353245b040f1974c0507feb958ed800c0c993ad8
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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@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@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@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 "&quot;Proxy&quot; 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 "&quot;Hook&quot; 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 &quot;file://&quot; URLetatik sarera sartzea (gomendatua)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Blokeatu Ez-Torek &quot;file://&quot; 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 "àº®àº¸à»?àº? &quot;à»?àº§àºµàº?àº±àº?&quot;:">
-<!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 "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? &quot;Ð?Ð½Ð¾Ð¿ÐºÑ?&quot; Ð¸ &quot;Ð?Ð¾Ñ?Ñ?Ñ?Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸Ñ?Ð¸&quot; Ð´Ð»Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ð²Ñ?Ð°Ñ?ÐµÐ½Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ð°">
-<!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 "Ð?Ñ?Ð¾Ð·Ñ?Ð°Ñ?Ð½Ð°Ñ? &quot;Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?&quot; (Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¸Ñ? 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@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd
index 3db6f27..c7c2f3a 100644
--- a/ru@petr1708/torbutton.dtd
+++ b/ru@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 &quot;vazo&quot; 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@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 7aa7af4..12364fc 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@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@Arab/torbutton.dtd b/ug@Arab/torbutton.dtd
index 32c680f..12364fc 100644
--- a/ug@Arab/torbutton.dtd
+++ b/ug@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">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
Next by Author: [tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
Previous by thread: [tor-commits] [torbutton/master] Release preparations for 1.9.6
Next by thread: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
Index(es):
- Author
- Thread