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

[translation@xxxxxxxxxxxxxx]

commit a960a49489b4da61f6778dd7121060197b2ea1d7
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Fri Aug 26 08:48:01 2016 +0000

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

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index 12364fc..0720208 100644
--- a/ach/torbutton.dtd
+++ b/ach/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ady/torbutton.dtd b/ady/torbutton.dtd
index 12364fc..0720208 100644
--- a/ady/torbutton.dtd
+++ b/ady/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/af/torbutton.dtd b/af/torbutton.dtd
index 12364fc..0720208 100644
--- a/af/torbutton.dtd
+++ b/af/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ak/torbutton.dtd b/ak/torbutton.dtd
index 12364fc..0720208 100644
--- a/ak/torbutton.dtd
+++ b/ak/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/am/torbutton.dtd b/am/torbutton.dtd
index a2829aa..1d7d6f9 100644
--- a/am/torbutton.dtd
+++ b/am/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "á?¨á?°á?ª á??á??á?¥á?®á?½">
-<!ENTITY torbutton.prefs.recommended_settings "á??á?¥á?? á?¨Firefox á?µá?ªá?µ á?¨á??á??á?¨á?©á?µá?? á?¨á?°á?ª á??á??á?¥á?®á?½ á?­á? á??á??">
-<!ENTITY torbutton.prefs.use_polipo "Polipoá?? á?­á? á??á??">
-<!ENTITY torbutton.prefs.custom_settings "á?¥á?? á?¨á?°á?ª á??á??á?¥á?®á?½á?? á?­á? á??á??">
-<!ENTITY torbutton.prefs.proxy.host.http "�HTTP ���">
-<!ENTITY torbutton.prefs.proxy.host.https "�SSL ���">
-<!ENTITY torbutton.prefs.proxy.host.ftp "�FTP ���">
-<!ENTITY torbutton.prefs.proxy.host.gopher "�Gopher ���">
-<!ENTITY torbutton.prefs.proxy.host.socks "á?¨SOCKS á? á?µá?°á??á??á??á?¦">
-<!ENTITY torbutton.prefs.proxy.port "á??á?°á?¥á?¦">
-<!ENTITY torbutton.pref_connection.notice "á?¥á??á??á??á?? á??á??á?¥á?®á?½ á??á??á??á?¨á?­ Torbuttoná?? á?«á?°á??á?­á??á?¢">
-<!ENTITY torbutton.pref_connection.more_info "á?°á?¨á??á?ª á??á?¨á??">
-<!ENTITY torbutton.pref_connection_more_info.title "á?¥á??á??">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á? á? á??á?? á??á?? á??á??á?·á??á?¢  á?¨Tor á?«á??á??á?? á??á??á?¥á?®á?½á??á?? á??á??á?¨á?­ á?¨á??á??á??á?? á?¨á??á?? á?¥á?£á?­á?? Torbuttoná?? á?«á?°á??á?­á??á?µá?? á??á?°á??á?? á?­á??á??á?±á?¢ á?¨Tor á??á??á?¥á?®á?½á??á?? á??á??á?¨á?­ á?¨á??á??á??á?? á?¨á??á?? á?¥á?£á?­á?? á?¨Torbutton á??á?­á?« á??á?µá?®á?±á?? á?­á? á??á??á?¢">
 <!ENTITY torbutton.context_menu.new_identity "á? á?²á?µ á??á??á??á?µ">
 <!ENTITY torbutton.context_menu.new_identity_key "á?¥á??">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbuttoná?? á??á??á?µá??á??á?­ á? á?? á?«á?µá?­á??">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "á??á?£á?ªá??á?½á?? á??á?°á??á? á?©á? á?µ á??á??á?µ">
-<!ENTITY torbutton.prefs.test_settings "á??á??á?¥á?®á?½á?? á??á?­á?­">
-<!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.cookiedialog.title "á?¨á?©á?ª á?¥á? á??á??á?½á?? á? á??á??á?¥á?­">
 <!ENTITY torbutton.cookiedialog.lockCol "á?¨á?°á? á? á??">
 <!ENTITY torbutton.cookiedialog.domainCol "á? á?µá?°á??á??á??">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á?¨á?°á? á? á??á?µ á? á?µá?°á??á?­ á??á??á??á?? á? á?µá??á??á?µ">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?¥á??">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?µá? á?¥á??">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (á?¥á?? transproxy á??á?­á?? á?¨Tor á?«á??á?°á?­ á?«á?µá??á??á??á??á??)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "á?¨á? á?°á?³ á?³á?ªá?­á?? á??á?­á?? á?¨á?µá?­ á?£á?¢á?« á??á??á?¥á?? á? á?µá??á??á??á?¥ (á?¨á??á?? á? á?°á?³ á??á??á?³á?? á?«á??á??á??)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á?¨á?¶á?µá?°á?? á??á??á?? á?©á?ªá??á?½á?? á?¥á?? á??á??á?½ á??á?¨á?³á?°á?« á??á??á?¥á?? á??á?µá?¥">
diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index 43601b2..0da10fd 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "إعدادات اÙ?برÙ?Ù?سÙ?">
-<!ENTITY torbutton.prefs.recommended_settings "استخدÙ? إعدادات اÙ?برÙ?Ù?سÙ? اÙ?Ù?حبÙ?ذة Ù?Ù?Ø°Ù? اÙ?Ù?سخة Ù?Ù? Ù?اÙ?رÙ?Ù?س">
-<!ENTITY torbutton.prefs.use_polipo "استخدÙ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "استخدÙ? إعدادات برÙ?Ù?سÙ? Ù?خصصة">
-<!ENTITY torbutton.prefs.proxy.host.http "برÙ?Ù?سÙ? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "برÙ?Ù?سÙ? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "برÙ?Ù?سÙ? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "برÙ?Ù?سÙ? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "برÙ?Ù?سÙ? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "اÙ?بÙ?ابة:">
-<!ENTITY torbutton.pref_connection.notice "عطÙ?Ù? زر تÙ?ر Ù?تغÙ?Ù?ر Ù?Ø°Ù? اÙ?إعدادات.">
-<!ENTITY torbutton.pref_connection.more_info "Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات">
-<!ENTITY torbutton.pref_connection_more_info.title "اÙ?تعÙ?Ù?Ù?ات">
-<!ENTITY torbutton.pref_connection_more_info.text "زر تÙ?ر Ù?Ù?عÙ?Ù? حاÙ?Ù?Ù?ا. إذا Ù?Ù?ت ترÙ?د تغÙ?Ù?ر إعدادات اÙ?برÙ?Ù?سÙ? غÙ?ر اÙ?Ù?تعÙ?Ù?Ø© بتÙ?رØ? Ù?ضÙ?اÙ? عطÙ? زر تÙ?ر Ø£Ù?Ù?اÙ? Ø«Ù? عد Ø¥Ù?Ù? Ù?Ù?ا. Ø¥Ù? Ù?Ù?ت ترÙ?د تعدÙ?Ù? إعدادات زر تÙ?ر Ù?استخدÙ? Ù?اÙ?ذة تÙ?ضÙ?Ù?ات زر تÙ?ر.">
 <!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Ù?Ø© جدÙ?دة">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "دائرة تÙ?ر جدÙ?دة Ù?Ù?ذا اÙ?Ù?Ù?Ù?ع">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "اÙ?Ù?ر Ù?بدء زر تÙ?ر">
 <!ENTITY torbutton.prefs.privacy_security_settings "إعدادات اÙ?Ø£Ù?اÙ? Ù?اÙ?خصÙ?صÙ?Ù?Ø©">
 <!ENTITY torbutton.prefs.restore_defaults "استعادة اÙ?اÙ?تراضÙ?ات">
-<!ENTITY torbutton.prefs.test_settings "Ù?حص اÙ?إعدادات">
-<!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.cookiedialog.title "إدارة إعدادت اÙ?Ø­Ù?اÙ?Ø© Ù?Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط">
 <!ENTITY torbutton.cookiedialog.lockCol "Ù?Ø­Ù?Ù?Ø©">
 <!ENTITY torbutton.cookiedialog.domainCol "استضاÙ?Ø©">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "إزاÙ?Ø© اÙ?Ù?Ù? Ù?Ù?Ù? استÙ?ر Ù?Ù? اÙ?Ø­Ù?اÙ?Ø©">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "احÙ? Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط اÙ?جدÙ?دة">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù?ا تحÙ? Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط اÙ?جدÙ?دة">
-<!ENTITY torbutton.prefs.transparentTor "Ø´Ù?اÙ?Ù?Ø© تÙ?رÙ?Ù?Ù?Ù?Ø´Ù? (تحتاج Ù?Ù?جÙ? تÙ?ر Ø£Ù? تراÙ?سبÙ?Ù?سÙ? Ù?خصص)">
 <!ENTITY torbutton.prefs.priv_caption "إعدادات اÙ?خصÙ?صÙ?Ø©">
 <!ENTITY torbutton.prefs.block_disk "Ù?ا تسجÙ? سجÙ? اÙ?تصÙ?Ø­ Ø£Ù? بÙ?اÙ?ات اÙ?Ù?Ù?اÙ?ع اÙ?Ø£Ù?Ù?ترÙ?Ù?Ù?Ø© (تÙ?عÙ?Ù? اÙ?تصÙ?Ø­ اÙ?خصÙ?صÙ?)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "تÙ?Ù?Ù?د اÙ?Ù?Cookies اÙ?خاصة باÙ?طرÙ? اÙ?ثاÙ?Ø« Ù? بÙ?اÙ?ات اÙ?تتبع اÙ?أخرÙ?.">
diff --git a/arn/torbutton.dtd b/arn/torbutton.dtd
index 12364fc..0720208 100644
--- a/arn/torbutton.dtd
+++ b/arn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ast/torbutton.dtd b/ast/torbutton.dtd
index 12364fc..0720208 100644
--- a/ast/torbutton.dtd
+++ b/ast/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/az/torbutton.dtd b/az/torbutton.dtd
index 5f0e8af..6e9f689 100644
--- a/az/torbutton.dtd
+++ b/az/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Bu qurÄ?uları dÉ?yiÅ?mÉ?k üçün TordüymÉ?sini söndür.">
-<!ENTITY torbutton.pref_connection.more_info "Daha çox mÉ?lumat">
-<!ENTITY torbutton.pref_connection_more_info.title "KömÉ?k">
-<!ENTITY torbutton.pref_connection_more_info.text "TordüymÉ?si hal hazırda yanılıdır.   Æ?gÉ?r Tordan baÅ?qa qurÄ?uları dÉ?yiÅ?mÉ?k istÉ?yirsÉ?nsÉ? zÉ?hmÉ?t olmasa TordüymÉ?sini söndürün vÉ? bura qayıdın.   Æ?gÉ?r Tor qurÄ?ularını dÉ?yiÅ?mÉ?k istÉ?yirsÉ?nsÉ? zÉ?hmÉ?t olmasa TordüymÉ?si seçimlÉ?ri pÉ?ncÉ?rÉ?sindÉ?n istifadÉ? edin.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Varsayılanları yenidÉ?n yüklÉ?">
-<!ENTITY torbutton.prefs.test_settings "Test qurÄ?uları">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ba/torbutton.dtd b/ba/torbutton.dtd
index 12364fc..0720208 100644
--- a/ba/torbutton.dtd
+++ b/ba/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/be/torbutton.dtd b/be/torbutton.dtd
index 3b055d5..9e948a0 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аладкÑ? Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "УжÑ?ваÑ?Ñ? наладкÑ? пÑ?окÑ?Ñ? длÑ? майго бÑ?аÑ?зеÑ?а Firefox">
-<!ENTITY torbutton.prefs.use_polipo "УжÑ?ваÑ?Ñ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "УжÑ?ваÑ?Ñ? адмÑ?Ñ?ловÑ?Ñ? наладкÑ? пÑ?окÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Ð?Ñ?клÑ?Ñ?Ñ?Ñ?Ñ? Torbutton каб змÑ?нÑ?Ñ?Ñ? гÑ?Ñ?Ñ?Ñ? наладкÑ?.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?олÑ?Ñ? Ñ?нÑ?аÑ?маÑ?Ñ?Ñ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?аведка">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton заÑ?аз вÑ?клÑ?Ñ?анÑ?.  Ð?алÑ? вÑ? жадаеÑ?е змÑ?нÑ?Ñ?Ñ? ваÑ?Ñ?Ñ? не-Tor proxy наладкÑ?, калÑ? лаÑ?ка, вÑ?клÑ?Ñ?Ñ?Ñ?е Torbutton Ñ? вÑ?Ñ?нÑ?Ñ?еÑ?Ñ? Ñ?Ñ?дÑ?.  Ð?алÑ? вÑ? жадаеÑ?е змÑ?нÑ?Ñ?Ñ? ваÑ?Ñ?Ñ? Tor наладкÑ?, Ñ?каÑ?Ñ?Ñ?Ñ?айÑ?еÑ?Ñ? вакном Ñ?лаÑ?Ñ?Ñ?ваÑ?Ñ?Ñ?Ñ? Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?оваÑ? аÑ?абÑ?Ñ?Ñ?аÑ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index ad91d97..fb04c9d 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?Ñ?окÑ?и наÑ?Ñ?Ñ?ойки">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?зползвай пÑ?епоÑ?Ñ?Ñ?иÑ?елниÑ?е пÑ?окÑ?и наÑ?Ñ?Ñ?ойки за моÑ?Ñ?а веÑ?Ñ?иÑ? на Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?зползвай Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?зползвай Ñ?азлиÑ?ни пÑ?окÑ?и наÑ?Ñ?Ñ?ойки">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð?Ñ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Ð?Ñ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Ð?Ñ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð?Ñ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ХоÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?овеÑ?е инÑ?оÑ?маÑ?иÑ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?ова Ñ?амолиÑ?ноÑ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?ова Tor Ñ?еÑ?иÑ? за Ñ?ози Ñ?айÑ?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?аÑ?иÑ?ни за иниÑ?иализиÑ?ане на Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ð?иÑ?ни и заÑ?иÑ?ни наÑ?Ñ?Ñ?ойки">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ñ?зÑ?Ñ?анови Ñ?Ñ?андаÑ?Ñ?ниÑ?е">
-<!ENTITY torbutton.prefs.test_settings "ТеÑ?Ñ?вай Ð?аÑ?Ñ?Ñ?ойкиÑ?е">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ен">
 <!ENTITY torbutton.cookiedialog.domainCol "ХоÑ?Ñ?">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bn/torbutton.dtd b/bn/torbutton.dtd
index 0413dac..0720208 100644
--- a/bn/torbutton.dtd
+++ b/bn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "প�র��সি স��ি�স">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP প�র��সি:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL প�র��সি:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP প�র��সি:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "প�র��:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "�র� তথ�য">
-<!ENTITY torbutton.pref_connection_more_info.title "সাহায�য">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd
index 12364fc..0720208 100644
--- a/bn_BD/torbutton.dtd
+++ b/bn_BD/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bn_IN/torbutton.dtd b/bn_IN/torbutton.dtd
index 12364fc..0720208 100644
--- a/bn_IN/torbutton.dtd
+++ b/bn_IN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bo/torbutton.dtd b/bo/torbutton.dtd
index 12364fc..0720208 100644
--- a/bo/torbutton.dtd
+++ b/bo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/br/torbutton.dtd b/br/torbutton.dtd
index 15afd28..0720208 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/brx/torbutton.dtd b/brx/torbutton.dtd
index 5edb571..0720208 100644
--- a/brx/torbutton.dtd
+++ b/brx/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "मदद">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/bs/torbutton.dtd b/bs/torbutton.dtd
index b7412f2..394ba43 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Koristi Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Koristi standardne proksi postavke">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP proksi:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "OnemoguÄ?i Torbutton za promjenu ovih postavki.">
-<!ENTITY torbutton.pref_connection.more_info "Više Informacija">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati poÄ?etno">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index e1ff73b..694fc75 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configuració del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usa la configuració recomanada de proxy per a la meva versió de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Utilitza Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usa una configuració del proxy personalitzada">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Amfitrió SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "No permetis que Torbutton canvii aquesta configuració.">
-<!ENTITY torbutton.pref_connection.more_info "Més informació">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton està activat.   Si voleu canviar la configuració del vostre proxy quan no funciona Tor, desactiveu Torbutton i torneu aquí.  Si voleu canviar la configuració de Tor, utilitzeu la finestra de preferències de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nova identitat">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Reestableix predeterminats">
-<!ENTITY torbutton.prefs.test_settings "Test de configuració">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ceb/torbutton.dtd b/ceb/torbutton.dtd
index 12364fc..0720208 100644
--- a/ceb/torbutton.dtd
+++ b/ceb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd
index ff91ff3..a2a298b 100644
--- a/cs/torbutton.dtd
+++ b/cs/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Použití Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Použít vlastní nastavení proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Zakázat aplikaci Torbutton toto nastavení mÄ?nit.">
-<!ENTITY torbutton.pref_connection.more_info "Více informací">
-<!ENTITY torbutton.pref_connection_more_info.title "NápovÄ?da">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je momentálnÄ? zapnutý.    Pokud chcete zmÄ?nit vaÅ¡e non-Tor proxy nastavení, vypnÄ?te prosím Torbutton a vraÅ¥te se.    Pokud chcete zmÄ?nit vaÅ¡e Tor nastavení, použijte prosím okno nastavení Torbutton">
 <!ENTITY torbutton.context_menu.new_identity "Nova identita">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "Nové pÅ?ipojení k Toru pro tuto stránku">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Původní nastavení">
-<!ENTITY torbutton.prefs.test_settings "Test nastavení">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/csb/torbutton.dtd b/csb/torbutton.dtd
index 12364fc..0720208 100644
--- a/csb/torbutton.dtd
+++ b/csb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/cv/torbutton.dtd b/cv/torbutton.dtd
index 90c1ea7..0720208 100644
--- a/cv/torbutton.dtd
+++ b/cv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?Ä?:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/cy/torbutton.dtd b/cy/torbutton.dtd
index 1da390d..59f18c5 100644
--- a/cy/torbutton.dtd
+++ b/cy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Defnyddiwch Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Defnyddiwch gosodiadau procsi addasiedig">
-<!ENTITY torbutton.prefs.proxy.host.http "Dirprwy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Procsi SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Procsi FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Procsi Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Gwesteiwr SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porth">
-<!ENTITY torbutton.pref_connection.notice "Analluoga Torbutton i newid y gosodiadau yma.">
-<!ENTITY torbutton.pref_connection.more_info "Mwy o gwybodaeth">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?опомога">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS V5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/da/torbutton.dtd b/da/torbutton.dtd
index 493f033..4fe3f21 100644
--- a/da/torbutton.dtd
+++ b/da/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Brug Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for at ændre disse indstillinger.">
-<!ENTITY torbutton.pref_connection.more_info "Mere Information">
-<!ENTITY torbutton.pref_connection_more_info.title "Hjælp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i øjeblikket aktiveret. Hvis du vil ændre dine ikke-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage hertil. Hvis du vil ændre dine Tor indstillinger, kan du benytte Torbuttons Indstillingsvindue.">
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nyt Tor Circuit for dette site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privatlivs- og Sikkerhedsindstillinger">
 <!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
-<!ENTITY torbutton.prefs.test_settings "Test Indstillinger">
-<!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.cookiedialog.title "Håndtér Cookie-beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vært">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begræns tredjeparts-cookies og andre registreringsdata">
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 5e4b0e3..c711ed2 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Polipo verwenden">
-<!ENTITY torbutton.prefs.custom_settings "Individuelle Vermittlungsservereinstellungen verwenden">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutten ist momentan aktiv. Wenn Sie die Vermittlungsservereinstellungen für den Betrieb ohne Tor ändern möchten, bitte zuerst Torbutton deaktivieren. Zum �ndern der Tor-Einstellungen bitte das Fenster »Torbutton-Einstellungen« verwenden.">
 <!ENTITY torbutton.context_menu.new_identity "Neue Identität">
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal für diese Seite">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privatsphäre- und Sicherheits-Einstellungen">
 <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen">
-<!ENTITY torbutton.prefs.test_settings "Einstellungen testen">
-<!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.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "Geschützt">
 <!ENTITY torbutton.cookiedialog.domainCol "Rechner">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere �berwachungsdaten einschränken">
diff --git a/dz/torbutton.dtd b/dz/torbutton.dtd
index 12364fc..0720208 100644
--- a/dz/torbutton.dtd
+++ b/dz/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index 0172360..e5caffc 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ΡÏ?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή">
-<!ENTITY torbutton.prefs.recommended_settings "ΧÏ?ήÏ?η Ï?Ï?ν Ï?Ï?οÏ?εινÏ?μενÏ?ν Ï?Ï?θμίÏ?εÏ?ν για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α έκδοÏ?η Ï?οÏ? Firefox">
-<!ENTITY torbutton.prefs.use_polipo "ΧÏ?ήÏ?η Polipo">
-<!ENTITY torbutton.prefs.custom_settings "ΧÏ?ήÏ?η Ï?Ï?οÏ?αÏ?μοÏ?μένÏ?ν Ï?Ï?θμίÏ?εÏ?ν διαμεÏ?ολαβηÏ?ή">
-<!ENTITY torbutton.prefs.proxy.host.http "Î?ιαμεÏ?ολαβηÏ?ήÏ? HTTP :">
-<!ENTITY torbutton.prefs.proxy.host.https "Î?ιαμεÏ?ολαβηÏ?ήÏ? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Î?ιαμεÏ?ολαβηÏ?ήÏ? FTP :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Î?ιαμεÏ?ολαβηÏ?ήÏ? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Î?ενÏ?Ï?ικÏ?Ï? Ï?Ï?ολογιÏ?Ï?ήÏ? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Î?Ï?Ï?α:">
-<!ENTITY torbutton.pref_connection.notice "Î?Ï?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton για να αλλάξεÏ?ε αÏ?Ï?έÏ? Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ?.">
-<!ENTITY torbutton.pref_connection.more_info "ΠεÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Î?οήθεια">
-<!ENTITY torbutton.pref_connection_more_info.text "Το Torbutton είναι ενεÏ?γοÏ?οιημένο.Î?ν θέλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή, εκÏ?Ï?Ï? Ï?οÏ? Tor, αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton και εÏ?ιÏ?Ï?Ï?έÏ?Ï?ε εδÏ?. Î?ν θέλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? για Ï?ον διαμεÏ?ολαβηÏ?ή Tor, Ï?Ï?ηÏ?ιμοÏ?οιήÏ?Ï?ε Ï?ο Ï?αÏ?άθÏ?Ï?ο εÏ?ιλογÏ?ν Ï?οÏ? Torbutton">
 <!ENTITY torbutton.context_menu.new_identity "Î?έα ΤαÏ?Ï?Ï?Ï?ηÏ?α">
 <!ENTITY torbutton.context_menu.new_identity_key "Τ">
 <!ENTITY torbutton.context_menu.new_circuit "Î?έο κÏ?κλÏ?μα Tor για αÏ?Ï?ήν Ï?ην ιÏ?Ï?οÏ?ελίδα">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Î?άνÏ?ε κλικ για να εκκίνηÏ?η Ï?οÏ? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ΡÏ?θμίÏ?ειÏ? Ï?Ï?οÏ?Ï?Ï?ικÏ?ν δεδομένÏ?ν και αÏ?Ï?άλειαÏ?">
 <!ENTITY torbutton.prefs.restore_defaults "Î?Ï?οκαÏ?άÏ?Ï?αÏ?η αÏ?Ï?ικÏ?ν Ï?Ï?θμίÏ?εÏ?ν">
-<!ENTITY torbutton.prefs.test_settings "Î?λεγÏ?οÏ? Ï?Ï?θμίÏ?εÏ?ν">
-<!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.cookiedialog.title "Î?ιαÏ?είÏ?ιÏ?η Î Ï?οÏ?Ï?αÏ?ίαÏ? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Î Ï?οÏ?Ï?αÏ?εÏ?μένα">
 <!ENTITY torbutton.cookiedialog.domainCol "Î?ικοδεÏ?Ï?Ï?Ï?ηÏ?">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Î?Ï?αίÏ?εÏ?η Î?λÏ?ν Î?κÏ?Ï?Ï? αÏ?Ï? Ï?Ï?ν Î Ï?οÏ?Ï?αÏ?εÏ?μένÏ?ν">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Î Ï?οÏ?Ï?αÏ?ία Î?έÏ?ν Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Î?α Î?η γίνεÏ?αι Î Ï?οÏ?Ï?αÏ?ία Î?έÏ?ν Cookie">
-<!ENTITY torbutton.prefs.transparentTor "Î?ιαÏ?ανήÏ? Torification  (Î?Ï?αιÏ?εί Ï?Ï?οÏ?αÏ?μοÏ?μένο  proxy ή Tor δÏ?ομολογηÏ?ή)">
 <!ENTITY torbutton.prefs.priv_caption "ΡÏ?θμίÏ?ειÏ? αÏ?οÏ?Ï?ήÏ?οÏ?">
 <!ENTITY torbutton.prefs.block_disk "Î?αμμια καÏ?αγÏ?αÏ?η Ï?οÏ? ιÏ?Ï?οÏ?ικÏ?Ï? Ï?εÏ?ιήγηÏ?ηÏ? ή δεδομένÏ?ν ιÏ?Ï?οÏ?ελίδαÏ? (ενεÏ?γοÏ?οιηÏ?η Ï?ηÏ?  καÏ?άÏ?Ï?αÏ?ηÏ? ιδιÏ?Ï?ικήÏ? Ï?εÏ?ιήγηÏ?ηÏ?) ">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ΠεÏ?ιοÏ?ιÏ?μοÏ? Ï?Ï?ν cookies Ï?Ï?ιÏ?Ï?ν και αλλÏ?ν δεδομενÏ?ν Ï?αÏ?ακολοÏ?θηÏ?ηÏ?">
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index 12364fc..0720208 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index 4dc53d9..979265c 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/eo/torbutton.dtd b/eo/torbutton.dtd
index 2e03847..7571e17 100644
--- a/eo/torbutton.dtd
+++ b/eo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Uzi Polipoâ??n">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTPâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSLâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTPâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Pordo:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Helpo">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nova idento">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Agordoj de privateco kaj sekureco">
 <!ENTITY torbutton.prefs.restore_defaults "RestaÅ­ri defaÅ­ltojn">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index 8d4518a..57f4be5 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configuración del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usar la configuración proxy recomendada para mi versión de Firefox">
-<!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:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Servidor SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Si desea cambiar la configuración para proxy de su navegación sin Tor, desactive Torbutton y regrese aquí. Si desea cambiar su configuración para Tor, use la ventana de preferencias de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nueva identidad (nueva instancia y conexiones de Tor)">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados ">
-<!ENTITY torbutton.prefs.test_settings "Probar configuración">
-<!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.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
 <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
diff --git a/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 68381db..212b389 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -1,19 +1,3 @@
-<!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_polipo "Usar Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use las configuraciones proxy a medida
-
-">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Actualmente Torbutton esta activo. Si querés cambiar la configuración del proxy (sin Tor), deshabilita Torbuton y regresa a esta opción. Si querés modificar las opciones de Tor, anda a la ventana de preferencias de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nueva Identidad">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este Sitio">
@@ -29,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Clic para iniciar Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Opciones de Privacidad y Seguridad">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto">
-<!ENTITY torbutton.prefs.test_settings "Probar configuraciones ">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Sin Proxy para:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evita usar estos nombres de host ">
 <!ENTITY torbutton.cookiedialog.title "Manejar la Protección de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -45,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas ">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies">
-<!ENTITY torbutton.prefs.transparentTor "Torificación Transparente (advertencia: requiere transproxy personalizado o Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "Configuraciones de privacidad ">
 <!ENTITY torbutton.prefs.block_disk "No guardar el historial de navegación o los datos de la web ( activa el modo de Navegación Privada)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo">
diff --git a/es_CL/torbutton.dtd b/es_CL/torbutton.dtd
index 12364fc..0720208 100644
--- a/es_CL/torbutton.dtd
+++ b/es_CL/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 3ac30e7..0720208 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/es_MX/torbutton.dtd b/es_MX/torbutton.dtd
index a8bd5be..734c3b4 100644
--- a/es_MX/torbutton.dtd
+++ b/es_MX/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Usar Polipo.">
-<!ENTITY torbutton.prefs.custom_settings "Usar configuración personalizada del proxy.">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está habilitado. Si deseas cambiar tus ajustes del proxy que no pertenece a Tor, por favor deshabilita Torbutton y regresa aquí. Si quieres cambiar tus ajustes de Tor, por favor usa la ventana de preferencias de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nueva identidad">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar valores predeterminados">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/et/torbutton.dtd b/et/torbutton.dtd
index 1cc89d2..4f1b6bb 100644
--- a/et/torbutton.dtd
+++ b/et/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd
index 4e2cd63..c92b7f5 100644
--- a/eu/torbutton.dtd
+++ b/eu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy Ezarpenak">
-<!ENTITY torbutton.prefs.recommended_settings "Erabili nire Firefox bertsiorako proxy ezarpen gomendatuak">
-<!ENTITY torbutton.prefs.use_polipo "Erabili Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Erabili proxy ezarpen pertsonalizatuak">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ostalaria:">
-<!ENTITY torbutton.prefs.proxy.port "Portua:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa.">
 <!ENTITY torbutton.context_menu.new_identity "Nortasun berria">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
 <!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak">
 <!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
-<!ENTITY torbutton.prefs.test_settings "Ezarpenak frogatu">
-<!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.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
 <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd
index f8a5ae7..a60c04d 100644
--- a/fa/torbutton.dtd
+++ b/fa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "تÙ?ظÙ?Ù?ات پراکسÛ?">
-<!ENTITY torbutton.prefs.recommended_settings "بکاربردÙ? تÙ?ظÙ?Ù?ات پراکسÛ? تÙ?صÙ?Ù? شدÙ? براÛ? Ù?سخÙ? Ù?اÙ?رÙ?اکس Ù?Ù?">
-<!ENTITY torbutton.prefs.use_polipo "استÙ?ادÙ? از Ù¾Ù?Ù?Ù?Ù¾Ù? (Polipo)">
-<!ENTITY torbutton.prefs.custom_settings "بکاربردÙ? تÙ?ظÙ?Ù?ات سÙ?ارشÛ? براÛ? پراکسÛ?">
-<!ENTITY torbutton.prefs.proxy.host.http "پراکسÛ? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "پراکسÛ? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "پراکسÛ? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "پراکسÛ? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Ù?زباÙ? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "درگاÙ? (Port):">
-<!ENTITY torbutton.pref_connection.notice "غÙ?رÙ?عاÙ? کردÙ? دکÙ?Ù? تÙ?ر جÙ?ت تغÙ?Ù?ر دراÙ?Ù? تÙ?ظÙ?Ù?ات.">
-<!ENTITY torbutton.pref_connection.more_info "اطÙ?اعات بÙ?شتر">
-<!ENTITY torbutton.pref_connection_more_info.title "راÙ?Ù?Ù?ا">
-<!ENTITY torbutton.pref_connection_more_info.text "دکÙ?Ù? تÙ?رÙ?Ù? اکÙ?Ù?Ù? Ù?عاÙ? شدÙ? است.اگر Ù?Û?â??Ø®Ù?اÙ?Ù?د تÙ?ظÙ?Ù?ات پراکسÛ? غÙ?رÙ?رتبط با تÙ?ر را تغÙ?Ù?ر دÙ?Ù?دØ? Ù?Ø·Ù?ا دکÙ?Ù? تÙ?ر را غÙ?رÙ?عاÙ? Ú©Ù?Ù?د Ù? دÙ?بارÙ? بÙ? اÙ?Ù?جا بازگردÙ?د. اگر Ù?Ù?Ø®Ù?اÙ?Ù?د تÙ?ظÙ?Ù?ات تÙ?ر را تغÙ?Ù?ر دÙ?Ù?دØ? از Ù¾Ù?جرÙ? تÙ?ظÙ?Ù?ات دکÙ?Ù? تÙ?ر استÙ?ادÙ? Ú©Ù?Ù?د.">
 <!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Û?ت جدÛ?د">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "شبکÙ? جدÛ?د Tor براÛ? اÛ?Ù? ساÛ?ت">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "جÙ?ت شرÙ?ع دÙ?Ù?Ù? تÙ?رکÙ?Ù?Ú© Ú©Ù?Ù?د">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ù? تÙ?ظÛ?Ù?ات اÙ?Ù?Û?تÛ?">
 <!ENTITY torbutton.prefs.restore_defaults "بازگرداÙ?دÙ? تÙ?ظÛ?Ù?ات بÙ? حاÙ?ت Ù¾Û?Ø´â??Ù?رض">
-<!ENTITY torbutton.prefs.test_settings "تÙ?ظÛ?Ù?ات آزÙ?Ù?دÙ?  ">
-<!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.cookiedialog.title "Ù?دÙ?رÙ?ت Ø­Ù?اظت Ú©Ù?Ù?Ú?Ú©â??Ù?ا">
 <!ENTITY torbutton.cookiedialog.lockCol "Ø­Ù?اظت شدÙ?">
 <!ENTITY torbutton.cookiedialog.domainCol "Ù?Ù?زباÙ?">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "حذÙ? تÙ?اÙ? Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? Ø­Ù?اظت Ù?شدÙ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø­Ù?اظت از Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? جدÙ?د">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدÙ? Ø­Ù?اظت از Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? جدÙ?د">
-<!ENTITY torbutton.prefs.transparentTor "سازگارسازÛ? با تÙ?ر بÙ? صÙ?رت Ø´Ù?اÙ? (Ù?Ù?از بÙ? رÙ?Ù?اب تÙ?ر Ù?ا Tor router Ù? Ù?ا transproxy سÙ?ارشÛ? دارد)">
 <!ENTITY torbutton.prefs.priv_caption "تÙ?ظÛ?Ù?ات حرÛ?Ù? خصÙ?صÛ?">
 <!ENTITY torbutton.prefs.block_disk "ثبتâ??Ù?Ù?ردÙ? تارÙ?Ø®Ú?Ù? Ù?ا دادÙ?â??Ù?اÙ? Ù?بâ??گاÙ? (گشت Ù? گذار â??خصÙ?صÙ? Ù?عاÙ? Ù?Ù?â??Ù?Ù?د)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ù?حدÙ?دâ??Ù?ردÙ? Ù?Ù?Ù?Ù?â??Ù?اÙ? طرÙ? سÙ?Ù? Ù? دادÙ?â??Ù?اÙ? Ù¾Ù?گردÙ? دÙ?گر">
diff --git a/fi/torbutton.dtd b/fi/torbutton.dtd
index 2139841..3556804 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Välityspalvelinasetukset">
-<!ENTITY torbutton.prefs.recommended_settings "Käytä suositeltuja välityspalvelinasetuksia Firefox-versiolleni.">
-<!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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-välityspalvelin:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-välityspalvelin:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton on tällä hetkellä käytössä. Jos haluat muuttaa välityspalvelinasetuksia joita käytät silloin kun Torbutton ei ole käytössä, ota ensin Torbutton pois käytöstä ja palaa sitten tänne. Jos haluat muuttaa Tor-asetuksia, käytä Torbutton-asetukset-ikkunaa.">
 <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Uusi Tor-kiertotie tälle sivustolle">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Napsauta Torbutton-painikkeen alustamiseksi">
 <!ENTITY torbutton.prefs.privacy_security_settings "Yksityisyys- ja turva-asetukset">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta oletukset">
-<!ENTITY torbutton.prefs.test_settings "Testausasetukset">
-<!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.cookiedialog.title "Hallitse evästeiden suojauksia">
 <!ENTITY torbutton.cookiedialog.lockCol "Suojattu">
 <!ENTITY torbutton.cookiedialog.domainCol "Palvelin">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Estä kolmannen osapuolen evästeet ja muut seurantatiedot">
diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd
index caad6be..b9a1e38 100644
--- a/fil/torbutton.dtd
+++ b/fil/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Gamitin ang Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Mga Setting na Pang-Pribado at Seguridad">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/fo/torbutton.dtd b/fo/torbutton.dtd
index c228d1d..b9f7469 100644
--- a/fo/torbutton.dtd
+++ b/fo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Brúka Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Brúka tillagaðar proxy-stillingar">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS vertur:">
-<!ENTITY torbutton.prefs.proxy.port "Portur:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torknøtturin er gildaður í løtuni. Vilt tú broyta proxy-stillingar uttan fyri Tor, mást tú ógilda Torknøttin og venda aftur higar. Vilt tú broyta Tor-stillingarnar, brúka so Torknøttin, og far inn á stillingargluggan.">
 <!ENTITY torbutton.context_menu.new_identity "Nýggjur samleiki">
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Nullstilla ">
-<!ENTITY torbutton.prefs.test_settings "Royndarstillingar">
-<!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.cookiedialog.title "Skipa cookie-vernd">
 <!ENTITY torbutton.cookiedialog.lockCol "Vard/ur">
 <!ENTITY torbutton.cookiedialog.domainCol "Vertur">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Avmarka triðjaliðs-cookies og aðra sporingardátu">
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index b08a854..53bfb12 100644
--- a/fr/torbutton.dtd
+++ b/fr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Utiliser Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP :">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP :">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton est actuellement activé. Si vous souhaitez modifier vos paramètres proxy non-Tor, veuillez désactiver Torbutton et revenir à cette fenêtre. Si vous souhaitez modifier vos paramètres Tor, veuillez utiliser la fenêtre des préférences Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nouvelle identité">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Valeurs par défaut">
-<!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
-<!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.cookiedialog.title "Gérer les protections de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protégé">
 <!ENTITY torbutton.cookiedialog.domainCol "Hôte">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage">
diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index 9855a8e..5247672 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Utiliser Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de mandataire personnalisés">
-<!ENTITY torbutton.prefs.proxy.host.http "Mandataire HTTP :">
-<!ENTITY torbutton.prefs.proxy.host.https "Mandataire SSL :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Mandataire FTP :">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "BoutonTor est présentement activé. Si vous souhaitez modifier vos paramètres de mandataire non-Tor, veuillez désactiver BoutonTor et revenir ici.  Si vous voulez changer vos paramètres Tor, veuillez utiliser la fenêtre des préférences BoutonTor.">
 <!ENTITY torbutton.context_menu.new_identity "Nouvelle identité">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Valeurs par défaut">
-<!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
-<!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.cookiedialog.title "Gérer les protections des témoins">
 <!ENTITY torbutton.cookiedialog.lockCol "Protégé">
 <!ENTITY torbutton.cookiedialog.domainCol "Hôte">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les témoins tiers et les autres données de traçage">
diff --git a/fur/torbutton.dtd b/fur/torbutton.dtd
index 12364fc..0720208 100644
--- a/fur/torbutton.dtd
+++ b/fur/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/fy/torbutton.dtd b/fy/torbutton.dtd
index 1ce3694..06d63c0 100644
--- a/fy/torbutton.dtd
+++ b/fy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Polipo brûke">
-<!ENTITY torbutton.prefs.custom_settings "Oanpaste proxy-ynstellingen brûke">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-host:">
-<!ENTITY torbutton.prefs.proxy.port "Poarte:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nije identiteit">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en befeiligingsynstellingen">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test ynstellingen">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd
index 7cd0b52..887e271 100644
--- a/ga/torbutton.dtd
+++ b/ga/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/gd/torbutton.dtd b/gd/torbutton.dtd
index 12364fc..0720208 100644
--- a/gd/torbutton.dtd
+++ b/gd/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/gl/torbutton.dtd b/gl/torbutton.dtd
index 695e53a..0ce955f 100644
--- a/gl/torbutton.dtd
+++ b/gl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Porto:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Axuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nova identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/gu/torbutton.dtd b/gu/torbutton.dtd
index 7ee03ee..b028d7c 100644
--- a/gu/torbutton.dtd
+++ b/gu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "પ�ર���સ� ��ઠવણ��">
-<!ENTITY torbutton.prefs.recommended_settings "માર� ફાયરફ���સ �વ�ત�તિ મા�� સ��વ�લ પ�ર���સ� ��ઠવણ�� વાપર�">
-<!ENTITY torbutton.prefs.use_polipo "પ�લિપ� વાપર�">
-<!ENTITY torbutton.prefs.custom_settings "પ�તાન� પ�ર���સ� ��ઠવણ�� વાપર�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ય�માન:">
-<!ENTITY torbutton.prefs.proxy.port "પ�ર��:">
-<!ENTITY torbutton.pref_connection.notice "� ��ઠવણ�� બદલવા મા�� ��રબ�ન નિષ���રિય �ર�.">
-<!ENTITY torbutton.pref_connection.more_info "વધ� માહિત�">
-<!ENTITY torbutton.pref_connection_more_info.title "મદદ">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "��રબ�ન શર� �રવા ��લિ� �ર�">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "મ�ળભ�ત પા��� લાવ�">
-<!ENTITY torbutton.prefs.test_settings "��ાસણ� ��ઠવણ��">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index 3101e10..8da48c9 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "પ�ર���સ� ��ઠવણ��">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "પ�તાન� પ�ર���સ� ��ઠવણ�� વાપર�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "��ાસણ� ��ઠવણ��">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/gun/torbutton.dtd b/gun/torbutton.dtd
index 12364fc..0720208 100644
--- a/gun/torbutton.dtd
+++ b/gun/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ha/torbutton.dtd b/ha/torbutton.dtd
index 12364fc..0720208 100644
--- a/ha/torbutton.dtd
+++ b/ha/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/he/torbutton.dtd b/he/torbutton.dtd
index 8ccf4cf..6cf4b79 100644
--- a/he/torbutton.dtd
+++ b/he/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "×?×?×?ר×?ת פר×?קס×?">
-<!ENTITY torbutton.prefs.recommended_settings "×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?×?×?צ×?ת ×¢×?×?ר ×?רסת Firefox ש×?×?">
-<!ENTITY torbutton.prefs.use_polipo "×?שת×?ש ×?-Polipo">
-<!ENTITY torbutton.prefs.custom_settings "×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?ת×?×?×?ת ×?×?ש×?ת">
-<!ENTITY torbutton.prefs.proxy.host.http "פר×?קס×? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "פר×?קס×? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "פר×?קס×? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "×?×?ר×? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "פ×?ר×?:">
-<!ENTITY torbutton.pref_connection.notice "×?ש×?ת ×?ת Torbutton ×¢×? ×?× ×ª ×?×©× ×?ת ×?×?×?ר×?ת ×?×?×?.">
-<!ENTITY torbutton.pref_connection.more_info "×?×?×?×¢ × ×?סף">
-<!ENTITY torbutton.pref_connection_more_info.title "×¢×?ר×?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton פ×?×¢×? ×?עת. ×?×? ×?רצ×?× ×? ×?×©× ×?ת ×?ת ×?×?×?ר×?ת ×?פר×?קס×? ש×?×?× ×? קש×?ר×?ת ×?-Tor, ×?× ×? ×?ש×?ת ×?ת Torbutton ×?×?×?×?ר ×?× ×?. ×?×? ×?רצ×?× ×? ×?×©× ×?ת ×?ת ×?×?×?ר×?ת Tor, ×?× ×? ×?שת×?ש ×?×?×?×?×? ×?×?×?×?ר×?ת ש×? Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "×?×?×?ת ×?×?ש×?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "× ×ª×?×? Tor ×?×?ש ×?×?תר ×?×?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "×?×?×¥ ×?×?×?×? ×?×?ת×?×? ×?ת Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "×?×?×?ר×?ת ×?×?×?×?×? ×?פר×?×?×?ת">
 <!ENTITY torbutton.prefs.restore_defaults "×?×?ר×? ×?×?ר×?רת ×?×?×?×?">
-<!ENTITY torbutton.prefs.test_settings "×?×?×? ×?×?×?ר×?ת">
-<!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.cookiedialog.title "× ×?×? ×?×?× ×?ת ק×?ק×?×?">
 <!ENTITY torbutton.cookiedialog.lockCol "×?×?×?×?">
 <!ENTITY torbutton.cookiedialog.domainCol "×?×?ר×?">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "×?×?ק ×?ת ×?×? ×?ק×?ק×?×? ×?×?×? ×?×?×?× ×?×?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "×?×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×?×? ת×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
-<!ENTITY torbutton.prefs.transparentTor "×?פע×?ת Tor ×?צ×?ר×? ×?×?ת×? × ×¨×?×?ת (×?×?רש  transproxy ×?×? Tor router)">
 <!ENTITY torbutton.prefs.priv_caption "×?×?×?ר×?ת פר×?×?×?ת">
 <!ENTITY torbutton.prefs.block_disk "×?×? תש×?×?ר ×?×?ס×?×?ר×?×?ת ×?×?×?ש×? ×?×? × ×ª×?× ×? ×?תר×?×? (×?פע×? ×?צ×? ×?×?×?ש×? פר×?×?ת)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "×?×?×?×? ×¢×?×?×?×?ת ×?צ×? ש×?×?ש×? ×?×?×?ס×?×£ ×?×?×?×¢ ×?×?ר">
diff --git a/hi/torbutton.dtd b/hi/torbutton.dtd
index fe2f6e2..2e262de 100644
--- a/hi/torbutton.dtd
+++ b/hi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "प�र���स� स��ि���स ">
-<!ENTITY torbutton.prefs.recommended_settings "म�र� �ायर �ा��स �थन �� लिय� स��ाय� प�र���स� स��ि�� �पय�� �र� ">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "व�यवाहारि� प�र���स� स��ि�� �ा �पय�� �र�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "���र प�र���स� ">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS �तिथ�य :">
-<!ENTITY torbutton.prefs.proxy.port "प�र��/द�वार :">
-<!ENTITY torbutton.pref_connection.notice "�न स��ि�� �� बदलन� �� लिय� ��र ब�न �� �समर�थ �र� ">
-<!ENTITY torbutton.pref_connection.more_info "�धि� �ान�ार� �� लि� ">
-<!ENTITY torbutton.pref_connection_more_info.title "सहायता">
-<!ENTITY torbutton.pref_connection_more_info.text "��र ब�न �भ� समर�थ��त ह� । ��र �प �पन� �न�य (��र �� �लावा) प�र���स� स��ि�� �� बदलना �ाहत� ह� त� ��र �� �समर�थ �र�� �धर प�रति�मन �र� । ��र �प �पन� ��र स��ि�� �� बदलना �ाहत� ह� त� ��पिया ��र ब�न �� प�रि�र�न�स �ि��� �ा �पय�� �र� ।">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "��र ब�न �� �र�भित �रन� �� लिय� ��लि� �र�">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index fffa55c..f0bd815 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Koristi Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ?ene proxy postavke">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!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.pref_connection.notice "OnemoguÄ?ite Torbutton da biste promijenili ove postavke.">
-<!ENTITY torbutton.pref_connection.more_info "Više informacija">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ?en. Ukoliko želite promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄ?ite Torbutton i vratite se ovdje. Ukoliko želite promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor krug za ovu stranicu">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona">
 <!ENTITY torbutton.prefs.privacy_security_settings "Postavke Privatnosti i Sigurnosti">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index 43b39e4..7fc9ffa 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Postavke Proxya">
-<!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄ?ene postavke proxya za moju verziju Firefoxa">
-<!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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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Ä?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ?en. Ako želite promijeniti vaÅ¡e ne-Tor proxy postavke, molimo onemoguÄ?ite Torbutton i vratite se ovdje. Ako želite promijeniti vaÅ¡e Tor postavke, molimo koristite Torbutton prozor s preferencama.">
 <!ENTITY torbutton.context_menu.new_identity "Novi Identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor Krug za ovu Stranicu">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbuttona">
 <!ENTITY torbutton.prefs.privacy_security_settings "Postavke Privatnosti i Sigurnosti">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati zadano">
-<!ENTITY torbutton.prefs.test_settings "Testiraj postavke">
-<!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.cookiedialog.title "Upravljaj ZaÅ¡titom KolaÄ?iÄ?a">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡tiÄ?eno">
 <!ENTITY torbutton.cookiedialog.domainCol "DomaÄ?in">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "OgraniÄ?i kolaÄ?iÄ?e treÄ?e strane i ostale podatke za praÄ?enje">
diff --git a/ht/torbutton.dtd b/ht/torbutton.dtd
index 12364fc..0720208 100644
--- a/ht/torbutton.dtd
+++ b/ht/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index 5a2bc23..6ec32c1 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!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.pref_connection.notice "Tiltsa le a Torbutton-t ezen beállítások megváltoztatásához">
-<!ENTITY torbutton.pref_connection.more_info "További információk">
-<!ENTITY torbutton.pref_connection_more_info.title "Súgó">
-<!ENTITY torbutton.pref_connection_more_info.text "A Torbutton jelenleg engedélyezett. Ha szeretné megváltoztatni a Tor nélküli proxy beállításokat, kapcsolja ki Torbutton-t és térjen vissza ide. Ha szeretné megváltoztatni a Tor beállításait, használja inkább a Torbutton Beállítások ablakát.">
 <!ENTITY torbutton.context_menu.new_identity "�j személyazonosság">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "�j Tor áramkör ehhez az oldalhoz">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Alapértékek visszaállítása">
-<!ENTITY torbutton.prefs.test_settings "Beállítások tesztelése">
-<!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.cookiedialog.title "Süti védelem kezelése">
 <!ENTITY torbutton.cookiedialog.lockCol "Védett">
 <!ENTITY torbutton.cookiedialog.domainCol "�llomás">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltÅ?l származó sütik és nyomkövetési adatok korlátozása">
diff --git a/hy/torbutton.dtd b/hy/torbutton.dtd
index b690ede..676b98c 100644
--- a/hy/torbutton.dtd
+++ b/hy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö?Õ©ÕµÕ¡Õ¶ Ö? Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ia/torbutton.dtd b/ia/torbutton.dtd
index 5b4ffa9..bc87fbc 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Porto:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nove identitate">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index 22f4a09..e28537e 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Gunakan Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Gunakan pengaturan proksi ubahsuai">
-<!ENTITY torbutton.prefs.proxy.host.http "Proksi HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proksi SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proksi FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proksi Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Hos SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton sedang berfungsi. Apabila Anda ingin mengubah pengaturan proksi non-Tor, mohon nonfungsikan Torbutton dan kembali ke sini. Apabila Anda ingin mengubah pengaturan Tor, mohon gunakan jendela preferensi Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
 <!ENTITY torbutton.prefs.privacy_security_settings "Pengaturan Privasi dan Keamanan">
 <!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
-<!ENTITY torbutton.prefs.test_settings "Uji pengaturan">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 25bf320..b34d75e 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL milliþjónn:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP milliþjónn:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Núna er kveikt á Tor-hnapp. Ef þú vilt breyta án-Tor milliþjónsstillingunum þínum, slökktu þá á Torbutton og komdu aftur hingað. Ef þú vilt breyta Tor-stillingunum þínum, notaðu þá eiginleikaglugga Tor-hnappsins.">
 <!ENTITY torbutton.context_menu.new_identity "Nýtt auðkenni">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ný Tor-rás fyrir þetta vefsvæði">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Smelltu til að kveikja á Tor-hnapp">
 <!ENTITY torbutton.prefs.privacy_security_settings "Stillingar gagnaleyndar og öryggis">
 <!ENTITY torbutton.prefs.restore_defaults "Frumstilla á sjálfgefið">
-<!ENTITY torbutton.prefs.test_settings "Prófa stillingar">
-<!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.cookiedialog.title "Sýsla með varnir á smákökum">
 <!ENTITY torbutton.cookiedialog.lockCol "Varið">
 <!ENTITY torbutton.cookiedialog.domainCol "Hýsill">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka smákökur frá þriðja aðila og önnur ferligögn">
diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index 75e3d36..2ebeeff 100644
--- a/it/torbutton.dtd
+++ b/it/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Usa Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usa impostazioni proxy personalizzate">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton è attualmente attivo. Se vuoi cambiare la configurazione del proxy quando non usi Tor, disabilita Torbutton e torna qui.  Se vuoi modificare la configurazione quando usi Tor, usa la finestra delle preferenze di Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nuova identità ">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza">
 <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
-<!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni">
-<!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.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index c58bd68..ad2d2ea 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ã??ã?­ã?­ã?·è¨­å®?">
-<!ENTITY torbutton.prefs.recommended_settings "Firefoxã?®ã??ã?­ã?­ã?·è¨­å®?ã??使ã??">
-<!ENTITY torbutton.prefs.use_polipo "Polipoã??使ã??">
-<!ENTITY torbutton.prefs.custom_settings "ã?«ã?¹ã?¿ã? 設å®?ã?®ã??ã?­ã?­ã?·ã??使ã??">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTPã??ã?­ã?­ã?·">
-<!ENTITY torbutton.prefs.proxy.host.https "SSLã??ã?­ã?­ã?·">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTPã??ã?­ã?­ã?·">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherã??ã?­ã?­ã?·">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKSã??ã?¹ã??">
-<!ENTITY torbutton.prefs.proxy.port "ã??ã?¼ã??">
-<!ENTITY torbutton.pref_connection.notice "ã??ã??ã??ã?®è¨­å®?ã??å¤?æ?´ã??ã??ã?«ã?¯Torbuttonã??ã?ªã??ã?«ã??ã?¦ã??ã? ã??ã??">
-<!ENTITY torbutton.pref_connection.more_info "詳細æ??å ±">
-<!ENTITY torbutton.pref_connection_more_info.title "ã??ã?«ã??">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonã?¯ç?¾å?¨ã?ªã?³ã?«ã?ªã?£ã?¦ã??ã?¾ã??ã??ã??ã??ã??é??Torã?®è¨­å®?ã??å¤?æ?´ã??ã??å ´å??ã?¯ã??ã?¾ã??Torbuttonã??ã?ªã??ã?«ã??ã?¦ã??ã? ã??ã??ã??Torã?®è¨­å®?ã??å¤?æ?´ã??ã??å ´å??ã?«ã?¯Torbutton設å®?ã?¦ã?£ã?³ã??ã?¦ã??使ã?£ã?¦ã??ã? ã??ã??ã??">
 <!ENTITY torbutton.context_menu.new_identity "æ?°ã??ã??å?¿å??">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ã??ã?®ã?µã?¤ã??ç?¨ã?®æ?°ã??ã?? Tor ã?µã?¼ã?­ã??ã??">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbuttonã??å??æ??ç?¶æ??ã?«æ?»ã??">
 <!ENTITY torbutton.prefs.privacy_security_settings "ã??ã?©ã?¤ã??ã?·ã?¼ã?¨ã?»ã?­ã?¥ã?ªã??ã?£ã?¼ã?®è¨­å®?">
 <!ENTITY torbutton.prefs.restore_defaults "ã??ã??ã?©ã?«ã??設å®?ã?«æ?»ã??">
-<!ENTITY torbutton.prefs.test_settings "設å®?ã??ã??ã?¹ã??ã??ã??">
-<!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.cookiedialog.title "Cookieä¿?è­·ã??管ç??">
 <!ENTITY torbutton.cookiedialog.lockCol "�護��">
 <!ENTITY torbutton.cookiedialog.domainCol "ã??ã?¹ã??">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ä¿?è­·ã??ã??ã?¦ã??ã??ã??ã?®ä»¥å¤?å??é?¤">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "æ?°ã??ã??Cookieã??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ?°ã??ã??Cookieã??ä¿?è­·ã??ã?ªã??">
-<!ENTITY torbutton.prefs.transparentTor "é??é??å??Torå?? (ã?«ã?¹ã?¿ã? é??é??å??ã??ã?­ã?­ã?·ã??Torã?®ã?«ã?¼ã?¿ã?¼ã??å¿?è¦?)">
 <!ENTITY torbutton.prefs.priv_caption "ã??ã?©ã?¤ã??ã?·ã?¼è¨­å®?">
 <!ENTITY torbutton.prefs.block_disk "ã??ã?©ã?¦ã?¸ã?³ã?°å±¥æ­´ã??ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?¼ã?¿ã??è¨?é?²ã??ã?ªã?? (ã??ã?©ã?¤ã??ã?¼ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?¢ã?¼ã??ã??æ??å?¹å??)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ã?µã?¼ã??ã??ã?¼ã??ã?£ã?¼ã?®Cookieã??ã??ã?®ä»?ã?®ã??ã?©ã??ã?­ã?³ã?°ã??ã?¼ã?¿ã??å?¶é??">
diff --git a/jv/torbutton.dtd b/jv/torbutton.dtd
index e3b0c31..0720208 100644
--- a/jv/torbutton.dtd
+++ b/jv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index 504b3fa..0720208 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "á??á? á??á?¥á?¡á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/kk/torbutton.dtd b/kk/torbutton.dtd
index 12364fc..0720208 100644
--- a/kk/torbutton.dtd
+++ b/kk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/km/torbutton.dtd b/km/torbutton.dtd
index 7a14624..a04ad29 100644
--- a/km/torbutton.dtd
+++ b/km/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸">
-<!ENTITY torbutton.prefs.recommended_settings "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸â??á??á??á??â??á??á?¶á??â??á??á??á??á??á??â??á?¢á??á?»á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??â?? Firefox á??á??á??á??â??á??á??á??á?»á??">
-<!ENTITY torbutton.prefs.use_polipo "á??á??á??á?¾ Polipo">
-<!ENTITY torbutton.prefs.custom_settings "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸â??á??á??á??á?¶á??á??á??á??á??á?½á??">
-<!ENTITY torbutton.prefs.proxy.host.http "á??á??á??á?¼á??á??á??á?¸ HTTP á??">
-<!ENTITY torbutton.prefs.proxy.host.https "á??á??á??á?¼á??á??á??á?¸ SSL á??">
-<!ENTITY torbutton.prefs.proxy.host.ftp "á??á??á??á?¼á??á??á??á?¸ FTP á??">
-<!ENTITY torbutton.prefs.proxy.host.gopher "á??á??á??á?¼á??á??á??á?¸ Gopher á??">
-<!ENTITY torbutton.prefs.proxy.host.socks "á??á??á?¶á??á??á?¸á?? SOCKS á??">
-<!ENTITY torbutton.prefs.proxy.port "á??á??á??á??á??">
-<!ENTITY torbutton.pref_connection.notice "á??á?·á?? Torbutton á??á?¾á??á??á??á?¸â??á??á??á??á?¶á??á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??â??á??á?¶á??á??á??á??á??á??">
-<!ENTITY torbutton.pref_connection.more_info "á??á??á??á??á??á?¶á??â??á??á??á??á??á??á??">
-<!ENTITY torbutton.pref_connection_more_info.title "á??á??á??á?½á??">
-<!ENTITY torbutton.pref_connection_more_info.text "á??á??á??á??á?»á??á??á??á??á??á?? Torbutton á??á??á??á?¼á??â??á??á?¶á??â??á??á?¾á??á?? á??á??á??á??á?·á??á??á?¾â??á?¢á??á??á??â??á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸ non-Tor , á??á?¼á??â??á??á?·á?? Torbutton á? á?¾á??â??á??á??á??á?¡á??á??â??á??á??â??á??á?¸á??á??á??â??á??á?·á??á?? á??á??á??á??á?·á??á??á?¾â??á?¢á??á??á??â??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á?? Tor á??á??á??á??â??á?¢á??á??á??, á??á?¼á??â??á??á??á??á?¾â??á??á??á??á?¶á??á??â??â??á??á??á??á?¼á??â??á??á?·á??á??á?? Torbutton á??">
 <!ENTITY torbutton.context_menu.new_identity "á?¢á??á??á??â??á??á??á??á??á?¶á??â??á??á??á??á?¸">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "á??á?»á??â??á??á?¾á??á??á??á?¸â??á??á?¶á??á??á??á??á??á?¾á?? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "á??á??á??á?¶á??â??á??á??á??á?¶á??á??á?¾á??">
-<!ENTITY torbutton.prefs.test_settings "á??á?¶á??á??á??á??á??â??á??á?¶á??â??á??á??á??á??á??">
-<!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.cookiedialog.title "á??á??á??á??á??á??á??á??á??â??á??á?¶á??â??á??á?¶á??á??á?¶á??â??á??á?¼á??á?¸">
 <!ENTITY torbutton.cookiedialog.lockCol "á??á?¶á??â??á??á?¶á??á??á?¶á??">
 <!ENTITY torbutton.cookiedialog.domainCol "á??á??á?¶á??á??á?¸á??">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á??á?»á??â??á??á??á??â??á??á?¶á??á??á?¢á??á??â??á??á??á?»á??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á?¶á??">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?¶á??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?»á??â??á??á?¶á??â??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (á??á?¶á??á??á?¶á??  transproxy á?¬â??á??á??á??á??á??á??á?? Tor á??á??á??á?¶á??á??â??á??á??á??á?½á??)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "á??á?»á??â??á??á?¶á??á??á?¶á??á??á??â??á??á??á??á??á??á??á??á?· á?¬â??á??á?·á??á??á??á??á??á??â??á??á??á??á??á??â??á??á??á??á??á?¶á?? (á??á?¾á??â??á??á??á??á??â??á??á?¶á??â??á??á?»á??á??á??â??á?¯á??á??á??)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á??á?¶á??á??â??á??á??á??á??á?·á??â??á??á?¼á??á?¸â??á??á?¶á??á?¸â??á??á?¸á??á?¸ á??á?·á??â??á??á?·á??á??á??á??á??á??â??á??á?¶á??á??á?¶á??â??á??á??á??á??á??â??á??á??á??">
diff --git a/kn/torbutton.dtd b/kn/torbutton.dtd
index 4386566..4311e33 100644
--- a/kn/torbutton.dtd
+++ b/kn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "� ಸ������ ಹ��ಸ �ಾರ� ಸರ���ಯ���">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "��ಪ�ಯತ� ಮತ�ತ� ಭದ�ರತ� ಸ����ಿ����ಳ�">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd
index d597085..0d19bd0 100644
--- a/ko/torbutton.dtd
+++ b/ko/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "í??ë¡?ì?? ì?¤ì ?">
-<!ENTITY torbutton.prefs.recommended_settings "í??ì?¬ ì¶?ì²?ë?? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.use_polipo "Polipo ��">
-<!ENTITY torbutton.prefs.custom_settings "ì?¬ì?©ì?? ì§?ì ? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :">
-<!ENTITY torbutton.prefs.proxy.port "��  : ">
-<!ENTITY torbutton.pref_connection.notice "Torbuttonì?´ ë?¤ì??ì?? ì?¤ì ?ë?¤ì?? ë°?꾸ì§? 못í??ê²? í?©ë??ë?¤.">
-<!ENTITY torbutton.pref_connection.more_info "ì¶?ê°? ì ?ë³´">
-<!ENTITY torbutton.pref_connection_more_info.title "ë??ì??ë§?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonì?´ í??ì?¬ í??ì?±í??ë??ì??ì?µë??ë?¤. ë§?ì?½ Tor í??ë¡?ì??ê°? ì??ë?? ì?¼ë°? í??ë¡?ì?? ì??ë²? ì?¤ì ?ì?? í??ì??ë ¤ë©´, Torbuttonì?? ë¹?í??ì?±í??í??ê³  ì?´ ì°½ì?¼ë¡? ë??ì??ì?¤ì?­ì??ì?¤. í?¹ì?? Tor í??ë¡?ì?? ì?¤ì ?ì?? ë°?ê¾¸ê³  ì?¶ì?¼ì??ë?¤ë©´, Torbutton ì?¤ì ? í??ë©´ì?? ì?¬ì?©í?´ 주ì?¸ì??.">
 <!ENTITY torbutton.context_menu.new_identity "ì??ë¡?ì?´ ì? ì??">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor ì??í?· ì?¬êµ¬ì¶?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?기í??">
 <!ENTITY torbutton.prefs.privacy_security_settings "ê°?ì?¸ ì ?ë³´ì?? ë³´ì?? ì?¤ì ?">
 <!ENTITY torbutton.prefs.restore_defaults "ì?¤ì ? ì´?기í??">
-<!ENTITY torbutton.prefs.test_settings "ì?¤ì ? í??ì?¤í?¸">
-<!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.cookiedialog.title "ì¿ í?¤ ë³´í?¸ ê´?리">
 <!ENTITY torbutton.cookiedialog.lockCol "보��">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í?¸ë?? ê²? ë¹¼ê³  모ë?? ì§?ì?°ê¸°">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ ë³´í?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ë¥¼ ë³´í?¸í??ì§? ì??ì??">
-<!ENTITY torbutton.prefs.transparentTor "í?¬ëª? Toritication (ì?¬ì?©ì?? transproxyë?? Tor ë?¼ì?°í?° í??ì??)">
 <!ENTITY torbutton.prefs.priv_caption "ê°?ì?¸ ì ?ë³´ ì?¤ì ?">
 <!ENTITY torbutton.prefs.block_disk "ë¸?ë?¼ì?°ì§? í??ì?¤í? 리ë?? ì?¹ì?¬ì?´í?¸ ë?°ì?´í?°ë¥¼ 기ë¡?í??ì§? ë§?ì?­ì??ì?¤ (Private Browsing 모ë?? í??ì?±í??)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ì ? 3ì?? ì¿ í?¤ì?? ë?¤ë¥¸ ì¶?ì ? ë?°ì?´í?° ì ?í??">
diff --git a/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd
index 7c1a324..626b300 100644
--- a/ko_KR/torbutton.dtd
+++ b/ko_KR/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "í??ë¡?ì?? ì?¤ì ?">
-<!ENTITY torbutton.prefs.recommended_settings "í??ì?¬ ì¶?ì²?ë?? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.use_polipo "Polipo ��">
-<!ENTITY torbutton.prefs.custom_settings "ì?¬ì?©ì?? ì§?ì ? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :">
-<!ENTITY torbutton.prefs.proxy.port "��:">
-<!ENTITY torbutton.pref_connection.notice "ì?´ë ?ê²? ì?¤ì ?ì?? ë°?ê¿? ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.pref_connection.more_info "ì¶?ê°? ì ?ë³´">
-<!ENTITY torbutton.pref_connection_more_info.title "ë??ì??ë§?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonì?´ í??ì?¬ í??ì?±í??ë??ì??ì?µë??ë?¤. ë§?ì?½ Tor í??ë¡?ì??ê°? ì??ë?? ì?¼ë°? í??ë¡?ì?? ì??ë²? ì?¤ì ?ì?? í??ì??ë ¤ë©´, Torbuttonì?? ë¹?í??ì?±í??í??ê³  ì?´ ì°½ì?¼ë¡? ë??ì??ì?¤ì?­ì??ì?¤. í?¹ì?? Tor í??ë¡?ì?? ì?¤ì ?ì?? ë°?ê¾¸ê³  ì?¶ì?¼ì??ë?¤ë©´, Torbutton ì?¤ì ? í??ë©´ì?? ì?¬ì?©í?´ 주ì?¸ì??.">
 <!ENTITY torbutton.context_menu.new_identity "ì??ë¡?ì?´ ì? ì??ì ?ë³´ë¡?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?기í??">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "기본ê°?ì?¼ë¡? ë??림">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ku/torbutton.dtd b/ku/torbutton.dtd
index 12364fc..0720208 100644
--- a/ku/torbutton.dtd
+++ b/ku/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd
index 16ad731..315caa1 100644
--- a/ku_IQ/torbutton.dtd
+++ b/ku_IQ/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Û?ارÙ?Û?تÛ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/kw/torbutton.dtd b/kw/torbutton.dtd
index 12364fc..0720208 100644
--- a/kw/torbutton.dtd
+++ b/kw/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ky/torbutton.dtd b/ky/torbutton.dtd
index 94467a5..b413f9c 100644
--- a/ky/torbutton.dtd
+++ b/ky/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?аÑ?дам">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?аңÑ? инÑ?ан">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/la/torbutton.dtd b/la/torbutton.dtd
index 0a4fd8c..0720208 100644
--- a/la/torbutton.dtd
+++ b/la/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!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 "Auxilium">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/lb/torbutton.dtd b/lb/torbutton.dtd
index b9af04e..2757267 100644
--- a/lb/torbutton.dtd
+++ b/lb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Polipo benotzen">
-<!ENTITY torbutton.prefs.custom_settings "Individuell Proxy Astellungen benotzen">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nei Identitéit">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Neien Tor-Pad fir des Säit">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index 12364fc..0720208 100644
--- a/lg/torbutton.dtd
+++ b/lg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ln/torbutton.dtd b/ln/torbutton.dtd
index 12364fc..0720208 100644
--- a/ln/torbutton.dtd
+++ b/ln/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/lo/torbutton.dtd b/lo/torbutton.dtd
index 5a57194..27d5ec8 100644
--- a/lo/torbutton.dtd
+++ b/lo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "�າ��ັ����າ Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "�ຫ������າ�າ��ັ����າ proxy �ີ���ະ�ຳ �ຫ��ັ� ຮຸ�� Firefox �ອ���ອ�">
-<!ENTITY torbutton.prefs.use_polipo "��� Polipo">
-<!ENTITY torbutton.prefs.custom_settings "�����າ�າ��ັ����າ proxy �ອົາ�ອ�">
-<!ENTITY torbutton.prefs.proxy.host.http "��� HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "��� SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "��� FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "��� Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "��� SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "��� Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor ���ສຳລັ��ວັ����ີ�">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "�າ��ຳ�ົ���າ�ວາມ��ັ�ສ�ວ��ົວ�ລະ�ວາມ�ອ���">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd
index 681a4d6..9579b71 100644
--- a/lt/torbutton.dtd
+++ b/lt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Įgaliotojo serverio nustatymai">
-<!ENTITY torbutton.prefs.recommended_settings "Naudoti mano Firefox versijai rekomenduojamus įgaliotojo serverio nustatymus">
-<!ENTITY torbutton.prefs.use_polipo "Naudoti Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Naudoti tinkintus įgaliotojo serverio nustatymus">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP įgaliotasis serveris:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL įgaliotasis serveris:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP įgaliotasis serveris:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher įgaliotasis serveris:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Prievadas:">
-<!ENTITY torbutton.pref_connection.notice "Atjunkite Torbutton kad pakeisti Å¡iuos nustatymus.">
-<!ENTITY torbutton.pref_connection.more_info "Daugiau informacijos">
-<!ENTITY torbutton.pref_connection_more_info.title "Pagalba">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybÄ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinÄ? Å¡iam saitui">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privatumo ir saugumo nustatymai">
 <!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius">
-<!ENTITY torbutton.prefs.test_settings "Patikrinti nustatymus">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index e1aa7ad..a25ef98 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Lietot Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Lietot starpnieka pielÄ?gotus iestatÄ«jumus">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP starpnieks:">
-<!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.pref_connection.notice "AtspÄ?jot Torbutton, lai mainÄ«tu Å¡os iestatÄ«jumus.">
-<!ENTITY torbutton.pref_connection.more_info "Papildu informÄ?cija">
-<!ENTITY torbutton.pref_connection_more_info.title "Palīdzība">
-<!ENTITY torbutton.pref_connection_more_info.text "Å obrÄ«d Torbutton ir iespÄ?jots.  Ja vÄ?laties mainÄ«t savus Ä?rpus-Tor starpnieka iestatÄ«jumus, lÅ«dzu atspÄ?jojiet Torbutton un tad atgriezieties te.  Ja vÄ?laties mainÄ«t savus Tor iestatÄ«jumus, lÅ«dzu lietojiet Torbutton'a preferenÄ?u logu.">
 <!ENTITY torbutton.context_menu.new_identity "Jauna identitÄ?te">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Jauns Tor maršruts šai vietnei">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Atjaunot noklusÄ?juma vÄ?rtÄ«bas">
-<!ENTITY torbutton.prefs.test_settings "PÄ?rbaudÄ«t iestatÄ«jumus">
-<!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.cookiedialog.title "PÄ?rvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄ?m">
 <!ENTITY torbutton.cookiedialog.lockCol "AizsargÄ?ts">
 <!ENTITY torbutton.cookiedialog.domainCol "ViesotÄ?js">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ierobežot trešo personu sīkdatnes un citus izsekošanas datus">
diff --git a/mg/torbutton.dtd b/mg/torbutton.dtd
index 12364fc..0720208 100644
--- a/mg/torbutton.dtd
+++ b/mg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/mi/torbutton.dtd b/mi/torbutton.dtd
index 12364fc..0720208 100644
--- a/mi/torbutton.dtd
+++ b/mi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/mk/torbutton.dtd b/mk/torbutton.dtd
index ff43259..59f6a70 100644
--- a/mk/torbutton.dtd
+++ b/mk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?оÑ?иÑ?Ñ?и ги подеÑ?Ñ?ваÑ?аÑ?а пÑ?епоÑ?аÑ?ани за моÑ?аÑ?а веÑ?зиÑ?а на ФаÑ?Ñ?Ñ?окÑ?">
-<!ENTITY torbutton.prefs.use_polipo "Ð?оÑ?иÑ?Ñ?и го Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?оÑ?иÑ?Ñ?и Ñ?опÑ?Ñ?вени пÑ?окÑ?и-подеÑ?Ñ?ваÑ?а">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ñ?оÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?а:">
-<!ENTITY torbutton.pref_connection.notice "Ð?Ñ?клÑ?Ñ?еÑ?е го Torbutton за да ги пÑ?омениÑ?е овие пÑ?одеÑ?Ñ?ваÑ?а.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?овеÑ?е инÑ?оÑ?маÑ?ии">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton е моменÑ?ално вклÑ?Ñ?ен. Ð?околкÑ? Ñ?акаÑ?е да ги пÑ?омениÑ?е подеÑ?Ñ?ваÑ?аÑ?а на Ð?аÑ?еÑ?о пÑ?окÑ?и кои Ñ?Ñ?о не Ñ?е повÑ?зани Ñ?о ТоÑ?, Ñ?ога иÑ?клÑ?Ñ?еÑ?е ги Torbutton и поÑ?оа вÑ?аÑ?еÑ?е Ñ?е Ñ?Ñ?ка. Ð?околкÑ? Ñ?акаÑ?е да ги пÑ?омениÑ?е подеÑ?Ñ?ваÑ?аÑ?а за ТоÑ?, Ñ?огаÑ? коÑ?иÑ?Ñ?еÑ?е го пÑ?озоÑ?оÑ? Ð?одеÑ?Ñ?ваÑ?а на ТоÑ?.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?ликнеÑ?е за иниÑ?иÑ?аÑ?е на Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "СÑ?андаÑ?дни подеÑ?Ñ?ваÑ?а">
-<!ENTITY torbutton.prefs.test_settings "ТеÑ?Ñ?иÑ?аÑ? ги подеÑ?Ñ?ваÑ?аÑ?а">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd
index aa4443e..100bf79 100644
--- a/ml/torbutton.dtd
+++ b/ml/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "പ�ര�ാ��സി ��രമ��രണ���ൾ">
-<!ENTITY torbutton.prefs.recommended_settings "ശ�പാർശ :- ഫയർഫ�ാ��സ� പ�ര�ാ��സി ��രമ��രണ���ൾ  �പയ�ാ�ി�����">
-<!ENTITY torbutton.prefs.use_polipo "പ�ളിപ� �പയ�ാ�ി�����">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "����തൽ വിവര���ൾ">
-<!ENTITY torbutton.pref_connection_more_info.title "സഹായ�">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "� സ�റ�റ� വ�ണ��ി പ�തിയ ��ാർ സർ��യ�����">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "സ�വ�ാര�യത, സ�ര��ഷാ ��രമ��രണ���ൾ">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/mn/torbutton.dtd b/mn/torbutton.dtd
index de03d69..0720208 100644
--- a/mn/torbutton.dtd
+++ b/mn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "ТÑ?Ñ?ламж">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/mr/torbutton.dtd b/mr/torbutton.dtd
index cbea412..dcc81ab 100644
--- a/mr/torbutton.dtd
+++ b/mr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "प�र���स� स��ि����">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "�� �� �� प� प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.https "�स�स�ल प�र���स�">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "��पन�यता �णि स�र��षा स��ि����">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 8ba22fc..c577538 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Guna Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Guna tetapan proksi peribadi">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Hos:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton sedang aktif. Jika anda ingin menukar tetapan proksi Tor anda, sila mematikan Torbutton dan kembali ke sini. Jika anda ingin untuk menukar tetapan Tor anda, sila menggunakan window utama Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identiti Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klik untuk memulakan Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Kembalikan tetapan asal">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!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.cookiedialog.title "Mengurus Perlindungan Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Hos">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/mt/torbutton.dtd b/mt/torbutton.dtd
index 12364fc..0720208 100644
--- a/mt/torbutton.dtd
+++ b/mt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/my/torbutton.dtd b/my/torbutton.dtd
index f02e69a..7801499 100644
--- a/my/torbutton.dtd
+++ b/my/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸">
-<!ENTITY torbutton.prefs.recommended_settings "á??á?»á?½á??á?ºá??á?±á?¬á?ºá?· á??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸ á??á?¬á?¸á??á?¾á??á?ºá?¸á?¡á??á?½á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á?±á?¬ á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º">
-<!ENTITY torbutton.prefs.use_polipo "Polipo á??á?­á?¯ á??á?¯á?¶á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.custom_settings "á??á?­á??á?ºá??á?¼á?­á?¯á??á?º á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¯á?¶á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host -">
-<!ENTITY torbutton.prefs.proxy.port "Port -">
-<!ENTITY torbutton.pref_connection.notice "á?¡á?²á??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á??á?º Torbutton á??á?­á?¯ á??á?­á??á?ºá??á?«á??">
-<!ENTITY torbutton.pref_connection.more_info "á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸">
-<!ENTITY torbutton.pref_connection_more_info.title "á?¡á??á?°á?¡á??á?®">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?­á?¯ á??á?±á?¬á??á?±á?¬á??á??á?º á??á?½á??á?ºá?·á??á?¬á?¸á??á??á?ºá?? á?¡á??á??á?ºá?? á??á??á?ºá?· Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?¯á?¶á?¸á??á?±á?¬ á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?»á?¾á??á?ºá?? Torbutton á??á?­á?¯ á??á?­á??á?ºá??á?¼á?®á?¸ á?¤á??á?±á??á?¬á??á?­á?¯á?· á??á?¼á??á?ºá??á?¬á??á?«á?? á?¡á??á??á?ºá?? á??á??á?ºá?· Tor á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?«á??á?? Torbutton á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?¾á?¯ á??á??á?ºá?¸á??á?­á?¯á?¸á??á?­á?¯ á??á?¯á?¶á?¸á??á?½á?²á??á?«á??">
 <!ENTITY torbutton.context_menu.new_identity "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸ á?¡á??á??á?º">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbutton á??á?­á?¯ á?¡á??á??á?¼á?¯á??á??á?º á??á?¾á?­á??á?ºá??á?«á??">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults " á??á?°á??á?¡á??á?­á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.test_settings "á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸">
-<!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.cookiedialog.title "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?®á??á?¶á??á??á?ºá?·á??á?½á?²á??á??á?º">
 <!ENTITY torbutton.cookiedialog.lockCol "á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á?? á??á?­á?¯á?·á??á?±á?¬á?º á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á??á?º">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á?¼á??á?ºá?¸ á??á??á?¼á?¯á??á??á?º">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nah/torbutton.dtd b/nah/torbutton.dtd
index 12364fc..0720208 100644
--- a/nah/torbutton.dtd
+++ b/nah/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nap/torbutton.dtd b/nap/torbutton.dtd
index 12364fc..0720208 100644
--- a/nap/torbutton.dtd
+++ b/nap/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index d964f59..18ae9cf 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Mellomtjenerinnstillinger">
-<!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte mellomtjenerinnstillinger for min versjon av Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Bruk Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Bruk egne mellomtjenerinnstillinger">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-mellomtjener:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-mellomtjener:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-mellomtjener:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-mellomtjener:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-vert:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for øyeblikket aktivert. Hvis du vil endre på ikke-Tor-mellomtjeningsinnstillinger, skru av Torbutton og kom tilbake hit. Hvis du vil endre på Tor-innstillingene, bruk Torbutton-innstillingsvinduet.">
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klikk for å igangsette Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Personvern og sikkerhetsinnstillinger">
 <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg">
-<!ENTITY torbutton.prefs.test_settings "Test innstillinger">
-<!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.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 12364fc..0720208 100644
--- a/nds/torbutton.dtd
+++ b/nds/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ne/torbutton.dtd b/ne/torbutton.dtd
index 12364fc..0720208 100644
--- a/ne/torbutton.dtd
+++ b/ne/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index 1fac12d..66ae979 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Polipo gebruiken">
-<!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS host:">
-<!ENTITY torbutton.prefs.proxy.port "Poort:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan het Torbutton Voorkeuren-venster.">
 <!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen">
 <!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand">
-<!ENTITY torbutton.prefs.test_settings "Testen van de instellingen">
-<!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.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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.)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
diff --git a/nl_BE/torbutton.dtd b/nl_BE/torbutton.dtd
index 4a10a68..a8fca00 100644
--- a/nl_BE/torbutton.dtd
+++ b/nl_BE/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Gebruik aangepaste proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Poort:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Standaardinstellingen Herstellen">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nn/torbutton.dtd b/nn/torbutton.dtd
index aa6f9ee..91a48b8 100644
--- a/nn/torbutton.dtd
+++ b/nn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Personvern- og tryggingsinnstillingar">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/nso/torbutton.dtd b/nso/torbutton.dtd
index 12364fc..0720208 100644
--- a/nso/torbutton.dtd
+++ b/nso/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/oc/torbutton.dtd b/oc/torbutton.dtd
index 12364fc..0720208 100644
--- a/oc/torbutton.dtd
+++ b/oc/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/or/torbutton.dtd b/or/torbutton.dtd
index 192c309..0720208 100644
--- a/or/torbutton.dtd
+++ b/or/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ପ�ର��ସି ସ�ାଣି">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "ପ�ଲିପ� ବ��ବହାର �ରନ�ତ�">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/pa/torbutton.dtd b/pa/torbutton.dtd
index 43fac16..ae78bf3 100644
--- a/pa/torbutton.dtd
+++ b/pa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ਪਰਾ�ਸ� ਸ��ਿੰ�">
-<!ENTITY torbutton.prefs.recommended_settings "ਫਾ�ਰਫਾ�ਸ ਦ� ਮ�ਰ� ਵਰ�ਨ ਲ� ਸਿਫਾਰਸ਼� ਪਰਾ�ਸ� ਸ��ਿੰ� ਵਰਤ��">
-<!ENTITY torbutton.prefs.use_polipo "ਪ�ਲ�ਪ� ਵਰਤ��">
-<!ENTITY torbutton.prefs.custom_settings "��ਦ ਪਰਾ�ਸ� ਸ��ਿੰ� ਦਿ�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP ਪਰਾ�ਸ�:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL ਪਰਾ�ਸ�:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP ਪਰਾ�ਸ�:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher ਪਰਾ�ਸ�:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ਹ�ਸ�:">
-<!ENTITY torbutton.prefs.proxy.port "ਪ�ਰ�:">
-<!ENTITY torbutton.pref_connection.notice "�ਹ ਸ��ਿੰ� ਬਦਲਣ ਲ� ��ਰਬ�ਨ ਬੰਦ �ਰ�।">
-<!ENTITY torbutton.pref_connection.more_info "ਹ�ਰ �ਾਣ�ਾਰ�">
-<!ENTITY torbutton.pref_connection_more_info.title "ਸਹਾ�ਤਾ">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "ਨਵ�� ਪ�ਾਣ">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "��ਰਬ�ਨ ਸ਼�ਰ� �ਰਨ ਲ� �ਲਿੱ� �ਰ�">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ਮ�ਲ ਮ��-ਸ��ਰ �ਰ�">
-<!ENTITY torbutton.prefs.test_settings "��ਸ� ਸ��ਿੰ�">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/pap/torbutton.dtd b/pap/torbutton.dtd
index 12364fc..0720208 100644
--- a/pap/torbutton.dtd
+++ b/pap/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd
index eabc8ef..0006944 100644
--- a/pl/torbutton.dtd
+++ b/pl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Używaj Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Użyj spersonalizowanych ustawieÅ? proxy.">
-<!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Serwer proxy FTP:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest wÅ?Ä?czony. JeÅ?li chcesz zmieniÄ? inne ustawienia proxy musisz wyÅ?Ä?czyÄ? Torbutton i powróciÄ? tutaj. JeÅ?li chcesz zmieniÄ? ustawienia proxy Tor, zrób to tutaj.">
 <!ENTITY torbutton.context_menu.new_identity "Nowa TożsamoÅ?Ä?">
 <!ENTITY torbutton.context_menu.new_identity_key "o">
 <!ENTITY torbutton.context_menu.new_circuit "Nowy obwód dla tej strony">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatnoÅ?ci i bezpieczeÅ?stwa">
 <!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅ?lne">
-<!ENTITY torbutton.prefs.test_settings "Testuj ustawienia">
-<!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.cookiedialog.title "ZarzÄ?dzaj ochronÄ? ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅ?użÄ?ce do Å?ledzenia">
diff --git a/pms/torbutton.dtd b/pms/torbutton.dtd
index 12364fc..0720208 100644
--- a/pms/torbutton.dtd
+++ b/pms/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ps/torbutton.dtd b/ps/torbutton.dtd
index 12364fc..0720208 100644
--- a/ps/torbutton.dtd
+++ b/ps/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd
index 67e8649..9e4dcf7 100644
--- a/pt/torbutton.dtd
+++ b/pt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Utilizar Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utilizar as configurações do proxy personalizadas">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Restaurar Predefinições">
-<!ENTITY torbutton.prefs.test_settings "Testar Configurações">
-<!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.cookiedialog.title "Gerir Proteções dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 5cd5932..aed4c51 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy de SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy de FTP:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está habilitado. Se desejar alterar as configurações de proxy não relacionadas ao Tor, por favor desabilite o Torbutton e retorne aqui. Se você desejar alterar as configurações do Tor, por favor, use a janela de configurações do Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Restaurar padrões">
-<!ENTITY torbutton.prefs.test_settings "Testar configurações">
-<!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.cookiedialog.title "Gerenciar Proteções de Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd
index ffeb7e8..a01e0a2 100644
--- a/ro/torbutton.dtd
+++ b/ro/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "FoloseÈ?te Polipo">
-<!ENTITY torbutton.prefs.custom_settings "FoloseÈ?te setÄ?ri individualizate pentru proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Portul:">
-<!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄ?ri.">
-<!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄ? în acest moment. DacÄ? doriÅ£i sÄ? schimbaÅ£i setÄ?rile non-proxy Tor, dezactivaÅ£i Torbutton Å?i vÄ? rugÄ?m sÄ? reveniÅ£i aici. DacÄ? doriÅ£i sÄ? vÄ? schimbaÅ£i setÄ?rile Tor, vÄ? rugÄ?m sÄ? folosiÅ£i fereastra de preferinÅ£Ä? Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identitate noua">
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Circuit Tor nou pentru acest site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ConfigurÄ?ri de intimitate È?i securitate">
 <!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ? setÄ?rile implicite">
-<!ENTITY torbutton.prefs.test_settings "SetÄ?rile pentru testÄ?ri">
-<!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.cookiedialog.title "GestioneazÄ? ProtecÅ£ii Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protejat">
 <!ENTITY torbutton.cookiedialog.domainCol "Gazda">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 36a27e6..49b9d98 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?полÑ?зоваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и, Ñ?екомендованнÑ?е длÑ? данной веÑ?Ñ?ии Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?Ñ?полÑ?зоваÑ?Ñ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "УÑ?Ñ?ановиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и вÑ?Ñ?Ñ?нÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-пÑ?оÑ?окол:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? Torbutton длÑ? изменениÑ? наÑ?Ñ?Ñ?оек необÑ?одимо.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?одÑ?обноÑ?Ñ?и">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?Ñ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton вклÑ?Ñ?ен.  Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е измениÑ?Ñ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и, не Ñ?влÑ?Ñ?Ñ?егоÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?еÑ?и Tor, необÑ?одимо Ñ?наÑ?ала оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton и заÑ?ем веÑ?нÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?да. Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е измениÑ?Ñ? наÑ?Ñ?Ñ?ойки Tor, необÑ?одимо иÑ?полÑ?зоваÑ?Ñ? окно наÑ?Ñ?Ñ?оек Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?оваÑ? лиÑ?ноÑ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "Я">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?оваÑ? Ñ?епоÑ?ка Tor длÑ? Ñ?Ñ?ого cайÑ?а">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? иниÑ?иализиÑ?оваÑ?Ñ? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ð?аÑ?Ñ?Ñ?ойки конÑ?иденÑ?иалÑ?ноÑ?Ñ?и и безопаÑ?ноÑ?Ñ?и">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? знаÑ?ениÑ? по Ñ?молÑ?аниÑ?">
-<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овеÑ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки">
-<!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.cookiedialog.title "УпÑ?авление заÑ?иÑ?ой кÑ?ки-Ñ?айлов">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ено">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð?едÑ?Ñ?ий Ñ?зел">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "УдалиÑ?Ñ? вÑ?е, кÑ?оме заÑ?иÑ?Ñ?ннÑ?Ñ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?иÑ?аÑ?Ñ? новÑ?е кÑ?ки-Ñ?айлÑ?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е заÑ?иÑ?аÑ?Ñ? новÑ?е кÑ?ки-Ñ?айлÑ?">
-<!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озÑ?аÑ?наÑ? &quot;Ñ?оÑ?иÑ?икаÑ?иÑ?&quot; (Ñ?Ñ?ебÑ?еÑ? полÑ?зоваÑ?елÑ?Ñ?киÑ? transproxy или Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
 <!ENTITY torbutton.prefs.priv_caption "Ð?аÑ?Ñ?Ñ?ойки конÑ?иденÑ?иалÑ?ноÑ?Ñ?и">
 <!ENTITY torbutton.prefs.block_disk "Ð?е Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? иÑ?Ñ?оÑ?иÑ? жÑ?Ñ?нала поÑ?еÑ?ений и даннÑ?е Ñ? поÑ?еÑ?аемÑ?Ñ? Ñ?айÑ?ов (акÑ?ивиÑ?Ñ?еÑ? Ñ?Ñ?нкÑ?иÑ? конÑ?иденÑ?иалÑ?ного пÑ?оÑ?моÑ?Ñ?а)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?локиÑ?оваÑ?Ñ? Ñ?Ñ?оÑ?онние кÑ?ки-Ñ?айлÑ? и дÑ?Ñ?гие даннÑ?е Ñ?лежениÑ?">
diff --git a/ru@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd
index c7c2f3a..f6883a9 100644
--- a/ru@petr1708/torbutton.dtd
+++ b/ru@petr1708/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?полÑ?зоваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и, Ñ?екомендованнÑ?Ñ? длÑ? данной веÑ?Ñ?Ñ?и Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?Ñ?полÑ?зоваÑ?Ñ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "УÑ?Ñ?ановиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и вÑ?Ñ?Ñ?нÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ñ?оÑ?Ñ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?лÑ? измѣненÑ?Ñ? наÑ?Ñ?Ñ?оекÑ? необÑ?одимо оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?одÑ?обноÑ?Ñ?и">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?одÑ?казка">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton вклÑ?Ñ?енÑ?.  Ð?Ñ?ли бÑ?дÑ?Ñ?Ñ? измѣнÑ?Ñ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и, не Ñ?влÑ?Ñ?Ñ?егоÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?Ñ£Ñ?и Tor, необÑ?одимо Ñ?наÑ?ала оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton и заÑ?ѣмÑ? веÑ?нÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?да.  Ð?Ñ?ли бÑ?дÑ?Ñ?Ñ? измѣнÑ?Ñ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки Tor, необÑ?одимо иÑ?полÑ?зоваÑ?Ñ? окно наÑ?Ñ?Ñ?оекÑ? Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?оваÑ? лиÑ?ноÑ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "Я">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,14 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?ниÑ?Ñ?ализиÑ?оваÑ?Ñ? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?озÑ?Ñ?ановиÑ?Ñ? знаÑ?енÑ?Ñ? по Ñ?молÑ?анÑ?Ñ?">
-<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овѣÑ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки">
-<!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.cookiedialog.title "УпÑ?авленÑ?е заÑ?иÑ?ой Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ено">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð?мÑ? компÑ?Ñ?Ñ?еÑ?а">
@@ -55,7 +33,6 @@
 новÑ?е
 
  Cookies">
-<!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озÑ?аÑ?наÑ? Ñ?оÑ?иÑ?икаÑ?Ñ?Ñ? (ТÑ?ебÑ?еÑ?Ñ? полÑ?зоваÑ?елÑ?Ñ?киÑ?Ñ? transproxy или Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
 <!ENTITY torbutton.prefs.block_disk "Ð?е Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? жÑ?Ñ?налÑ? обозÑ?ѣваÑ?елÑ? и даннÑ?е Ñ?Ñ? поÑ?Ñ£Ñ?аемÑ?Ñ?Ñ? Ñ?айÑ?овÑ? (акÑ?ивиÑ?Ñ?еÑ?Ñ? Ñ?Ñ?нкÑ?Ñ?Ñ? пÑ?иваÑ?наго пÑ?оÑ?моÑ?Ñ?а)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?локиÑ?оваÑ?Ñ? Ñ?Ñ?оÑ?оннÑ?Ñ? кÑ?ки и дÑ?Ñ?гÑ?е даннÑ?е Ñ?лѣженÑ?Ñ?">
diff --git a/scn/torbutton.dtd b/scn/torbutton.dtd
index 12364fc..0720208 100644
--- a/scn/torbutton.dtd
+++ b/scn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd
index 4d9b9d6..6172981 100644
--- a/sco/torbutton.dtd
+++ b/sco/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Uise Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Uise custom proxy settins">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Hoast:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is nou enabled.  Gif ye'd lyk tae chynge yer non-Tor proxy settins, please disable Torbutton n come back here.  Gif ye'd lyk tae chynge yer Tor settins, please uise the Torbutton preeference windae.">
 <!ENTITY torbutton.context_menu.new_identity "New Identitie">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Clap tae ineetialise Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defauts">
-<!ENTITY torbutton.prefs.test_settings "Test Settins">
-<!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.cookiedialog.title "Manage Cookie Fendins">
 <!ENTITY torbutton.cookiedialog.lockCol "Fendit">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third pairtie cookies n ither trackin data">
diff --git a/si_LK/torbutton.dtd b/si_LK/torbutton.dtd
index e22ee55..a293eb9 100644
--- a/si_LK/torbutton.dtd
+++ b/si_LK/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ජ�ල �ත�ර� ම�ර�� �����ම�">
-<!ENTITY torbutton.prefs.recommended_settings "ම�� Firefox �න���දය �ද�� �ච�තජ�ල �ත�ර� ම�ර�� �����ම� භ���ත� �රන�න.">
-<!ENTITY torbutton.prefs.use_polipo "polipo ජ�ල �ත�ර� ම�ර�� �����ම�/proxy භ���ත� �රන�න">
-<!ENTITY torbutton.prefs.custom_settings "�බ� ර�ච�ය �න�� ජ�ල �ත�ර� ම�ර�� �����ම� භ���ත� �රන�න.">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP ජ�ල �ත�ර� ම�ර�� �����ම�/proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL /�ර����ත/ ජ�ල �ත�ර� ම�ර�� �����ම�/proxy/:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP ජ�ල �ත�ර� ම�ර�� �����ම� :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher න�ය�ත� ����ද�ය�:">
-<!ENTITY torbutton.prefs.proxy.host.socks "���ට�ට� �ත���ර�ය:">
-<!ENTITY torbutton.prefs.proxy.port "ප�ර�ටය:">
-<!ENTITY torbutton.pref_connection.notice "ම�ම �����ම� ��න�� ��ර�ම �ද�� Torbutton �බල �රන�න.">
-<!ENTITY torbutton.pref_connection.more_info "��ඩ�ද�ර ත�රත�ර�">
-<!ENTITY torbutton.pref_connection_more_info.title "�ද��� ">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ද�න� �බල �ර ප�ත�. �බ �බ�� non-Tor න�ය�ත� ����ද�ය� �����ම� ��න�� ��ර�මට ��මත� නම�, �ර�ණ��ර Torbutton �බල �ර න��ත ම��� ප�ම�ණ�න�න. �බට �බ��  Tor ��ට��ම� ��න�� ��ර�මට ��මත� නම�, �ර�ණ��ර Torbutton �රණ ������ ය�ද� �න�න.">
 <!ENTITY torbutton.context_menu.new_identity "න� ��ද�න�ම">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Torbutton ම�ලප�ර�මට ��ල��� �රන�න">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "පà·?රනà·?මà·? දà·? පà·?â??රතà·?à·?à·?ථà·?පනය à¶?රනà·?න ">
-<!ENTITY torbutton.prefs.test_settings "පර����ණ ��ට��ම�">
-<!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.cookiedialog.title "���� �ර���ණ ��මන��රණය �රන�න">
 <!ENTITY torbutton.cookiedialog.lockCol "à¶?රà¶?à·?â??à·?à·?ත">
 <!ENTITY torbutton.cookiedialog.domainCol "�ත���ර�">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "à¶?රà¶?à·?â??à·?à·?ත à¶?à·?à·? à·?à·?ර à¶?නà·?තà·? à·?à·?යලà·?ලම à¶?à·?තà·? à¶?රනà·?න">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "න� ���� �ර���� �රන�න">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "න� ���� �ර���� න��රන�න">
-<!ENTITY torbutton.prefs.transparentTor "පà·?රදà·?à·?à·?â??ය Tor බà·?ට පතà·? à¶?à·?රà·?ම (à·?à·?â??යà·?à·?à·?රà·?à¶? පà·?රදà·?à·?à·?â??ය à·?à·?à·?à·?දà·?යà¶?යà·?à¶?à·? à·?à·? Tor රà·?à·?ටරයà¶?à·? à¶?à·?à·?à·?â??යය)">
 <!ENTITY torbutton.prefs.priv_caption "ප�ද��ල�� ��ට��ම� ">
 <!ENTITY torbutton.prefs.block_disk "à·?à·?à·?à·?මà·? à¶?තà·?à·?à·?à·?ය à·?à·? à·?à·?බà·?à¶?ඩà·?à·? දතà·?ත à·?à·?රà·?තà·? නà·?à¶?රනà·?න (පà·?දà·?à¶?ලà·?à¶? à·?à·?à·?à·?මà·? මà·?ධà·?â??ය à¶?à·?â??රà·?යà·?තà·?මà¶? à¶?රයà·?)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ත��න ප�ර��� ���� �� �න��� ��ය�න��රණ දත�ත �ත���ට��න�න">
diff --git a/sk/torbutton.dtd b/sk/torbutton.dtd
index b9272be..7a5d6b2 100644
--- a/sk/torbutton.dtd
+++ b/sk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Použiť Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Použiť vlastné nastavenie proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Pomocník">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "Nová identita">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Nastavenia Súkromia a BezpeÄ?nosti">
 <!ENTITY torbutton.prefs.restore_defaults "Obnoviť predvolené">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 83bc681..db96536 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Použiť Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Vlastné nastavenia proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je aktuálne aktívny. Ak by ste chceli zmeniť vaše neTor nastavenia proxy, vypnite, prosím, Torbutton a vráťte sa sem. Ak si prajete zmeniť vaše Tor nastavenia, použite, prosím, okno nastavení Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nová Identita">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nový Tor obvod pre túto stránku">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Kliknutím zaveÄ?te Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Nastavenia súkromia a bezpeÄ?nostné nastavenia">
 <!ENTITY torbutton.prefs.restore_defaults "Obnoviť pôvodné">
-<!ENTITY torbutton.prefs.test_settings "Skontrolovať nastavenia">
-<!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.cookiedialog.title "Spravovať Ochranu cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Chránené">
 <!ENTITY torbutton.cookiedialog.domainCol "Hostiteľ">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ObmedziÅ¥ cookies tretích strán a Ä?alÅ¡ie stopovacie údaje">
diff --git a/sl/torbutton.dtd b/sl/torbutton.dtd
index 1f261d8..8555c36 100644
--- a/sl/torbutton.dtd
+++ b/sl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL posredniški strežnik:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP posredniški strežnik:">
-<!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.pref_connection.notice "Ä?e želite spremeniti te nastavitve onemogoÄ?ite razÅ¡iritev Torbutton.">
-<!ENTITY torbutton.pref_connection.more_info "VeÄ? informacij">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "RazÅ¡iritev Torbutton je trenutno omogoÄ?ena. Ä?e želite spremeniti nastavitve ne-Tor posredniÅ¡kega strežnika (proxy) najprej onemogoÄ?ite razÅ¡iritev Torbutton, nato pa se vrnite na to mesto. Ä?e želite spremeniti nastavitve povezave v Tor omrežje uporabite nastavitve razÅ¡iritve Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "nova indetiteta">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
-<!ENTITY torbutton.prefs.test_settings "Preveri nastavitve">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index 308af66..d80ed1f 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Uporabite Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Uporabite obiÄ?ajne proxy nastavitve">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Vhod:">
-<!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Ä?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je privzeto omogoÄ?en. Ä?e želite spremeniti vaÅ¡e ne-Tor proxy nastavitve, prosim onemogoÄ?ite Torbutton in se vrnite sem. Ä?e želite spremeniti Tor nastavitve, prosim uporabite Torbutton izborno okno.">
 <!ENTITY torbutton.context_menu.new_identity "Nova Identiteta">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Tor vezje za to stran">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klik za zaÄ?etek Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Nastavitve zasebnosti in varnosti">
 <!ENTITY torbutton.prefs.restore_defaults "Obnovi privzeto">
-<!ENTITY torbutton.prefs.test_settings "Testiranje nastavitev">
-<!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.cookiedialog.title "Upravljaj zaÅ¡Ä?ito piÅ¡kotkov">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡Ä?iteno">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Omeji piškotke tretjih oseb in druge podatke o sledenju">
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index b9fa228..0720208 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/so/torbutton.dtd b/so/torbutton.dtd
index 12364fc..0720208 100644
--- a/so/torbutton.dtd
+++ b/so/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/son/torbutton.dtd b/son/torbutton.dtd
index 12364fc..0720208 100644
--- a/son/torbutton.dtd
+++ b/son/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd
index ea62f92..1482ac3 100644
--- a/sq/torbutton.dtd
+++ b/sq/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!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ë">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton-i tani është i aktivizuar. Nëse dëshironi ta ndryshoni konfigurimin që s'lidhet me Tor-in, për proxy-n tuaj, ju lutemi paaftësoni Torbutton-in dhe kthehuni këtu.  Nëse do dëshironit të ndryshoni konfigurimin e Tor-it tuaj, ju lutemi të përdorni dritaren e parapëlqimit për Torbutton-in.">
 <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Një Cirkuit i Ri Tor për këtë Webfaqe">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Rivendoseni Parazgjedhjen">
-<!ENTITY torbutton.prefs.test_settings "Provoni Konfigurimin">
-<!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.cookiedialog.title "Administroni Mbrojtjen e Cookie-ve">
 <!ENTITY torbutton.cookiedialog.lockCol "I mbrojtur">
 <!ENTITY torbutton.cookiedialog.domainCol "Pritësi">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Kufizojini cookie-t e palëve të treta dhe të dhënat e tjera gjurmuese">
diff --git a/sr/torbutton.dtd b/sr/torbutton.dtd
index 8a25bcc..72714ac 100644
--- a/sr/torbutton.dtd
+++ b/sr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?оÑ?Ñ?авке поÑ?Ñ?едника">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?оÑ?иÑ?Ñ?и пÑ?епоÑ?Ñ?Ñ?ене поÑ?Ñ?авке поÑ?Ñ?едника за моÑ?е издаÑ?е Ñ?аÑ?еÑ?Ñ?окÑ?а">
-<!ENTITY torbutton.prefs.use_polipo "Ð?оÑ?иÑ?Ñ?и Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?ене поÑ?Ñ?авке поÑ?Ñ?едника">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS домаÑ?ин:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?абÑ?ани пÑ?оменÑ? овиÑ? поÑ?Ñ?авки.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?иÑ?е инÑ?оÑ?маÑ?иÑ?а">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ñ?е Ñ?Ñ?енÑ?Ñ?но омогÑ?Ñ?ен. Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е поÑ?Ñ?авке поÑ?Ñ?едника невезане за Tor, молимо Ð?аÑ? да онемогÑ?Ñ?иÑ?е Torbutton и вÑ?аÑ?иÑ?е Ñ?е овде.  Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е Tor поÑ?Ñ?авке, молимо Ð?аÑ? да коÑ?иÑ?Ñ?иÑ?е пÑ?озоÑ? за подеÑ?аваÑ?а.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?ов иденÑ?иÑ?еÑ?">
 <!ENTITY torbutton.context_menu.new_identity_key "Ð?">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?ов ТоÑ? СпоÑ? за оваÑ? СаÑ?Ñ?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?ликниÑ?е да биÑ?Ñ?е покÑ?енÑ?ли Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ð?одеÑ?аваÑ?а за пÑ?иваÑ?ноÑ?Ñ? и безбедноÑ?Ñ?">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?овÑ?аÑ?и подÑ?азÑ?мевано">
-<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овеÑ?а поÑ?Ñ?авки">
-<!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.cookiedialog.title "УÑ?еди заÑ?Ñ?иÑ?Ñ? колаÑ?иÑ?а">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?Ñ?иÑ?ен">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Уклони Ñ?ве оÑ?им заÑ?Ñ?иÑ?ениÑ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?Ñ?иÑ?и нове колаÑ?иÑ?е">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е Ñ?Ñ?иÑ?и нове колаÑ?иÑ?е">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
diff --git a/sr@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 12364fc..0720208 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@latin/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/st/torbutton.dtd b/st/torbutton.dtd
index 12364fc..0720208 100644
--- a/st/torbutton.dtd
+++ b/st/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/su/torbutton.dtd b/su/torbutton.dtd
index 12364fc..0720208 100644
--- a/su/torbutton.dtd
+++ b/su/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 4978d15..f65b669 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy för SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy för FTP:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton är aktiverad. Om du vill ändra inställningar för proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill ändra inställningar för Tor, använd Torbutton-inställningarna.">
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och säkerhetsinställningar">
 <!ENTITY torbutton.prefs.restore_defaults "�terställ till standard">
-<!ENTITY torbutton.prefs.test_settings "Testa inställningar">
-<!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.cookiedialog.title "Hantera skyddade kakor">
 <!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
 <!ENTITY torbutton.cookiedialog.domainCol "Värd">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data">
diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd
index 080ebd7..9ab5d94 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Tumia mapandeleo tofauti ya proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Kituo:">
-<!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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Rejesha chaguo-msingi">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 12364fc..0720208 100644
--- a/szl/torbutton.dtd
+++ b/szl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index cee4868..a8b3be8 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "�தவி">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "தனிய�ரிம� மற�ற�ம� பாத��ாப�ப� �ம�ப�ப��ள�">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/te/torbutton.dtd b/te/torbutton.dtd
index 69edb5c..0720208 100644
--- a/te/torbutton.dtd
+++ b/te/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ప�రా��స� �మరి�ల�">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "మరి�త సమా�ార�">
-<!ENTITY torbutton.pref_connection_more_info.title "సహాయ�">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 12364fc..0720208 100644
--- a/te_IN/torbutton.dtd
+++ b/te_IN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/tg/torbutton.dtd b/tg/torbutton.dtd
index 12364fc..0720208 100644
--- a/tg/torbutton.dtd
+++ b/tg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/th/torbutton.dtd b/th/torbutton.dtd
index 16619e4..3ac8ed4 100644
--- a/th/torbutton.dtd
+++ b/th/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "�ำห����า Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "�ำ���า Proxy �ี��หมาะสมมา����ั� Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "�ำ Proxy �ี��ำห��มา���">
-<!ENTITY torbutton.prefs.proxy.host.http "��า HTTP Proxy :">
-<!ENTITY torbutton.prefs.proxy.host.https "��า SSL Proxy :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "��า FTP Proxy :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "��า Gopher Proxy :">
-<!ENTITY torbutton.prefs.proxy.host.socks "��า SOCKS Host :">
-<!ENTITY torbutton.prefs.proxy.port "��า Port :">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "��อมูล��ิ�ม��ิม">
-<!ENTITY torbutton.pref_connection_more_info.title "�วาม��วย�หลือ">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "สร�า��ัว���หม�">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ว��ร Tor �หม�สำหรั������ี�">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "�าร�ั����า �วาม����ส�ว��ัว �ละ �วาม�ลอ�ภัย">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ti/torbutton.dtd b/ti/torbutton.dtd
index 12364fc..0720208 100644
--- a/ti/torbutton.dtd
+++ b/ti/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/tk/torbutton.dtd b/tk/torbutton.dtd
index 42af59e..0720208 100644
--- a/tk/torbutton.dtd
+++ b/tk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Polipo ulan">
-<!ENTITY torbutton.prefs.custom_settings "Yörite proxy sazlamasy">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index eb18fdb..f0ed069 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Vekil Sunucusu:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Å?u anda etkin. Tor-DıÅ?ı vekil sunucu ayarlarını deÄ?iÅ?tirmek istiyorsanız, Torbutton uygulamasını devre dıÅ?ı bırakıp buraya geri gelin. Tor ayarlarınızı deÄ?iÅ?tirmek istiyorsanız Torbutton ayarları penceresini kullanın.">
 <!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Varsayılanları Yükle">
-<!ENTITY torbutton.prefs.test_settings "Ayarları Sına">
-<!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.cookiedialog.title "�erez Koruması Yönetimi">
 <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ?">
 <!ENTITY torbutton.cookiedialog.domainCol "Sunucu">
@@ -43,7 +24,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.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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diÄ?er iz sürücü bilgiler engellensin">
diff --git a/tzm/torbutton.dtd b/tzm/torbutton.dtd
index 12364fc..0720208 100644
--- a/tzm/torbutton.dtd
+++ b/tzm/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ug@Arab/torbutton.dtd b/ug@Arab/torbutton.dtd
index 53548d0..6a8a108 100644
--- a/ug@Arab/torbutton.dtd
+++ b/ug@Arab/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "استخدÙ? بÙ?Ù?Ù?بÙ?">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Ù?ساعدة">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/uk/torbutton.dtd b/uk/torbutton.dtd
index 4944a3f..407b54a 100644
--- a/uk/torbutton.dtd
+++ b/uk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?амеÑ?Ñ?и пÑ?окÑ?Ñ?">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?екомендованÑ? паÑ?амеÑ?Ñ?и длÑ? моÑ?Ñ? веÑ?Ñ?Ñ?Ñ? Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и звиÑ?айнÑ? налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ð?Ñ?зол SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?имкнÑ?Ñ?Ñ? Torbutton, Ñ?об змÑ?ниÑ?и Ñ?Ñ? налаÑ?Ñ?Ñ?ваннÑ?">
-<!ENTITY torbutton.pref_connection.more_info "Ð?Ñ?лÑ?Ñ?е Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?овÑ?дка">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton заÑ?аз Ñ?вÑ?мкнено. ЯкÑ?о Ð?и бажаÑ?Ñ?е змÑ?ниÑ?и налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ? (не Tor-пÑ?окÑ?Ñ?), пÑ?оÑ?Ñ? вимкнÑ?Ñ?и Torbutton Ñ?а повеÑ?нÑ?Ñ?иÑ?Ñ? Ñ?Ñ?ди. ЯкÑ?о ж бажана змÑ?на Ñ?оÑ?каÑ?имеÑ?Ñ?Ñ?Ñ? Tor-пÑ?окÑ?Ñ?, пÑ?оÑ?Ñ? Ñ?е Ñ?обиÑ?и Ñ?еÑ?ез вÑ?кно налаÑ?Ñ?Ñ?ваннÑ? Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?ова оÑ?обиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?ова СÑ?ема Tor длÑ? Ñ?Ñ?ого Ñ?айÑ?Ñ?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Ð?лаÑ?нÑ?Ñ?Ñ? длÑ? запÑ?Ñ?кÑ? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Ð?алаÑ?Ñ?Ñ?ваннÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ? Ñ?а безпеки">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?а Ð?амовÑ?Ñ?ваннÑ?м">
-<!ENTITY torbutton.prefs.test_settings "Ð?еÑ?евÑ?Ñ?иÑ?и Ð?аÑ?Ñ?Ñ?ойки">
-<!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.cookiedialog.title "Ð?еÑ?Ñ?ваÑ?и Ð?аÑ?иÑ?Ñ?ом Ð?Ñ?кÑ?в">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ено">
 <!ENTITY torbutton.cookiedialog.domainCol "ХоÑ?Ñ?">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð?идалиÑ?и УÑ?Ñ?, Ð?кÑ?Ñ?м Ð?аÑ?иÑ?ениÑ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?иÑ?аÑ?и Ð?овÑ? Ð?Ñ?ки">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е Ð?аÑ?иÑ?аÑ?и Ð?овÑ? Ð?Ñ?ки">
-<!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озоÑ?а ТоÑ?Ñ?Ñ?Ñ?каÑ?Ñ?Ñ? (Ð?имагаÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?Ñ?киÑ? transproxy або Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
 <!ENTITY torbutton.prefs.priv_caption "Ð?алаÑ?Ñ?Ñ?ваннÑ? Ð?Ñ?иваÑ?ноÑ?Ñ?Ñ?">
 <!ENTITY torbutton.prefs.block_disk "Ð?е збеÑ?Ñ?гаÑ?и Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? пеÑ?еглÑ?дÑ?в або данÑ? з вÑ?двÑ?дÑ?ваниÑ? Ñ?айÑ?Ñ?в (акÑ?ивÑ?Ñ? Ñ?Ñ?нкÑ?Ñ?Ñ? пÑ?иваÑ?ного пеÑ?еглÑ?дÑ?)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?локÑ?ваÑ?и Ñ?Ñ?оÑ?оннÑ? кÑ?ки Ñ?а Ñ?нÑ?Ñ? данÑ? вÑ?дÑ?Ñ?еженнÑ?">
diff --git a/ur/torbutton.dtd b/ur/torbutton.dtd
index 12364fc..0720208 100644
--- a/ur/torbutton.dtd
+++ b/ur/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index b57b991..aa2a40b 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "پراکسÛ? ترتÛ?بات">
-<!ENTITY torbutton.prefs.recommended_settings "Ù?Û?رÛ? Firefox Ú©Û? Ù?رÚ?Ù? Ú©Û?Ù?ئÛ? سÙ?ارش کردÛ? پراکسÛ? ترتÛ?بات استعÙ?اÙ? کرÛ?Úº">
-<!ENTITY torbutton.prefs.use_polipo "polipo استعÙ?اÙ? کرÛ?Úº">
-<!ENTITY torbutton.prefs.custom_settings "رسÙ?Û? پراکسÛ? ترتÛ?بات استعÙ?اÙ? کرÛ?Úº">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP پراکسÛ?">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL پراکسÛ?">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP پراکسÛ?">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Ù¾Ù?رٹ:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "Ù?زÛ?د Ù?عÙ?Ù?Ù?ات">
-<!ENTITY torbutton.pref_connection_more_info.title "Ù?دد">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ú?Û?Ù?اÙ?ٹس پر Ù?اپس جائÛ?Û?">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/uz/torbutton.dtd b/uz/torbutton.dtd
index 88f06f8..76bfd87 100644
--- a/uz/torbutton.dtd
+++ b/uz/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Andozalarni tiklash">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Himoyalangan">
 <!ENTITY torbutton.cookiedialog.domainCol "Xost">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/ve/torbutton.dtd b/ve/torbutton.dtd
index 12364fc..0720208 100644
--- a/ve/torbutton.dtd
+++ b/ve/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index ec685a9..92c1120 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_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:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy giao thức SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy giao thức FTP:">
-<!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.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">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiá»?n Ä?ang Ä?ược hiá»?u hóa.  Nếu bạn muá»?n thay Ä?á»?i thiết lập proxy không thuá»?c chÆ°Æ¡ng trình Tor, vui lòng tắt Torbutton và  quay trá»? lại Ä?ây.  Nếu bạn muá»?n thay Ä?á»?i thiết lập từ Tor, vui lòng dùng cá»­a sá»? tùy chá»?nh Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Giám Ä?á»?nh Má»?i">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Vòng Tor m�i cho trang nà y">
@@ -27,11 +13,6 @@
 <!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.restore_defaults "Khôi phục Mặc Ä?á»?nh">
-<!ENTITY torbutton.prefs.test_settings "Thiết lập Thử nghi�m">
-<!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.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/wa/torbutton.dtd b/wa/torbutton.dtd
index 12364fc..0720208 100644
--- a/wa/torbutton.dtd
+++ b/wa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/wo/torbutton.dtd b/wo/torbutton.dtd
index 12364fc..0720208 100644
--- a/wo/torbutton.dtd
+++ b/wo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/yo/torbutton.dtd b/yo/torbutton.dtd
index 12364fc..0720208 100644
--- a/yo/torbutton.dtd
+++ b/yo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index 915afa4..3146ce3 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "代ç??设置">
-<!ENTITY torbutton.prefs.recommended_settings "为该ç??æ?¬ Firefox 使ç?¨æ?¨è??ç??代ç??设置">
-<!ENTITY torbutton.prefs.use_polipo "使� Polipo">
-<!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªå®?ä¹?代ç??设置">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.port "端��">
-<!ENTITY torbutton.pref_connection.notice "ç¦?æ­¢ Torbutton æ?´æ?¹è¿?äº?设置ã??">
-<!ENTITY torbutton.pref_connection.more_info "��信�">
-<!ENTITY torbutton.pref_connection_more_info.title "帮�">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton å½?å??å·²å?¯ç?¨ã??å¦?é??对 Tor ä¹?å¤?ç??代ç??设置è¿?è¡?æ?´æ?¹ï¼?请ç¦?ç?¨ Torbutton å??å??è¿?å??è¿?é??ã??å¦?é??æ?´æ?¹ Tor ç??设置ï¼?请å?¨ Torbutton é¦?é??项çª?å?£ä¸­è¿?è¡?设置ã??">
 <!ENTITY torbutton.context_menu.new_identity "�身份">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "为此��使�� Tor 线路">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "ç?¹æ­¤å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "é??ç§?ä¸?å®?å?¨è®¾ç½®">
 <!ENTITY torbutton.prefs.restore_defaults "���认设置">
-<!ENTITY torbutton.prefs.test_settings "æµ?è¯?代ç??设置">
-<!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.cookiedialog.title "管ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
 <!ENTITY torbutton.cookiedialog.domainCol "主�">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨ç§»é?¤ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.transparentTor "Tor 强å??é??æ??代ç??ï¼?é??è¦?è?ªè®¾ TransProxy æ?? Tor è·¯ç?±ï¼?">
 <!ENTITY torbutton.prefs.priv_caption "é??ç§?设置">
 <!ENTITY torbutton.prefs.block_disk "ç¦?止记å½?æµ?è§?å??å?²æ??ç½?ç«?æ?°æ?®ï¼?å?¯ç?¨é??ç§?æµ?è§?模å¼?ï¼?">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?踪ç¨?åº?">
diff --git a/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd
index ac24c39..fa15cb2 100644
--- a/zh_HK/torbutton.dtd
+++ b/zh_HK/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.recommended_settings "å?ºFirefox使ç?¨å»ºè­°å??代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.use_polipo "使�Polipo">
-<!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªè¨?å??代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.proxy.host.http "http代ç??伺æ??å?¨ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL代ç??伺æ??å?¨ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP代ç??伺æ??å?¨ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher代ç??伺æ??å?¨ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS主��">
-<!ENTITY torbutton.prefs.proxy.port "é?£æ?¥å? ï¼?">
-<!ENTITY torbutton.pref_connection.notice "å??ç?¨Torbuttonå??æ?´æ?¹å?¢å?²è¨­å®?ã??">
-<!ENTITY torbutton.pref_connection.more_info "����">
-<!ENTITY torbutton.pref_connection_more_info.title "說æ??">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonå·²å??ç?¨ã??å¦?æ?³æ?´æ?¹é??Toræ´?è?¥è·¯ç?±å??代ç??伺æ??å?¨è¨­å®?ï¼?è«?å??ç?¨Torbutton並è¿?å??å?¢åº¦ã??å¦?ä½ æ?³æ?´æ?¹æ´?è?¥è·¯ç?±å??設å®?ï¼?è«?使ç?¨Torbuttonå??好設å®?è¦?çª?ã??">
 <!ENTITY torbutton.context_menu.new_identity "�身份">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "建ç«?æ?°å??Toræ´?è?¥è·¯ç?±ç·?è·¯å??é?£æ?¥å?¢å??網ç«?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "æ?³è?½å?»å??å§?å??Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "ç§?é?±å??å®?å?¨è¨­å®?">
 <!ENTITY torbutton.prefs.restore_defaults "å??å?°é ?設">
-<!ENTITY torbutton.prefs.test_settings "測試設�">
-<!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.cookiedialog.title "管ç??Cookieå??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.domainCol "主�">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨å?ªé?¤ï¼?ä½?å??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è­·æ?°å??Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "å??ä¿?è­·æ?°å??Cookie">
-<!ENTITY torbutton.prefs.transparentTor "é??æ??Torification(é ?è?ªè¨?Transproxyæ??Toræ´?è?¥è·¯ç?±å?¨)">
 <!ENTITY torbutton.prefs.priv_caption "��設�">
 <!ENTITY torbutton.prefs.block_disk "å??è¨?é??ç??覽歷ç¨?æ??網ç«?è³?æ??(å??ç?¨ç§?é?±ç??覽模å¼?)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹Cookieå??å?¶ä»?è·?蹤è³?æ??">
diff --git a/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd
index ad7b04e..130c416 100644
--- a/zh_TW/torbutton.dtd
+++ b/zh_TW/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.recommended_settings "å?¨ Firefox 使ç?¨å»ºè­°ç??代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.use_polipo "使� Polipo">
-<!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªè¨?ç??代ç??伺æ??å?¨è¨­å®?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP 代ç??伺æ??å?¨:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL 代ç??伺æ??å?¨:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP 代ç??伺æ??å?¨:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher 代ç??伺æ??å?¨:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "é?£æ?¥å? :">
-<!ENTITY torbutton.pref_connection.notice "å??ç?¨ Torbutton ä¾?è®?æ?´é??äº?設å®?ã??">
-<!ENTITY torbutton.pref_connection.more_info "����">
-<!ENTITY torbutton.pref_connection_more_info.title "說æ??">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ç?®å??å·²å??ç?¨ã??è?¥æ?¨æ?³è®?æ?´é??æ´?è?¥è·¯ç?±ç??代ç??伺æ??å?¨è¨­å®?ï¼?è«?å??ç?¨ Torbutton 並è¿?å??é??è£?ã??å¦?æ??æ?¨æ?³è®?æ?´æ´?è?¥è·¯ç?±ç??設å®?ï¼?è«?使ç?¨ Torbutton å??好設å®?è¦?çª?ã??">
 <!ENTITY torbutton.context_menu.new_identity "æ?°è­?å?¥èº«å??">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "建ç«?æ?°ç??æ´?è?¥è·¯ç?±è¿´è·¯ä¾?é?£æ?¥ä¸?此網ç«?">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "æ??ä¸?ä¸?以å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "é?±ç§?è??å®?å?¨è¨­å®?">
 <!ENTITY torbutton.prefs.restore_defaults "é??å??é ?設å?¼">
-<!ENTITY torbutton.prefs.test_settings "測試設�">
-<!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.cookiedialog.title "管ç?? Cookie ç??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.domainCol "主�">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨å?ªé?¤ï¼?ä½?å??ä¿?è­·">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è­·æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?è­·æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.transparentTor "é??æ?? Torification(é??è¦?è?ªè¨? transproxy æ?? Tor è·¯ç?±å?¨)">
 <!ENTITY torbutton.prefs.priv_caption "���設�">
 <!ENTITY torbutton.prefs.block_disk "ä¸?è¨?é??ç??覽歷ç¨?è¨?é??æ??網ç«?è³?æ??(å??ç?¨é?±ç§?ç??覽模å¼?)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?追蹤è³?æ??">
diff --git a/zu/torbutton.dtd b/zu/torbutton.dtd
index 12364fc..0720208 100644
--- a/zu/torbutton.dtd
+++ b/zu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!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)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">

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