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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Bug 18238: remove unused Torbutton code and strings
From: gk@xxxxxxxxxxxxxx
Date: Fri, 3 Jun 2016 09:26:31 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 03 Jun 2016 05:27:13 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit e8f694c4fb513c92ec26603fdaa3be745d7648a5
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Tue May 31 16:44:48 2016 -0400

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

diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ak/torbutton.properties b/src/chrome/locale/ak/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ak/torbutton.properties
+++ b/src/chrome/locale/ak/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/am/torbutton.properties b/src/chrome/locale/am/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/am/torbutton.properties
+++ b/src/chrome/locale/am/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index da247c7..5fa8bb1 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Ù?Ø¹Ù?Ù? ØªÙ?Ø±
-torbutton.button.tooltip.enabled = Ø¹Ø·Ù?Ù? ØªÙ?Ø±
 torbutton.circuit_display.internet = Ø§Ù?ØªØ±Ù?Øª
 torbutton.circuit_display.ip_unknown = IP ØºÙ?Ø± Ù?Ø¹Ø±Ù?Ù?
 torbutton.circuit_display.onion_site = Ù?Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ù?
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Ø¨Ù?Ø¯ ØºÙ?Ø± Ù?Ø¹Ø±Ù?Ù?
 torbutton.content_sizer.margin_tooltip = Ù?Ø¶Ù?Ù? Ù?ØªØµÙ?Ø ØªÙ?Ø± Ù?Ø°Ø§ Ø§Ù?Ù?Ø§Ù?Ø´ Ù?Ø§Ø¨Ù?Ø§Ø¡ Ù?Ø§Ù?Ø°ØªÙ? ØºÙ?Ø± Ù?Ù?Ù?Ø²Ù?Ø? Ù?ØªÙ?Ù?Ù?Ù? Ø§Ù?Ù?Ø§Ù?Ù?Ù? ØªÙ?Ù?Ù?Ù? Ø¹Ø¨Ø± Ø§Ù?Ø§Ù?ØªØ±Ù?Øª.
 torbutton.panel.tooltip.disabled = Ø§Ù?Ù?Ø± Ù?ØªÙ?Ø¹Ù?Ù? ØªÙ?Ø±
 torbutton.panel.tooltip.enabled = Ø§Ù?Ù?Ø± Ù?ØªØ¹Ø·Ù?Ù? ØªÙ?Ø±
-torbutton.panel.plugins.disabled = Ø§Ù?Ù?Ø± Ù?ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª
-torbutton.panel.plugins.enabled = Ø§Ù?Ù?Ø± Ù?ØªØ¹Ø·Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª
 torbutton.panel.label.disabled = ØªÙ?Ø± Ù?Ø¹Ø·Ù?Ù?
 torbutton.panel.label.enabled = ØªÙ?Ø± Ù?Ù?Ø¹Ù?Ù?
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Ø²Ø± ØªÙ?Ø± Ù?Ù?Ù?Ø± Ø²Ø± Ù?ØªØ¹Ø¯Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙ?Ø± Ù?Ø§Ù?Ø¶Ø§Ù? Ù?Ù?Ø³Ø Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØªØµÙ?Ø Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù? Ø¨Ø³Ø±Ø¹Ø© Ù?Ø¨Ø³Ù?Ù?Ù?Ø©.
-torbutton.popup.history.warning = ØØ¬Ø¨ Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ø´Ø§Ø·Ø§Ù? Ù?Ù? ØªØ¨Ù?Ù?Ø¨Ø© Ù?ØÙ?Ù?Ø© Ù?Ù? Ù?Ø¶Ø¹ ØªÙ?Ø± Ù?Ø®ØªÙ?Ù?.\n\nÙ?Ø°Ø§ Ø§Ù?Ø£Ù?Ø± Ù?Ù?Ø§Ù?ØªÙ?Ø§Ù? ØÙ?Ù? Ù?Ø´Ø§Ù?Ù? Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ø±Ù?Ù? 409737 Ù?417869.\n\nØ¥Ø°Ø§ Ø¸Ù?Ø±Øª Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© Ø¯Ù?Ù? Ø³Ø¨Ø¨Ø? Ù?Ù?Ø§Ù? Ø¥ØØ¯Ù? ØªØ¨Ù?Ù?Ø¨Ø§ØªÙ? ØªØØ§Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ù?Ù?Ø³Ù?Ø§ Ù?Ù? Ø§Ù?Ø®Ù?Ù?Ù?Ø©Ø? Ù?ØªÙ? ØØ¬Ø¨ Ù?Ø°Ø§.\n\nÙ?Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ø§Ù?ØªØ¨Ù?Ù?Ø¨Ø© Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø± Ù?Ø°Ù? Ù?Ø±Ø¬Ù? Ø£Ù? ØªØ¶ØºØ· 'Enter' Ù?Ù? ØµÙ?Ø¯Ù?Ù? Ø´Ø±Ù?Ø· Ø§Ù?Ø¹Ù?Ù?Ø§Ù?.\n\n
-torbutton.popup.plugin.warning = Ù?Ù?Ø¹ Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØªØÙ?Ù?Ù?Ø§ Ù?Ø¨Ø§Ø´Ø±Ø§Ù? Ù?Ù?ØØªÙ?Ù? Ø¨Ø±Ù?Ø§Ù?Ø¬ Ø¥Ø¶Ø§Ù?Ù? Ø¨Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³.\n\nØ§Ø³ØªØ®Ø¯Ù? 'Ø§ØÙ?Ø¸ Ø¨Ø§Ø³Ù?' Ù?Ø¨Ø¯Ù?Ù?.\n\n
-torbutton.popup.confirm_ca_certs = Ù?Ù?Ø§ØØ¸Ø© Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø±: Ø¨Ù?Ø§ Ø£Ù?Ù?Ù? Ù?Ø§ ØªÙ?Ù?Ù? Ù?Ù?Ø«Ø§Ù? Ø¥ØµØ¯Ø§Ø± Ø§Ù?Ø´Ù?Ø§Ø¯Ø© Ø§Ù?Ø±Ù?Ù?Ù?Ø? Ù?ØÙ?Ø« Ø£Ù?Ù? Ø¹Ù?Ù?Ù?Ø© Ù?ØØµ Ù?Ø§Ø¦Ù?Ø© Ù?ØµØ¯Ø± Ø§Ù?Ø´Ù?Ø§Ø¯Ø© Ø§Ù?Ø±Ù?Ù?Ù?Ø© Ø¹Ù?Ù?Ù?Ø© Ø¨Ø·Ù?Ø¦Ø© Ù?ØªØ³Ø¨Ø¨ Ø¨Ø·Ø¦Ø§Ù? Ù?Ù? Ø¹Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø±Ø? Ù?Ù?Ù? ØªØ±ØºØ¨ Ù?Ù? ØªØ¹Ø·Ù?Ù? Ø¹Ù?Ù?Ù?Ø© Ø¹Ø²Ù? Ø´Ù?Ø§Ø¯Ø§Øª Ø§Ù?Ø¥ØµØ¯Ø§Ø± Ø§Ù?Ø±Ù?Ù?Ù?Ø? (Ø¥Ù? Ù?Ù?Øª Ù?Ø§ ØªØ¹Ù?Ù? Ø§Ù? Ù?Ø§ ØªÙ?Ù?Ù? Ù?Ø¹Ù?Ù? Ø°Ù?Ù?Ø? Ù?Ø¥Ù?Ù? Ù?Ù? Ø§Ù?Ù?Ø³ØªØØ³Ù? Ø£Ù? ØªØ®ØªØ§Ø± Ø®Ù?Ø§Ø± Ø§Ù?Ù?Ù?Ø§Ù?Ù?Ø©)
-torbutton.popup.ff3.warning = ØªØØ°Ù?Ø±! \n\nÙ?Ù? Ø§Ù?Ù?Ø¹Ø±Ù?Ù? Ø£Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ù? Ø¨Ø±Ù?Ø§Ù?Ø¬ Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ 3 Ù?Ù?Ù?Ù? Ø¨ØªØ³Ø±Ù?Ø¨ Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ø¹Ù? Ø§Ù?Ù?Ù?Ø·Ù?Ø© Ø§Ù?Ø²Ù?Ù?Ù?Ø© Ø§Ù?ØªÙ? Ø£Ù?Øª Ù?Ù?Ù?Ø§ Ù?Ø¹Ù? ØµÙ?ØØ§ØªÙ? Ø§Ù?Ù?Ù?Ø¶Ù?Ø© (Ù?Ø§Ù?Ú¤ Ù?Ø§Ø±Ù?). \n\nÙ?Ù? ØªØ±ØºØ¨ Ø¨Ø§Ù?Ù?ØªØ§Ø¨Ø¹Ø© Ø¹Ù?Ù? Ø£Ù?Ù? ØØ§Ù?Ø?
-torbutton.popup.toggle.warning = ØªØØªØ§Ø¬ Ø¥Ù?Ù? ØªØ¨Ø¯Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø± Ø£Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù?Ù? Ù?ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©.
 torbutton.popup.test.success = ØªÙ?Ù? Ø§Ø®ØªØ¨Ø§Ø± Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø± Ø¨Ù?Ø¬Ø§Ø!
 torbutton.popup.test.failure = Ù?Ø´Ù?Øª Ø¹Ù?Ù?Ù?Ø© Ø§Ø®ØªØ¨Ø§Ø± Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø±! ØªØ£Ù?Ø¯ Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù? Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Polipo  .
 torbutton.popup.test.confirm_toggle = Ù?Ø´Ù? Ø¢Ø®Ø± Ø§Ø®ØªØ¨Ø§Ø± Ù?Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø± Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªÙ?Ø±.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ù?Ù? Ø£Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø¹Ù?Ù?Ù? Ø¹Ù?Ù? Ø£Ù? ØØ§Ù?Ø?\n\nÙ?Ù?Ø§ØØ¸Ø©: Ø¥Ù? Ù?Ù?Øª Ù?Ø¯ Ø¹Ø§Ù?Ø¬Øª Ø§Ù?Ù?Ø´Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¬Ø±Ø§Ø¡ Ø§Ù?Ù?ØØµ Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù? Ù?Ø²Ø± ØªÙ?Ø± ØØªÙ? Ù?Ø®ØªÙ?Ù? Ù?Ø°Ø§ Ø§Ù?ØªÙ?Ø¨Ù?Ù?.
 torbutton.popup.test.ff3_notice = Ø§Ø¶ØºØ· "Ù?Ù?Ø§Ù?Ù?" Ù?Ø§Ø®ØªØ¨Ø§Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø±. Ù?Ø°Ø§ Ø§Ù?Ø§Ø®ØªØ¨Ø§Ø± Ø³Ù?ØªÙ? Ù?Ù? Ø§Ù?Ø®Ù?Ù?Ù?Ø©. Ù?Ø±Ø¬Ù? Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±.
-torbutton.panel.label.verified = ØªÙ? Ø§Ù?ØªØÙ?Ù? Ù?Ø§Ù?Ù?ØµØ§Ø¯Ù?Ø© Ø¹Ù?Ù? ØªÙ?Ø±
-torbutton.popup.test.auto_failed = Ø§Ù?Ø§Ø®ØªØ¨Ø§Ø± Ø§Ù?Ø¢Ù?Ù? Ù?Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø± Ù?Ø´Ù?.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ø£Ù?Ù? ØªØ±Ù?Ø¯ Ø§Ù?ØªÙ?Ø¹Ù?Ù? Ø¹Ù?Ù? Ø£Ù? ØØ§Ù?Ø?
-torbutton.prefs.recommended = (Ù?ØØ¨Ù?Ø°)
-torbutton.prefs.optional = (Ø¥Ø®ØªÙ?Ø§Ø±Ù?)
-torbutton.prefs.crucial = (Ø¶Ø±Ù?Ø±Ù? Ø¬Ø¯Ø§)
 torbutton.popup.external.title = Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø²Ù?Ù? Ù?Ù?Ù?Ø§Ù? Ù?Ù? Ù?Ù?Ø¹ Ø§Ù?Ù?ØµÙ?Ø© Ø§Ù?Ø®Ø§Ø±Ø¬Ù?Ø©Ø? 
 torbutton.popup.external.app = Ù?Ø§ Ù?Ù?Ù?Ù? Ù?Ù?ØªØµÙ?Ù?Ø ØªÙ?Ø± Ø¹Ø±Ø¶ Ù?Ø°Ù? Ø§Ù?Ù?Ù?Ù?, Ù?Ø¬Ø¨ Ø¹Ù?Ù?Ù? Ø£Ù? ØªÙ?ØªØÙ? Ø¨Ø§Ø³ØªØ¹Ù?Ø§Ù? ØªØ·Ø¨Ù?Ù? Ø£Ø®Ø±.\n\n
 torbutton.popup.external.note = Ø¨Ø¹Ø¶ Ø§Ù?Ø£Ù?Ù?Ø§Ø¹ Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ø§Øª Ù?Ø¯ ØªØ¹Ù?Ù? Ø¹Ù?Ù? Ø¥Ø¹Ø·Ø§Ø¡ Ø¨Ø¹Ø¶ Ø§Ù?ØªØ·Ø¨Ù?Ù?Ø§Øª Ø§Ù?Ø¥Ù?Ù?Ø§Ù?Ù?Ù?Ø© Ù?Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø¯Ù?Ù? Ø§Ø³ØªØ¹Ù?Ø§Ù? ØªÙ?Ø±.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = ØªØÙ?Ù?Ù? Ø§Ù?Ù?Ù?Ù?
 torbutton.popup.cancel = Ø¥Ù?ØºØ§Ø¡
 torbutton.popup.dontask = Ø£Ù?Ø²Ù? Ø§Ù?Ù?Ù?Ù?Ø§Øª Ø¨Ø´Ù?Ù?Ù? Ø£Ù?ØªÙ?Ù?Ø§ØªÙ?Ù?Ù?Ù? Ù?Ù? Ø§Ù?Ø£Ù? Ù?ØµØ§Ø¹Ø¯Ø§Ù?
 torbutton.popup.test.no_http_proxy = Ù?ØØµ Ø¨Ø±Ù?Ù?Ø³Ù? ØªÙ?Ø±: Ù?Ø§ Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØµÙ?Ù? Ø¥Ù?Ù? Ø¨Ø±Ù?Ù?Ø³Ù? HTTP Ø§Ù?Ù?ØÙ?Ù?. Ù?Ù? Ù?Ø¹Ù?Ù? Polipo Ø¨Ø´Ù?Ù? ØµØÙ?ØØ?
-torbutton.popup.captcha.title = ØªØ¬Ù?Ø¨ Captcha Ø¬Ù?Ø¬Ù?Ø?
-torbutton.popup.captcha.ask = Ù?Ø´Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ù? Ù?Ø¬Ù?Ø¯ Captcha Ø¬Ù?Ø¬Ù?. Ù?Ù? ØªØ±Ù?Ø¯ Ø£Ù? Ù?ØªÙ? ØªÙ?Ø¬Ù?Ù?Ù? Ø¥Ù?Ù? Ù?ØØ±Ù? Ø¨ØØ« Ø¢Ø®Ø± Ù?ØªÙ?Ù?Ù?Ø° Ø¹Ù?Ù?Ù?Ø© Ø§Ù?Ø¨ØØ« Ù?Ø°Ù?Ø?
-torbutton.popup.captcha.always = Ù?Ù? Ø¯Ø§Ø¦Ù?Ø§Ù? Ø¨Ù?Ø°Ù? Ø§Ù?Ø¹Ù?Ù?Ù?Ø© Ù?Ù? Ø§Ù?Ø¢Ù? Ù?ØµØ§Ø¹Ø¯Ø§Ù?
-torbutton.popup.redirect = Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?ØªÙ?Ø¬Ù?Ù?
-torbutton.popup.no_redirect = Ù?Ø§ ØªÙ?Ù? Ø¨Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?ØªÙ?Ø¬Ù?Ù?
 torbutton.popup.prompted_language = ØØªÙ? Ù?Ù?Ù?ØÙ? Ø²Ø± ØªÙ?Ø± Ù?Ø²Ù?Ø¯Ø§Ù? Ù?Ù? Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©Ø? Ù?Ø³ØªØ·Ù?Ø¹ Ø²Ø± ØªÙ?Ø± Ø·Ù?Ø¨ Ø§Ù?Ù?Ø³Ø® Ø§Ù?Ø¥Ù?Ø¬Ù?Ù?Ø²Ù?Ø© Ù?Ù? ØµÙ?ØØ§Øª Ø§Ù?Ø§Ù?ØªØ±Ù?Øª. Ù?Ù?Ø¯ Ù?Ù?ØªØ¬ Ø¹Ù? Ø°Ù?Ù? Ø¹Ø±Ø¶ Ø§Ù?ØµÙ?ØØ§Øª Ø§Ù?ØªÙ? ØªÙ?Ø¶Ù? Ù?Ø±Ø§Ø¡ØªÙ?Ø§ Ø¨Ù?ØºØªÙ? Ø§Ù?Ø£Ù? Ø¨Ø§Ù?Ù?ØºØ© Ø§Ù?Ø¥Ù?Ø¬Ù?Ù?Ø²Ù?Ø©.\n\nÙ?Ù? ØªØ±Ù?Ø¯ Ø·Ù?Ø¨ ØµÙ?ØØ§Øª Ø§Ù?Ù?Ø¨ Ø¨Ø§Ù?Ù?ØºØ© Ø§Ù?Ø¥Ù?Ø¬Ù?Ù?Ø²Ù?Ø© Ù?Ø®ØµÙ?ØµÙ?Ø© Ø§Ù?Ø¶Ù?Ø?
 torbutton.popup.no_newnym = Ù?Ø§ Ù?Ù?Ù?Ù? Ù?Ø²Ø± ØªÙ?Ø± Ø£Ù? Ù?Ø¹Ø·Ù?Ù? Ù?Ù?Ù?Ø© Ø¬Ø¯Ù?Ø¯Ø© Ø¨Ø´Ù?Ù? Ø¢Ù?Ù?Ø? Ù?Ù?Ø°Ø§ Ù?Ø§Ù? Ø²Ø± ØªÙ?Ø± Ù?Ø§ Ù?Ø³ØªØ·Ù?Ø¹ Ø§Ù?Ù?ØµÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ø° Ø§Ù?ØªØÙ?Ù? Ø§Ù?Ø®Ø§Øµ Ø¨ØªÙ?Ø±.\n\nÙ?Ù? ØªØ³ØªØ®Ø¯Ù? ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø± ØØ§Ù?Ù?Ø§Ù?Ø?
-torbutton.popup.use_tbb = Ù?Ø¨Ø¯Ù? Ø£Ù?Ù? ØªØ³ØªØ®Ø¯Ù? Ø²Ø± ØªÙ?Ø± Ù?Ø¹ Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³Ø? Ù?Ù?Ø§ Ù?Ù?ØµÙ? Ø¨Ù?Ø°Ø§ Ø§Ù?ØªÙ?Ù?Ù?Ù? Ù?Ø£Ù?Ù? Ù?Ù? Ù?Ø¹Ø¯ Ø¢Ù?Ù?Ø§.\n\nÙ?Ù?Ø¨Ø¯Ù?Ù?Ø? Ù?Ù?ØµØÙ? Ø¨ØªØÙ?Ù?Ù? ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø± Ø¹Ù? Ø·Ø±Ù?Ù? Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù? gettor@xxxxxxxxxxxxxx Ø£Ù? Ø¨ØªØÙ?Ù?Ù?Ù?Ø§ Ù?Ù? Ø§Ù?Ø¹Ù?Ù?Ø§Ù? Ø§Ù?ØªØ§Ù?Ù?:
 torbutton.popup.pref_error = Ù?Ø§ Ù?Ù?Ù?Ù? Ù?Ø²Ø± ØªÙ?Ø± ØªØØ¯Ù?Ø« Ø§Ù?ØªÙ?Ø¶Ù?Ù?Ø§Øª Ù?Ù? Ù?Ø¬Ù?Ø¯ Ù?ØªØµÙ?Ø ØªÙ?Ø±.
 torbutton.popup.permission_denied = Ù?Ø±Ø¬Ù? Ø£Ù? ØªÙ?Ù?Ù? Ø¨ØªØºÙ?Ù?Ø± Ø§Ù?ØµÙ?Ø§ØÙ?Ø§Øª Ù?Ù?Ø¬Ù?Ø¯ Ù?ØªØµÙ?Ø ØªÙ?Ø± Ø£Ù? Ù?Ù? Ø¨Ù?Ù?Ù?Ù? Ø¥Ù?Ù? Ù?Ù?Ø§Ù? Ø¢Ø®Ø±.
 torbutton.popup.device_full = Ù?Ø¨Ø¯Ù? Ø£Ù? Ø§Ù?Ù?Ø±Øµ Ø§Ù?ØµÙ?Ø¨ Ù?Ù?ØªÙ?Ø¦. Ù?Ø±Ø¬Ù? ØªÙ?Ø±Ù?Øº Ù?Ø³Ø§ØØ© Ø£Ù?Ø«Ø± Ø£Ù? Ù?Ù? Ø¨Ù?Ù?Ù? Ù?ØªØµÙ?Ø ØªÙ?Ø± Ø¥Ù?Ù? Ù?ØØ¯Ø© ØªØ®Ø²Ù?Ù? Ø£Ø®Ø±Ù?.
diff --git a/src/chrome/locale/arn/torbutton.properties b/src/chrome/locale/arn/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/arn/torbutton.properties
+++ b/src/chrome/locale/arn/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ast/torbutton.properties b/src/chrome/locale/ast/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ast/torbutton.properties
+++ b/src/chrome/locale/ast/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/az/torbutton.properties b/src/chrome/locale/az/torbutton.properties
index a51a9d5..06ffc8a 100644
--- a/src/chrome/locale/az/torbutton.properties
+++ b/src/chrome/locale/az/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Toru yandÄ±r
-torbutton.button.tooltip.enabled = Toru sÃ¶ndÃ¼r
 torbutton.panel.tooltip.disabled = Toru yandÄ±rmaq Ã¼Ã§Ã¼n kliklÉ?
 torbutton.panel.tooltip.enabled = Toru sÃ¶ndÃ¼rmÉ?k Ã¼Ã§Ã¼n kliklÉ?
-torbutton.panel.plugins.disabled = QoÅ?malarÄ± yandÄ±rmaq Ã¼Ã§Ã¼n kliklÉ?
-torbutton.panel.plugins.enabled = QoÅ?malarÄ± sÃ¶ndÃ¼rmÉ?k Ã¼Ã§Ã¼n kliklÉ?
 torbutton.panel.label.disabled = Tor sÃ¶nÃ¼lÃ¼dÃ¼r
 torbutton.panel.label.enabled = Tor yanÄ±lÄ±dÄ±r
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = TordÃ¼ymÉ?si mÃ¼xtÉ?lif Tor bÃ¶lmÉ?lÉ?rinÉ? yÃ¼klÉ?n cÉ?dvÉ?l aktivliynÉ? qadaÄ?a qoyur.\n\nBu Firefox Bugs 409737 vÉ? 417869 É?trafÄ±nda iÅ?lÉ?yir.\n\nÆ?gÉ?r atlanan pÉ?ncÉ?rÉ? heÃ§ bir sÉ?bÉ?bÉ? olmadan baÅ? verirsÉ?, demÉ?li sizin cÉ?dvÉ?llÉ?rdÉ?n biri Ã¶zÃ¼nÃ¼ arxa planda yenidÉ?n yÃ¼klÉ?mÉ?yÉ? cÉ?hd edir vÉ? buna qadaÄ?a qoyulub.\n\nTor bÃ¶lmÉ?sindÉ? cÉ?dvÉ?li yenilÉ?mÉ?k Ã¼Ã§Ã¼n URL qutusunda yerlÉ?Å?É?n "enter" dÃ¼ymÉ?sini basÄ±n.\n\n
-torbutton.popup.plugin.warning = TordÃ¼ymÉ?si Tor qoÅ?malarÄ±nÄ±n birbaÅ?a yÃ¼klÉ?nmÉ?sinin qarÅ?Ä±sÄ±nÄ± alÄ±r.\n\nSave-As -in yerinÉ? istifadÉ? et.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Qeydi: GÃ¶rÃ¼nÃ¼r sizin Sertifikat HÃ¼ququnuz yoxdur. Sertifikat HÃ¼ququnu yoxlamaq yavaÅ? É?mÉ?liyyatdÄ±r vÉ? Tor pÉ?ncÉ?rÉ?lÉ?rinin baÄ?lanmasÄ±nÄ± zÉ?iflÉ?dir. Siz Sertifikat HÃ¼ququnu sertifikatlardan tÉ?crid etmÉ?k istÉ?yÉ?rdiniz? (Æ?gÉ?r bunu baÅ?adÃ¼Å?mÃ¼rsÃ¼nÃ¼zsÉ?, onda tÉ?hlÃ¼kÉ?sizlik Ã¼Ã§Ã¼n Ok kliklÉ?yin)\n
-torbutton.popup.ff3.warning = XÉ?bÉ?rdarlÄ±q!\n\nTordÃ¼ymÉ?si Firefox 3 - dÉ? saat qurÅ?aÄ?Ä±nÄ±zÄ± vÉ? livemarks- Ä±nÄ±zÄ± Tor ilÉ? bildirir.\n\nHÉ?r halda davam etmÉ?k istÉ?yirsiniz?
-torbutton.popup.toggle.warning = QurÄ?unuzdan effekt gÃ¶tÃ¼rmÉ?k Ã¼Ã§Ã¼n siz Tor baÄ?lanan pÉ?ncÉ?rÉ?ni yada yenidÉ?n dÃ¼ymÉ?sini basmalÄ±sÄ±nÄ±z.
 torbutton.popup.test.success = Tor proksi testi mÃ¼vÉ?ffÉ?qiyyÉ?tlidir!
 torbutton.popup.test.failure = Tor proksi testi sÉ?hvdir! Proksinizi vÉ? Polipo qurÄ?unuzu yoxlayÄ±n.
 torbutton.popup.test.confirm_toggle = Tor proksi testi Tordan istifadÉ?yÉ? mÃ¼vÉ?ffÉ?q olmadÄ±.\n\nSiz hÉ?r halda imkan vermÉ?k istÉ?yirsiniz?\n\nQeyd: Æ?gÉ?r siz problemi meÉ?yyÉ?nlÉ?Å?dirmiÅ?sinizsÉ?, bu xÉ?bÉ?rdarlÄ±Ä?Ä± lÉ?Ä?v etmÉ?k Ã¼Ã§Ã¼n TordÃ¼ymÉ?si Proksi Ã?stÃ¼nlÃ¼klÉ?ri pÉ?ncÉ?rÉ?sindÉ? testi tÉ?krar iÅ?É? sala bilÉ?rsiniz.
 torbutton.popup.test.ff3_notice = Tor proksi qurÄ?ularÄ±nÄ± test etmÉ?k Ã¼Ã§Ã¼n Ok kliklÉ?. Bu test arxaplanda baÅ? verÉ?cÉ?k. EhtiyatlÄ± olun.
-torbutton.panel.label.verified = Tor yoxlanÄ±lÄ±b
-torbutton.popup.test.auto_failed = Avtomatik olaraq Tor proksi testi Tordan istifadÉ?yÉ? mÃ¼vÉ?ffÉ?q olmadÄ±.\n\nSiz hÉ?r halda imkan vermÉ?k istÉ?yirsiniz?
-torbutton.prefs.recommended = (mÉ?slÉ?hÉ?t gÃ¶rÃ¼lÉ?n)
-torbutton.prefs.optional = ( mÉ?cburi olmayan)
-torbutton.prefs.crucial =  (hÉ?lledici)
 torbutton.popup.external.title = Xarici mÉ?zmun yÃ¼klÉ?nsin?
 torbutton.popup.external.app = Ä°darÉ? etmÉ?k Ã¼Ã§Ã¼n xarici tÉ?tbiqÉ? ehtiyac duyulur:\n\n
 torbutton.popup.external.note = \n\nQEYD: Xarici tÉ?tbiqlÉ?r Tor Ã¼Ã§Ã¼n uyÄ?un olmaya bilÉ?r vÉ? bu sizi ifÅ?a edÉ? bilÉ?r!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = BuraxÄ±lÄ±Å? É?rizÉ?si
 torbutton.popup.cancel = LÉ?Ä?v et
 torbutton.popup.dontask = Bundan sonra É?rizÉ?lÉ?ri iÅ?É? salÄ±n
 torbutton.popup.test.no_http_proxy = Tor proksi testi: Yerli HTTP Proksisi É?lÃ§É?tmazdÄ±r. Polipo uyÄ?un Å?É?kildÉ? davam edir?
-torbutton.popup.captcha.title = Google Captchas-dÉ?n boyun qaÃ§rÄ±lsÄ±n?
-torbutton.popup.captcha.ask = TordÃ¼ymÉ?si Google Captcha-nÄ± aÅ?kar etdi. Siz bu sualÄ± baÅ?qa axtarÄ± sisteminÉ? gÃ¶ndÉ?rmÉ?k istÉ?rdinizmi?
-torbutton.popup.captcha.always = Bundan sonra bu fÉ?aliyyÉ?ti hÉ?miÅ?É? yerinÉ? yetir
-torbutton.popup.redirect = Ã?nvanÄ± dÉ?yiÅ?mÉ?k
-torbutton.popup.no_redirect = Ã?nvanÄ± dÉ?yiÅ?mÉ?
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/be/torbutton.properties b/src/chrome/locale/be/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/be/torbutton.properties
+++ b/src/chrome/locale/be/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index 2e95e98..3c69881 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Ð?Ñ?ÐºÐ°Ð·
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index 54523bd..ff02845 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹
-torbutton.button.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?á??á?¹á??á??á?¹á??á??á?¹
 torbutton.panel.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á?¯á?á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
 torbutton.panel.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.plugins.disabled = Plugins á??á?ºá?¬á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.plugins.enabled = Plugins á??á?ºá?¬á?¸ á??á?á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
 torbutton.panel.label.disabled = Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¯á?á??á?¹á??á?«
 torbutton.panel.label.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á?«á??á??á?¹á??
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy á??á?¯á? Firefox á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á??á?° á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á??á?¹/ á??á?»á??á?³á??á??á?¹ Torbutton á??á?½ á??á??á?¯á??á?¹á??á??á?¹á??á?¯á??á?¯á? á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?«á??á??á?¹
-torbutton.popup.history.warning = á?¡á?»á??á?¬á?¸ Tor state á??á?½ loading á??á??á?¹á?±á??á?±á??á?¬ á?¡á??á?¬á??á?ºá?¬á?¸á?¡á?¬á?¸ Torbutton á??á?½ á??á?á??á?¹á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\n\nFirefox Bugs 409737 á??á?½á??á?¹á?· 417869 á??á?¼á??á?¹á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?«á??á??á?¹á??\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = plugin á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?¯á? Tor á??á?½ á??á?¯á?á??á?¹á??á?¯á?á??á?¹ á??á??á?¹á??á?°á?»á??á??á?¹á?¸á??á?¯á? Torbutton á??á?½ á??á?á??á?¹á??á??á?¹á??á?«á??á??á?¹á?? \n\nSave-As á??á?á?¯ á?¡á??á?¬á?¸á??á?¯á?á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á?? \n\n
-torbutton.popup.confirm_ca_certs = Torbutton á??á?½á??á?¹á??á?ºá??á?¹: á??á??á?¹á?·á?¡á??á?¼á??á?¹  á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ Certificate Authorities á??á?±á??á?¬á?¹á?»á??á??á?¬á?¸á??á?«á?? Certificate Authority á??á?¬á??á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸á??á??á?¹ Tor á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?á?¯ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?á??á?¹á?»á??á?®á?¸ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?¬á??á?¼á??á?¹ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?á??á?¹á??á?«á??á??á?¹á?? Certificate Authority certificates á??á?ºá?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸á??á?¬á?¸á??á?½á?á?»á??á??á?¹á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?á?¯á??á?«á??á??á?¬á?¸ ? (á??á??á?¹ á??á?¯á?á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?¯á? á??á?¬á?¸á??á??á?¹á?»á??á??á?¹á?¸ á??á??á?½á?á??á?«á??á?½á?ºá??á?¹ OK á??á?¯á? á??á??á??á?¹á??á?½á?á??á?¹á?»á??á??á?¹á?¸á?»á??á??á?¹á?· á??á?¶á?¯á?»á??á?¶á?³á??á?á??á?¹á??á?ºá??á?¯á?á??á?¹á??á?«á??á??á?¹)
-torbutton.popup.ff3.warning = á??á??á?á?±á??á?¸á??á?ºá??á?¹!\n\ná??á??á?¹á?? á?¡á??á?ºá?á??á?¹á?±á??á??á??á?¯á??á?¹á??á?½á??á?¹á?· livemarks á??á?ºá?¬á?¸ á?±á??á?«á??á?¹á?¾á??á?¬á?¸á?»á??á??á?¹á?¸á??á?á?¯ Firefox 3 á??á?¼á??á?¹ Torbutton á??á??á?¹ Tor á??á?½á??á??á??á?¹á?· á?»á??á??á?¹á?±á??á??á?±á??á??á?¯á?á??á?¹á??á?«á??á??á?¹á?? \n\ná??á??á?¹á??á?¯á?á??á??á??á?¹á?»á??á??á?¹á?±á?? á?±á??á?½á??á??á?á?¯á?? á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹ á??á?¯á?á??á?«á??á??á?¬á?¸ ?
-torbutton.popup.toggle.warning = á??á?ºá?á??á?á??á??á??á??á?ºá?¬á?¸ á?¡á??á?ºá?á?³á?¸á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?½á?á?±á??á??á??á?¹ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á??á?¹á?· á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹ á??á?á?¯á??á??á??á?¯á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á??á?¹ á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹
 torbutton.popup.test.success = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹ !
 torbutton.popup.test.failure = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« ! á??á??á?¹á?? proxy á??á?½á??á?¹á?· Privoxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?á?¯ á??á??á?¹á?±á??á?¸á??á?«á??
 torbutton.popup.test.confirm_toggle = á?±á??á?¬á??á?¹á??á?¶á?¯á?¸á??á??á?¹á?¸á??á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy Test á??á?½ Tor á??á?á?¯á??á??á??á??á?¹á??á?á?¯á??á?¹á??á?«á?? \n\nTor á??á?á?¯ enable á??á?¯á??á?¹á??á??á?¹á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸á??\n\ná??á??á?á?»á??á?³á??á??á?¹-á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?ºá?¬á?¸á??á?á?¯á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á??á?? Torbutton Proxy Preferences window á??á?½ á?¤á??á??á?á?±á??á?¸á??á?ºá??á?¹á??á?á?¯ á??á?á??á?¹á??á??á?¹á??á?á?¯á?¹á??á?¹á??á?«á??á??á?¹á??
 torbutton.popup.test.ff3_notice = Tor proxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?¯á? á??á??á?¹á?¸á??á??á?¹á??á??á?¹ OK á??á?¯á? á??á??á??á?¹á??á?½á?á??á?¹á??á?«á?? á??á??á?¹á?¸á??á??á?¹á??á??á??á??á?¹ á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?¸á??á?¶á?±á??á?¬á??á?¹á?·á??á?¯á?á??á?¹á?¸á?±á??á?¸á??á?«á??á??á?¹á??
-torbutton.panel.label.verified = Tor á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?¡á??á??á?¹á?»á??á?³á??á?«á??á??á?¹
-torbutton.popup.test.auto_failed = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ á?¡á??á?á?¯á?¡á?±á??á?ºá?¬á??á?¹ Tor proxy á??á??á?¹á?±á??á?¸á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á?? \n\ná??á??á?¹á??á?á?¯á??á??á??á?¹á?»á??á??á?¹á?±á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸ ?
-torbutton.prefs.recommended = (á?¡á?¾á??á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)
-torbutton.prefs.optional = (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?á??á?¹á??á?«á??á??á?¹)
-torbutton.prefs.crucial = (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,8 +15,3 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
diff --git a/src/chrome/locale/bn-IN/torbutton.properties b/src/chrome/locale/bn-IN/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/bn-IN/torbutton.properties
+++ b/src/chrome/locale/bn-IN/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/bn/torbutton.properties b/src/chrome/locale/bn/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/bn/torbutton.properties
+++ b/src/chrome/locale/bn/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/br/torbutton.properties b/src/chrome/locale/br/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/br/torbutton.properties
+++ b/src/chrome/locale/br/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/bs/torbutton.properties b/src/chrome/locale/bs/torbutton.properties
index 1783324..bcd8db7 100644
--- a/src/chrome/locale/bs/torbutton.properties
+++ b/src/chrome/locale/bs/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = OtkaÅ¾i
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 86dc10b..742fac5 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Activa Tor
-torbutton.button.tooltip.enabled = Desactiva Tor
 torbutton.panel.tooltip.disabled = Feu clic per a activar Tor
 torbutton.panel.tooltip.enabled = Feu clic per a desactivar Tor
-torbutton.panel.plugins.disabled = Feu clic per a activar els plugins
-torbutton.panel.plugins.enabled = Feu clic per a desactivar els plugins
 torbutton.panel.label.disabled = Tor estÃ  desactivat
 torbutton.panel.label.enabled = Tor estÃ  activat
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton ha bloquejat l'activitat d'una pestanya que funcionava en un altre estat de Tor.\n\nAixÃ² Ã©s per a prevenir els errors de programaciÃ³ 409737 i 417869 de Firefox.\n\nSi aquesta finestra apareix sense motiu, alguna de les vostres pestanyes intenta s'intentava carregar automÃ ticament, i per tant, ha estat bloquejada.\n\nPer a recarregar aquesta pestanya en l'estat de Tor actiu, premeu "enter" a la direcciÃ³ URL de la barra de navegaciÃ³.\n\n
-torbutton.popup.plugin.warning = Torbutton ha bloquejat la cÃ rrega directa per Tor del contingut d'un plugin.\n\nUtilitzeu l'alternativa "anomena i desa...".\n\n
-torbutton.popup.confirm_ca_certs = Nota de Torbutton: no teniu Autoritats de Certificat personalitzades. Examinar la llista d'Autoritats de Certificat Ã©s una operaciÃ³ lenta i ralenteix l'activaciÃ³ de la xarxa Tor. Voleu desactivar l'aÃ¯llament dels certificats d'Autoritats de Certificat? (si no enteneu la pregunta, Ã©s segur prÃ©mer "d'acord")
-torbutton.popup.ff3.warning = Alerta!\n\nAmb Firefox 3, Torbutton perd la zona horÃ ria i les adreces de contingut dinÃ miques. Voleu continuar?
-torbutton.popup.toggle.warning = Heu de commutar Tor o bÃ© reiniciar per tal que s'apliquin les preferÃ¨ncies.
 torbutton.popup.test.success = Prova del proxy Tor realitzada amb Ã¨xit.
 torbutton.popup.test.failure = La prova del proxy Tor ha fallat. Reviseu les preferÃ¨ncies de Polipo i del vostre proxy.
 torbutton.popup.test.confirm_toggle = La prova mÃ©s recent del proxy Tor no s'ha pogut connectar a Tor.\n\nSegur que voleu activar-lo igualment?\n\nNota: si ja s'ha solucionat el problema, podeu repetir la prova a la finestra de PreferÃ¨ncies de Proxy Torbutton per a eleminar aquest avÃs.
 torbutton.popup.test.ff3_notice = Feu clic a "D'acord" per a provar les preferÃ¨ncies del proxy Tor. Aquesta prova es realitzarÃ  en segon terme. Tingueu paciÃ¨ncia.
-torbutton.panel.label.verified = Tor ha estat verificat.
-torbutton.popup.test.auto_failed = La prova automÃ tica del proxy Tor no s'ha pogut connectar a Tor.\n\nSegur que voleu activar-lo igualment?
-torbutton.prefs.recommended = (recomanat)
-torbutton.prefs.optional = (opcional)
-torbutton.prefs.crucial = (vital)
 torbutton.popup.external.title = Voleu carregar els continguts externs?
 torbutton.popup.external.app = Es necessita una aplicaciÃ³ externa per a manejar:\n\n
 torbutton.popup.external.note = \n\nAvÃs: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Inicia l'aplicaciÃ³
 torbutton.popup.cancel = CancelÂ·la
 torbutton.popup.dontask = Inicia les aplicacions automÃ ticament
 torbutton.popup.test.no_http_proxy = Prova de proxy Tor: no es pot assolir el Proxy HTTP local. Comproveu si Polipo funciona correctament.
-torbutton.popup.captcha.title = Voleu evitar els Captchas de Google?
-torbutton.popup.captcha.ask = Torbutton ha detectat un Captcha de Google. Voleu utilitzar un motor de cerca diferent, aquest cop?
-torbutton.popup.captcha.always = Realitza sempre aquesta acciÃ³
-torbutton.popup.redirect = Redirecciona
-torbutton.popup.no_redirect = No redireccionis
 torbutton.popup.prompted_language = Per donar-vos mÃ©s privacitat, Torbutton pot demanar la versiÃ³ en anglÃ¨s de les pÃ gines web. AixÃ² pot provocar que pÃ gines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglÃ¨s.\n\nDesitjeu demanar les pÃ gines web en anglÃ¨s per una major privacitat?
 torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accÃ©s al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
-torbutton.popup.use_tbb = Sembla que esteu usant Torbutton amb Firefox, el qual ja no Ã©s una configuraciÃ³ segura recomanada.\n\nAl seu lloc, recomanem que obtingueu l'Ãºltim Tor Browser Bundle enviant un email a gettor@xxxxxxxxxxxxxx o bÃ© descarregant-lo de l'adreÃ§a segÃ¼ent:
 torbutton.popup.pref_error = Torbutton no pot actualitzar les preferÃ¨ncies al directori de perfil del Tor Browser.
 torbutton.popup.permission_denied = Siusplau, o bÃ© re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicaciÃ³.
 torbutton.popup.device_full = Sembla que el disc Ã©s ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu.
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index 08e474a..819dea7 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Povolit Tor
-torbutton.button.tooltip.enabled = ZakÃ¡zat Tor
 torbutton.panel.tooltip.disabled = Klikni pro povolenÃ Tor
 torbutton.panel.tooltip.enabled = Klikni pro zakÃ¡zÃ¡nÃ Tor
-torbutton.panel.plugins.disabled = KliknÄ?te pro povolenÃ pluginÅ¯
-torbutton.panel.plugins.enabled = KliknÄ?te k zakÃ¡zÃ¡nÃ pluginÅ¯
 torbutton.panel.label.disabled = Tor Zapnut
 torbutton.panel.label.enabled = Tor Vypnut
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton zablokoval aktivitu ze zÃ¡loÅ¾ky nahranÃ© v jinÃ©m stavu Tor\n\nTÃm obeÅ¡el Firefox chyby 409737 a 417869\n\nPokud se toto vyskakovacÃ okno zapnulo bezdÅ¯vodnÄ?, jedna z vaÅ¡ich zÃ¡loÅ¾ek se snaÅ¾Ã znovunaÄ?Ãst v pozadÃ a tato akce byla zablokovÃ¡na.\n\nPro nahrÃ¡nÃ zÃ¡loÅ¾ky v tomto Tor stavu kliknÄ?te do adresÃ¡Å?e a stisknÄ?te Enter\n
-torbutton.popup.plugin.warning = Torbutton zablokoval pÅ?ÃmÃ© naÄ?tenÃ obsahu plugin\n\nZkuste pouÅ¾Ãt UloÅ¾it jako\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = VarovÃ¡nÃ!\n\nTorbutton ve Firefox 3 obÄ?as vypouÅ¡tÃ VaÅ¡i Ä?asovou zÃ³nu a pozici pÅ?es Tor.\n\nPÅ?ejete si pÅ?esto pokraÄ?ovat?
-torbutton.popup.toggle.warning = MusÃte pÅ?epnout Tor anebo restartovat, aby VÃ¡mi provedenÃ© zmÄ?ny pÅ?eÅ¡ly v platnost.
 torbutton.popup.test.success = Test Tor proxy byl ÃºspÄ?Å¡nÃ½!
 torbutton.popup.test.failure = Test Tor proxy SELHAL! Zkontrolujte svÃ© nastavenÃ proxy a Polipo.
 torbutton.popup.test.confirm_toggle = PoslednÃmu proxy testu se nepodaÅ?ilo pouÅ¾Ãt Tor.\n\nChcete ho pÅ?esto zapnout?\n\nPoznÃ¡mka: Pokud jste problÃ©m opravili, mÅ¯Å¾ete znovu rozbÄ?hnout test v oknÄ? NastavenÃ Torbutton Proxy; pokud bude ÃºspÄ?Å¡nÃ½, tato zprÃ¡va se jiÅ¾ nebude zobrazovat.
 torbutton.popup.test.ff3_notice = KliknÄ?te OK k otestovÃ¡nÃ Tor proxy nastavenÃ. Tento test probÄ?hne na pozadÃ. ProsÃme o strpenÃ.
-torbutton.panel.label.verified = Tor ovÄ?Å?en
-torbutton.popup.test.auto_failed = AutomatickÃ½ Tor proxy test nemohl pouÅ¾Ãt Tor.\n\nChcete ho pÅ?esto zapnout?
-torbutton.prefs.recommended = (doporuÄ?eno)
-torbutton.prefs.optional = (volitelnÃ©)
-torbutton.prefs.crucial = (dÅ¯leÅ¾itÃ©)
 torbutton.popup.external.title = NaÄ?Ãst vnÄ?jÅ¡Ã obsah?
 torbutton.popup.external.app = Je potÅ?eba vnÄ?jÅ¡Ã aplikace k jednÃ¡nÃ s: \n
 torbutton.popup.external.note = \nPOZNÃ?MKA: VnÄ?jÅ¡Ã aplikace NEJSOU Torem zabezpeÄ?enÃ© a mohou odkrÃ½t VaÅ¡e informace!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Spustit aplikaci
 torbutton.popup.cancel = ZruÅ¡it
 torbutton.popup.dontask = OdteÄ? vÅ¾dy spouÅ¡tÄ?t aplikace
 torbutton.popup.test.no_http_proxy = Tor proxy test: MÃstnÃ HTTP proxy je nedosaÅ¾itelnÃ¡. Funguje Polipo sprÃ¡vnÄ??
-torbutton.popup.captcha.title = VyhÃ½bat se Google Captchas?
-torbutton.popup.captcha.ask = Torbutton odhalil Google Captcha. ChtÄ?li byste tento termÃn vyhledat na jinÃ© strÃ¡nce?
-torbutton.popup.captcha.always = OdteÄ? vÅ¾dy provÃ¡dÄ?t tuto akci
-torbutton.popup.redirect = PÅ?esmÄ?rovat
-torbutton.popup.no_redirect = NepÅ?esmÄ?rovat
 torbutton.popup.prompted_language = K poskytnutÃ vÄ?tÅ¡Ãho soukromÃ, Torbutton mÅ¯Å¾e poÅ¾adovat anglickou verzi internetovÃ½ch strÃ¡nek. StrÃ¡nky kterÃ© chcete Ä?Ãst ve svÃ©m jazyce se mohou zobrazit namÃsto toho v angliÄ?tinÄ?.\n\nChtÄ?li byste poÅ¾adovat anglicky psanÃ© strÃ¡nky pro vÄ?tÅ¡Ã soukromÃ?
 torbutton.popup.no_newnym = Torbutton nemÅ¯Å¾e bezpeÄ?nÄ? poskytnout novou identitu. NemÃ¡ pÅ?Ãstup k pÅ?ÃstupovÃ©mu portu Tor.\n\nMÃ¡te spuÅ¡tÄ?n Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/csb/torbutton.properties b/src/chrome/locale/csb/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/csb/torbutton.properties
+++ b/src/chrome/locale/csb/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/cy/torbutton.properties b/src/chrome/locale/cy/torbutton.properties
index 252724b..6d43ba5 100644
--- a/src/chrome/locale/cy/torbutton.properties
+++ b/src/chrome/locale/cy/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Galluogi Tor
-torbutton.button.tooltip.enabled = Analluoga Tor
 torbutton.panel.tooltip.disabled = Cliciwch i alluogi Tor
 torbutton.panel.tooltip.enabled = Cliciwch i analluogu Tor
-torbutton.panel.plugins.disabled = Cliciwch i alluogi plugins
-torbutton.panel.plugins.enabled = Cliciwch i analluogi plugins
 torbutton.panel.label.disabled = Tor Anabl
 torbutton.panel.label.enabled = Tor Galluog
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Prawf procsi Tor llwyddiannus!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (argymhellwyd)
-torbutton.prefs.optional = (dewisol)
-torbutton.prefs.crucial = (hanfodol)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Canslo
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 55213cd..166d346 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Aktiver Tor
-torbutton.button.tooltip.enabled = Deaktiver Tor
 torbutton.panel.tooltip.disabled = Klik for at aktivere Tor
 torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
-torbutton.panel.plugins.disabled = Klik for at aktivere plugins
-torbutton.panel.plugins.enabled = Klik for at deaktivere plugins
 torbutton.panel.label.disabled = Tor Deaktiveret
 torbutton.panel.label.enabled = Tor Aktiveret
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data.
-torbutton.popup.history.warning = Torbutton blokerede aktivitet fra en fane indlÃ¦st i en anden Tor-tilstand.\n\nDette sker for at omgÃ¥ Firefox-fejlene 409737 og 417869.\n\nHvis denne pop-op synes at ske uden grund, sÃ¥ forsÃ¸ger Ã©n af dine faner\nat genindlÃ¦se sig selv i baggrunden, og dette blev blokeret.\n\nFor at genindlÃ¦se fanen i denne Tor-tilstand, sÃ¥ tast 'Retur' URL-adressen.\n\n
-torbutton.popup.plugin.warning = Torbutton blokerede for direkte indlÃ¦sning af Tor plugin indhold.\n\nBrug 'Gem som' i stedet.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton BemÃ¦rkning: Det ser ud til du ikke har nogen brugerdefinerede nÃ¸glecentre. Analysen af den globale godkendelsesmyndighedsliste er langsom og slÃ¸ver skift Tor status. Vil du deaktiverer isolationen af nÃ¸glecentre certifikater? (Hvis du ikke forstÃ¥r dette, er det sikkert at trykke OK)
-torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton er pÃ¥ Firefox kendt for at lÃ¦kke informationer om din tidszone og livemarks via Tor.\n\nÃ?nsker du at fortsÃ¦tte alligevel?
-torbutton.popup.toggle.warning = Du skal Ã¦ndre Tor status eller genstarte for at dine Ã¦ndringer trÃ¦der i kraft.
 torbutton.popup.test.success = Tor proxy test lykkedes!
 torbutton.popup.test.failure = Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger.
 torbutton.popup.test.confirm_toggle = Den seneste Tor-proxy-test mislykkedes i brug af Tor.\n\nEr du sikker pÃ¥ at du vil aktivere alligevel?\n\nBemÃ¦rk: Hvis du har rettet dette problem, sÃ¥ kan du igen kÃ¸re testen i\nindstillinger for Torbutton Proxy-vinduet for at fjerne denne advarsel.
 torbutton.popup.test.ff3_notice = Klik pÃ¥ OK for at teste Tor proxyindstillinger. Denne test vil kÃ¸re i baggrunden. VÃ¦r venligst tÃ¥lmodig.
-torbutton.panel.label.verified = Tor Verificeret
-torbutton.popup.test.auto_failed = Det mislykkedes den automatiske Tor proxy test at benytte Tor.\n\nEr du sikker pÃ¥ du vil aktivere alligevel?
-torbutton.prefs.recommended = (anbefalet)
-torbutton.prefs.optional = (valgfri)
-torbutton.prefs.crucial = (afgÃ¸rende)
 torbutton.popup.external.title = IndlÃ¦s eksternt indhold?
 torbutton.popup.external.app = Et ekstern program krÃ¦ves for at hÃ¥ndtere:\n\n
 torbutton.popup.external.note = \n\nBEMÃ?RK: Eksterne programmer er IKKE Tor-sikre som standard og kan demaskere dig!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Start program
 torbutton.popup.cancel = AnnullÃ©r
 torbutton.popup.dontask = Start altid programmer fremover
 torbutton.popup.test.no_http_proxy = Tor-proxy-test: Lokal HTTP-proxy kan ikke nÃ¥s. KÃ¸rer Polipo korrekt?
-torbutton.popup.captcha.title = UndgÃ¥ Google Captchas?
-torbutton.popup.captcha.ask = Torbutton registrerede en Google Captcha. Ã?nsker du at blive videredirigeret til en anden sÃ¸gemaskine for denne forespÃ¸rgsel?
-torbutton.popup.captcha.always = UdfÃ¸r altid denne handling fremover
-torbutton.popup.redirect = VideredirigÃ©r
-torbutton.popup.no_redirect = Undlad at videredirigere
 torbutton.popup.prompted_language = For at yde stÃ¸rre privatliv, sÃ¥ kan Torbutton forespÃ¸rge den engelsk sprogversion af websiderne. Dette kan betyde at websider som du foretrÃ¦kker at lÃ¦se pÃ¥ dit modersmÃ¥l vises pÃ¥ engelsk i stedet for.\n\nVil du gerne forespÃ¸rge engelske websider for Ã¸get privatliv?
 torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKÃ¸rer du Tor Browser-bundet?
-torbutton.popup.use_tbb = Det ser ud til at du bruger Torbutton med Firefox, hvilket ikke lÃ¦ngere kan anbefales som en sikker konfiguration.\n\nI stedet anbefaler vi at du skaffer de seneste Tor Browser-bundt ved at sende e-post til gettor@xxxxxxxxxxxxxx eller henter den pÃ¥ fÃ¸lgende URL: 
 torbutton.popup.pref_error = Torbutton kan ikke opdatere prÃ¦ferencer i profil-kataloget for Tor Browser.
 torbutton.popup.permission_denied = Nulstil venligst rettighederne for Tor Browser-kataloget eller kopiÃ©r det til en ny placering.
 torbutton.popup.device_full = Disken ser ud til at vÃ¦re fuld. FrigÃ¸r venligst plads eller flyt Tor Browser til en ny enhed.
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 3e0623b..57222a7 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Tor aktivieren
-torbutton.button.tooltip.enabled = Tor deaktivieren
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP ist unbekannt
 torbutton.circuit_display.onion_site = Onion-Seite
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Unbekanntes Land
 torbutton.content_sizer.margin_tooltip = Tor Browser fÃ¼gt diese Begrenzung hinzu, um die Breite und HÃ¶he Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen.
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
-torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren
-torbutton.panel.plugins.enabled = Klicken, um die Erweiterungen zu deaktivieren
 torbutton.panel.label.disabled = Tor ist deaktiviert
 torbutton.panel.label.enabled = Tor ist aktiviert
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton gibt ihnen die MÃ¶glichkeit, Einstellungen von Tor schnell und einfach zu verÃ¤ndern und einfach die Internetdaten zu lÃ¶schen.
-torbutton.popup.history.warning = Torbutton hat AktivitÃ¤ten in einem Reiter blockiert, welcher in einem anderen Tor-Status geladen wurde.\n\nDas ist nÃ¶tig, um die Firefox-Fehler 409737 und 417869 zu umgehen.\n\nSollte dieses PopUp augenscheinlich grundlos auftauchen, so versucht gerade, einer Ihrer Reiter, sich im Hintergrund neu zu laden, und wurde deshalb blockiert.\n\nUm den Reiter in diesem Tor-Status neu zu laden, drÃ¼cken Sie Â»EingabeÂ« im Adresseingabefeld.\n\n
-torbutton.popup.plugin.warning = Torbutton hat das direkte laden von Erweiterungsinhalten Ã¼ber Tor blockiert.\n\nStattdessen bitte Â»Speichern unterÂ« benutzen.\n\n
-torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene ZertifikatsautoritÃ¤ten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen ZertifikationsautoritÃ¤tenliste ist aufwÃ¤ndig und verlangsamt das schnelle An- und Abschalten von Tor. MÃ¶chten Sie die Isolation von ZertifikatsautoritÃ¤ten abschalten? (Wenn Sie nicht wissen, was gemeint ist, kÃ¶nnen Sie ruhig auf OK klicken).
-torbutton.popup.ff3.warning = Achtung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 Ihre Zeitzone und Livemarks Ã¼ber Tor mitteilt.\n\nWollen Sie trotzdem fortfahren?
-torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam.
 torbutton.popup.test.success = Test des Tor-Vermittlungsservers erfolgreich!
 torbutton.popup.test.failure = Test des Tor-Vermittlungsservers FEHLGESCHLAGEN! Bitte Ã¼berprÃ¼fen Sie Ihre Vermittlungsserver-(Proxy) und Polipo-Einstellungen.
 torbutton.popup.test.confirm_toggle = Der letzte Tor-Vermittlungsservertest konnte Tor nicht benutzen.\n\nSind Sie sicher, dass Sie diesen trotzdem aktivieren mÃ¶chten?\n\nAnmerkung: Falls Sie das Problem gelÃ¶st haben, kÃ¶nnen Sie den Test im Einstellungsfenster vom Torbutton-Vermittlungsserver wiederholen, um diese Warnung zu lÃ¶schen.
 torbutton.popup.test.ff3_notice = Bitte OK klicken, um die Vermittlungsservereinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick.
-torbutton.panel.label.verified = Tor ist Ã¼berprÃ¼ft
-torbutton.popup.test.auto_failed = Der automatische Tor-Vermittlungsservertest ist fehlgeschlagen.\n\nSind Sie sicher, dass Sie ihn trotzdem aktivieren mÃ¶chten?
-torbutton.prefs.recommended = (empfohlen)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (kritisch)
 torbutton.popup.external.title = Einen externen Dateitypen herunterladen
 torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie mÃ¼ssen es mit einer anderen Anwendung Ã¶ffnen.\n\n
 torbutton.popup.external.note = Einige Dateitypen kÃ¶nnen Anwendungen dazu fÃ¼hren, dass sie sich mit dem Internet ohne Tor verbinden.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Datei herunterladen
 torbutton.popup.cancel = Abbrechen
 torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen
 torbutton.popup.test.no_http_proxy = Tor-Vermittlungsservertest: Lokaler HTTP-Vermittlungsserver ist unerreichbar. LÃ¤uft Polipo korrekt?
-torbutton.popup.captcha.title = Google-Captchas vermeiden?
-torbutton.popup.captcha.ask = Torbutton hat ein Google-Captcha festgestellt. MÃ¶chten Sie fÃ¼r Ihre Suchanfrage zu einer anderen Suchmaschine umgeleitet werden?
-torbutton.popup.captcha.always = Ab jetzt, immer diese Aktion durchfÃ¼hren
-torbutton.popup.redirect = Umleiten
-torbutton.popup.no_redirect = Nicht umleiten
 torbutton.popup.prompted_language = Um Ihre PrivatsphÃ¤re zu erhÃ¶hen, kann Torbutton die jeweilige englische Version einer Webseite anfordern. Dies kann zur Folge haben, dass Webseiten, die sie lieber in Ihrer Muttersprache lesen wÃ¼rden, nun in Englisch dargestellt werden. \n\nSollen nun - zur ErhÃ¶hung Ihrer PrivatsphÃ¤re - Webseiten in Englisch geladen werden?
 torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue IdentitÃ¤t geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket?
-torbutton.popup.use_tbb = Es scheint, als wÃ¼rden Sie Torbutton zusammen mit Firefox benutzen. Diese Kombination ist nicht lÃ¤nger eine empfohlene und sichere Konfiguration.\n\nAnstelle dieser Konfiguration, empfehlen wir Ihnen das neueste Tor-Browser-Paket zu benutzen, das Sie durch eine E-Mail an gettor@xxxxxxxxxxxxxx oder von der Herunterladeseite bekommen kÃ¶nnen:
 torbutton.popup.pref_error = Torbutton kann die Einstellungen von Tor-Browser im Profilordner nicht aktualisieren.
 torbutton.popup.permission_denied = Bitte entweder die Berechtigungen des Tor-Browser-Ordners zurÃ¼cksetzen, oder es an einen neuen Ort kopieren.
 torbutton.popup.device_full = Es scheint als wÃ¼rde das Medium voll sein. Bitte machen Sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues GerÃ¤t.
diff --git a/src/chrome/locale/dz/torbutton.properties b/src/chrome/locale/dz/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/dz/torbutton.properties
+++ b/src/chrome/locale/dz/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index 0491fdd..b8aab49 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Î?Î½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Î¿Ï? Tor
-torbutton.button.tooltip.enabled = Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Î¿Ï? Tor
 torbutton.panel.tooltip.disabled = Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î¿ Tor
 torbutton.panel.tooltip.enabled = Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î¿ Tor
-torbutton.panel.plugins.disabled = Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Ï?Ï?Î¸ÎµÏ?Ï?Î½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¹Ï?Î½
-torbutton.panel.plugins.enabled = Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Ï?Ï?Î¸ÎµÏ?Ï?Î½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¹Ï?Î½
 torbutton.panel.label.disabled = Î¤Î¿ Tor ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿
 torbutton.panel.label.enabled = Î¤Î¿ Tor ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Î¤Î¿ Torbutton Ï?Ï?Î¿Ï?Ï?ÎÏ?ÎµÎ¹ ÎÎ½Î± ÎºÎ¿Ï?Î¼Ï?Î¯ Î³Î¹Î± Ï?Î· Ï?Ï?Î¸Î¼Î¹Ï?Î· Ï?Ï?Î½ Ï?Î±Ï?Î±Î¼ÎÏ?Ï?Ï?Î½ Ï?Î¿Ï? Tor ÎºÎ±Î¹ Î³Î¹Î± Ï?Î· Î³Ï?Î®Î³Î¿Ï?Î· ÎºÎ±Î¹ ÎµÏ?ÎºÎ¿Î»Î· ÎµÎºÎºÎ±Î¸Î¬Ï?Î¹Ï?Î· Ï?Ï?Î½ Ï?Ï?Î¿Ï?Ï?Ï?Î¹ÎºÏ?Î½ Ï?Ï?Î¿Î¹Ï?ÎµÎ¯Ï?Î½ Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï?.
-torbutton.popup.history.warning = Î¤Î¿ Tor ÎµÎ¼Ï?Î¿Î´Î¯Î¶ÎµÎ¹ Ï?Î·Î½ Î´Ï?Î±Ï?Ï?Î·Ï?Î¹Ï?Ï?Î·Ï?Î± ÎºÎ¬Ï?Î¿Î¹Î¿Ï? tab Ï?Î¿Ï? Ï?Î¿Ï?Ï?Ï?Î¸Î·ÎºÎµ Ï?Îµ Î´Î¹Î±Ï?Î¿Ï?ÎµÏ?Î¹ÎºÎ® ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î· Tor.\n\nÎ?Ï?Ï?Ï? Î²Î¿Î·Î¸Î¬ Ï?Ï?Î·Î½ Î±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¹Ï?Î· Ï?Ï?Î½ Î£Ï?Î±Î»Î¼Î¬Ï?Ï?Î½ 409737 ÎºÎ±Î¹ 417869 Ï?Î¿Ï? Firefox.\n\nÎ?Î½ Î±Ï?Ï?Ï? Ï?Î¿ Î±Î½Î±Î´Ï?Ï?Î¼ÎµÎ½Î¿ Î¼Î®Î½Ï?Î¼Î± Ï?Î±Î¯Î½ÎµÏ?Î±Î¹ Î½Î± Î¼Î·Î½ ÎÏ?ÎµÎ¹ Î±Î¹Ï?Î¯Î±, ÎºÎ¬Ï?Î¿Î¹Î¿ Î±Ï?Ï? Ï?Î± tab Ï?Ï?Î¿Ï?Ï?Î±Î¸ÎµÎ¯ Î½Î± ÎµÏ?Î±Î½Î±Ï?Î¿Ï?Ï?Ï?Î¸ÎµÎ¯ Ï?Ï?Î¿ Ï?Î±Ï?Î±Ï?ÎºÎ®Î½Î¹Î¿ ÎºÎ±Î¹ ÎÏ?ÎµÎ¹ Ï?Ï?Î±Î³ÎµÎ¯.\n\nÎ?Î¹Î± Î½Î± ÎµÏ?Î±Î½Î±Ï?Î¿Ï?Ï?Ï?Î¸ÎµÎ¯ Ï?Î¿ tab Ï?Ï?Î·Î½ Ï?Ï?ÎÏ?Î¿Ï?Ï?Î± ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î· Ï?Î¿Ï? Tor, Ï?Î±Ï?Î®Ï?Ï?Îµ 'enter' Ï?Ï?Î¿ Ï?ÎµÎ´Î¯Î¿ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· URL.\n\n
-torbutton.popup.plugin.warning = Î¤Î¿ Torbutton Î¼Ï?Î»Î¿ÎºÎ¬Ï?Î¹Ï?Îµ Ï?Î·Î½ Î¬Î¼ÎµÏ?Î· Ï?Ï?Ï?Ï?Ï?Ï?Î· Î¼ÎÏ?Ï? Ï?ÎµÏ?Î¹ÎµÏ?Ï?Î¼ÎµÎ½Î¿Ï? Ï?Ï?Ï?Ï?Î¸ÎµÏ?Î·Ï? Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î±Ï?.\n\nÎ§Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?Ï?Îµ Ï?Î· Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î± Â«Î?Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î· Ï?Ï?Â» Î±Î½Ï?Î¯ Î³Î¹' Î±Ï?Ï?Ï?.\n\n
-torbutton.popup.confirm_ca_certs = Î£Î·Î¼ÎµÎ¯Ï?Ï?Î· Torbutton: Î¦Î±Î¯Î½ÎµÏ?Î±Î¹ Ï?Ï?Ï? Î´ÎµÎ½ Î´Î¹Î±Î¸ÎÏ?ÎµÏ?Îµ Ï?Ï?Î¿Ï?Î±Ï?Î¼Î¿Î¶Î¼ÎÎ½ÎµÏ? Î±Ï?Ï?ÎÏ? Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¯Î·Ï?Î·Ï? (CA) Î? ÎÎ»ÎµÎ³Ï?Î¿Ï? Ï?Î·Ï? Î»Î¯Ï?Ï?Î±Ï? Î±Ï?Ï?Ï?Î½ Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¯Î·Ï?Î·Ï? ÎµÎ¯Î½Î±Î¹ Ï?Ï?Î¿Î½Î¿Î²Ï?Ï?Î± Î´Î¹Î±Î´Î¹ÎºÎ±Ï?Î¯Î± ÎºÎ±Î¹ ÎºÎ±Î¸Ï?Ï?Ï?ÎµÏ?ÎµÎ¯ Ï?Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Ï?Î¿Ï? Tor. Î?ÎÎ»ÎµÏ?Îµ Î½Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¸ÎµÎ¯ Î· Î±Ï?Î¿Î¼Ï?Î½Î¿Ï?Î· Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¹Î·Ï?Î¹ÎºÏ?Î½ CA; (Î±Î½ Î´ÎµÎ½ ÎºÎ±Ï?Î±Î»Î±Î²Î±Î¯Î½ÎµÏ?Îµ Ï?Î¿ Î¼Î®Î½Ï?Î¼Î±, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± ÎºÎ¬Î½ÎµÏ?Îµ ÎºÎ»Î¹Îº Ï?Ï?Î¿ Î?Î? Î¼Îµ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±)
-torbutton.popup.ff3.warning = Î Ï?Î¿Ï?Î¿Ï?Î®!\n\nÎ?Î¯Î½Î±Î¹ Î³Î½Ï?Ï?Ï?Ï? Ï?Ï?Î¹ Ï?Î¿ Torbutton Ï?Ï?Î¿Î½ Firefox 3 Î´Î¹Î±Ï?Ï?ÎÎµÎ¹ Ï?Î·Î½ Î¶Ï?Î½Î· Ï?Ï?Î± Ï?Î±Ï? ÎºÎ±Î¹ Ï?Î± livemarks Ï?Î±Ï? Î¼ÎÏ?Ï? Tor.\n\nÎ?Ï?Î¹Î¸Ï?Î¼ÎµÎ¯Ï?Îµ Î½Î± Ï?Ï?Î½ÎµÏ?Î¯Ï?ÎµÏ?Îµ Ï?Î±Ï?' Ï?Î»' Î±Ï?Ï?Î¬;
-torbutton.popup.toggle.warning = Î?Î¹Î± Î½Î± ÎµÏ?Î±Ï?Î¼Î¿Ï?Î¸Î¿Ï?Î½ Î¿Î¹ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î±Ï? Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ½ÎµÏ?Î³Î¿/Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î¿ Tor Î® Î½Î± ÎµÏ?Î±Î½ÎµÎºÎºÎ¹Î½Î®Ï?ÎµÏ?Îµ Ï?Î¿Î½ Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® Ï?Î±Ï?.
 torbutton.popup.test.success = Î?Ï?Î¹Ï?Ï?Ï?Î®Ï? ÎÎ»ÎµÎ³Ï?Î¿Ï? Ï?Î¿Ï? Tor Ï?Î»Î·Ï?ÎµÎ¾Î¿Ï?Ï?Î¹Î¿Ï?/proxy.
 torbutton.popup.test.failure = Î? ÎÎ»ÎµÎ³Ï?Î¿Ï? Ï?Î¿Ï? proxy Î?Î Î?Î¤Î¥Î§Î?! Î?Î»ÎÎ³Î¾Ï?Îµ Ï?Î¹Ï? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î±Ï? Î³Î¹Î± Ï?Î¿Î½ proxy ÎºÎ±Î¹ Ï?Î¿ Polipo.
 torbutton.popup.test.confirm_toggle = Î? Ï?Î¹Î¿ Ï?Ï?Ï?Ï?Ï?Î±Ï?Î· Î´Î¿ÎºÎ¹Î¼Î® Tor Î±Ï?ÎÏ?Ï?Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÎ¹ Ï?Î¿ Tor.\n\nÎ?Î¯Ï?Ï?Îµ Î²ÎÎ²Î±Î¹Î¿Î¹ Ï?Ï?Î¹ Î¸ÎÎ»ÎµÏ?Îµ Î½Î± Ï?Î¿ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ;\n\nÎ£Î·Î¼ÎµÎ¯Ï?Ï?Î·: Î?Î½ Î´Î¹Î¿Ï?Î¸Ï?Ï?Î±Ï?Îµ Ï?Î¿ Ï?Ï?Ï?Î²Î»Î·Î¼Î± Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± ÎµÎºÏ?ÎµÎ»ÎÏ?ÎµÏ?Îµ ÎºÎ±Î¹ Ï?Î¬Î»Î¹ Ï?Î·Î½ Î´Î¿ÎºÎ¹Î¼Î® Î¼ÎÏ?Î± Î±Ï?Ï? Ï?Î¹Ï? Î Ï?Î¿Ï?Î¹Î¼Î®Ï?ÎµÎ¹Ï? Proxy Ï?Î¿Ï? Torbutton Î³Î¹Î± Î½Î± ÎµÎ¾Î¿Ï?Î´ÎµÏ?ÎµÏ?Ï?Ï?ÎµÏ?Îµ Î±Ï?Ï?Î® Ï?Î·Î½ Ï?Ï?Î¿ÎµÎ¹Î´Î¿Ï?Î¿Î¯Î·Ï?Î·.
 torbutton.popup.test.ff3_notice = Î Î±Ï?Î®Ï?Ï?Îµ Î?Î? Î³Î¹Î± Î½Î± Î´Î¿ÎºÎ¹Î¼Î¬Ï?ÎµÏ?Îµ Ï?Î¹Ï? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Tor proxy. Î? Î´Î¿ÎºÎ¹Î¼Î® Î¸Î± Î³Î¯Î½ÎµÎ¹ Ï?Ï?Î¿ Ï?Î±Ï?Î±Ï?ÎºÎ®Î½Î¹Î¿. Î¥Ï?Î¿Î¼Î¿Î½Î®, Ï?Î±Ï?Î±ÎºÎ±Î»Ï?!
-torbutton.panel.label.verified = Î¤Î¿ Tor ÎµÏ?Î±Î»Î·Î¸ÎµÏ?Ï?Î·ÎºÎµ
-torbutton.popup.test.auto_failed = Î? Î±Ï?Ï?Ï?Î¼Î±Ï?Î· Î´Î¿ÎºÎ¹Î¼Î® Î³Î¹Î± Ï?Î¿ Tor proxy Î±Ï?ÎÏ?Ï?Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÎ¹ Tor.\n\nÎ?Î¯Ï?Ï?Îµ Î²ÎÎ²Î±Î¹Î¿Î¹ Ï?Ï?Î¹ Î¸ÎÎ»ÎµÏ?Îµ Î½Î± Ï?Î¿ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î±Ï?' Ï?Î»' Î±Ï?Ï?Î¬;
-torbutton.prefs.recommended = (Ï?Ï?Î½Î¯Ï?Ï?Î±Ï?Î±Î¹)
-torbutton.prefs.optional = (Ï?Ï?Î¿ÎµÏ?Î±Î¹Ï?Î¹ÎºÏ?)
-torbutton.prefs.crucial = (ÎºÏ?Î¹Ï?Î¹Î¼Î¿)
 torbutton.popup.external.title = Î?Î± Ï?Î¿Ï?Ï?Ï?Î¸ÎµÎ¯ ÎµÎ¾Ï?Ï?ÎµÏ?Î¹ÎºÏ? Ï?ÎµÏ?Î¹ÎµÏ?Ï?Î¼ÎµÎ½Î¿;
 torbutton.popup.external.app = Î?Î¹Î± ÎµÎ¾Ï?Ï?ÎµÏ?Î¹ÎºÎ® ÎµÏ?Î±Ï?Î¼Î¿Î³Î® ÎµÎ¯Î½Î±Î¹ Î±Ï?Î±Ï?Î±Î¯Ï?Î·Ï?Î· Î³Î¹Î± Ï?Î¿Î½ Ï?Ï?Ï?Ï?Ï? Ï?ÎµÎ¹Ï?Î¹Ï?Î¼Ï?:\n\n
 torbutton.popup.external.note = \n\nÎ£Î?Î?Î?Î?Î©Î£Î?: Î?Î¹ ÎµÎ¾Ï?Ï?ÎµÏ?Î¹ÎºÎÏ? ÎµÏ?Î±Ï?Î¼Î¿Î³ÎÏ? Î?Î?Î? ÎµÎ¯Î½Î±Î¹ ÎµÎ¾Î¿Ï?Î¹Ï?Î¼Î¿Ï? Î±Ï?Ï?Î±Î»Î®Ï? Î³Î¹Î± Ï?Î¿ Tor ÎºÎ±Î¹ Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï? Î±Ï?Î¿ÎºÎ±Î»Ï?Ï?Î¿Ï?Î½!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Î?ÎºÏ?ÎÎ»ÎµÏ?Î· ÎµÏ?Î±Ï?Î¼Î¿Î³Î®Ï?
 torbutton.popup.cancel = Î?ÎºÏ?Ï?Î¿Î½
 torbutton.popup.dontask = Î?Ï?Ï? Ï?Ï?Ï?Î± ÎºÎ±Î¹ Ï?Ï?Î¿ ÎµÎ¾Î®Ï? Î½Î± ÎµÎºÏ?ÎµÎ»Î¿Ï?Î½Ï?Î±Î¹ Ï?Î¬Î½Ï?Î¿Ï?Îµ ÎµÏ?Î±Ï?Î¼Î¿Î³ÎÏ?
 torbutton.popup.test.no_http_proxy = Î?Î¿ÎºÎ¹Î¼Î® Tor proxy: Î? Ï?Î¿Ï?Î¹ÎºÏ?Ï? HTTP Proxy ÎµÎ¯Î½Î±Î¹ Î±Ï?Ï?Ï?Ï?Î¹Ï?Î¿Ï?. Î?ÎºÏ?ÎµÎ»ÎµÎ¯Ï?Î±Î¹ Ï?Ï?Ï?Ï?Î¬ Ï?Î¿ Polipo;
-torbutton.popup.captcha.title = Î?Ï?Î¿Ï?Ï?Î³Î® Ï?Î·Ï? Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î±Ï? CAPTCHA Ï?Î·Ï? Google;
-torbutton.popup.captcha.ask = Î¤Î¿ Torbutton ÎµÎ½Ï?Ï?Ï?Î¹Ï?Îµ ÎÎ½Î± Google Captcha. Î?Ï?Î¹Î¸Ï?Î¼ÎµÎ¯Ï?Îµ Î½Î± Ï?Î±Ï? Î±Î½Î±ÎºÎ±Ï?ÎµÏ?Î¸Ï?Î½Î¿Ï?Î¼Îµ Ï?Îµ Î¼Î¹Î± Î¬Î»Î»Î· Î¼Î·Ï?Î±Î½Î® Î±Î½Î±Î¶Î®Ï?Î·Ï?Î·Ï? Î³Î¹Î± Î±Ï?Ï?Ï? Ï?Î¿Ï? Ï?Î¬Ï?Î½ÎµÏ?Îµ;
-torbutton.popup.captcha.always = Î£Ï?Î¿ ÎµÎ¾Î®Ï? Î½Î± ÎµÎºÏ?ÎµÎ»ÎµÎ¯Ï?Î±Î¹ Ï?Î¬Î½Ï?Î¿Ï?Îµ Î· ÎµÎ½ÎÏ?Î³ÎµÎ¹Î± Î±Ï?Ï?Î®
-torbutton.popup.redirect = Î?Î¬Î½Îµ Î±Î½Î±ÎºÎ±Ï?ÎµÏ?Î¸Î·Î½Ï?Î·
-torbutton.popup.no_redirect = Î?Î·Î½ ÎºÎ¬Î½ÎµÎ¹Ï? Î±Î½Î±ÎºÎ±Ï?ÎµÏ?Î¸Î·Î½Ï?Î·
 torbutton.popup.prompted_language = Î?Î¹Î± Ï?Î·Î½ ÎµÎ½Î¯Ï?Ï?Ï?Ï?Î· Ï?Î¿Ï? Î±Ï?Î¿Ï?Ï?Î®Ï?Î¿Ï? Ï?Î±Ï? Ï?Î¿ Torbutton Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Î¶Î·Ï?Î®Ï?ÎµÎ¹ Ï?Î·Î½ ÎÎºÎ´Î¿Ï?Î· Ï?Î·Ï? Î±Î³Î³Î»Î¹ÎºÎ®Ï? Î³Î»Ï?Ï?Ï?Î±Ï? Î³Î¹Î± Ï?Î¹Ï? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ?. Î?Ï?Ï?Ï? Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± ÎÏ?ÎµÎ¹ Ï?Î±Î½ Î±Ï?Î¿Ï?ÎÎ»ÎµÏ?Î¼Î±, Î¿Î¹ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ? Ï?Î¿Ï? ÎµÏ?Î¹Î»ÎÎ¾Î±Ï?Îµ Î½Î± ÎµÎ¼Ï?Î±Î½Î¯Î¶Î¿Î½Ï?Î±Î¹ Ï?Ï?Î·Î½ ÎµÎ¸Î½Î¹ÎºÎ® Ï?Î±Ï? Î³Î»Ï?Ï?Î±, Î½Î± Ï?Ï?Î¿Î²Î¬Î»Î¿Î½Ï?Î±Î¹ Î±Î½Ï?' Î±Ï?Ï?Î®Ï? Ï?Ï?Î·Î½ Î?Î³Î³Î»Î¹ÎºÎ®.\n\nÎ?ÎÎ»ÎµÏ?Îµ Î½Î± Î±Î¹Ï?Î¿Ï?Î½Ï?Î±Î¹ Ï?ÎµÎ»Î¯Î´ÎµÏ? Î³Ï?Î±Î¼Î¼ÎÎ½ÎµÏ? Ï?Ï?Î± Î?Î³Î³Î»Î¹ÎºÎ¬, Î³Î¹Î± Ï?Î·Î½ Î²ÎµÎ»Ï?Î¯Ï?Ï?Î· Ï?Î¿Ï? Î±Ï?Î¿Ï?Ï?Î®Ï?Î¿Ï?;
 torbutton.popup.no_newnym = Î¤Î¿ Torbutton Î´ÎµÎ½ Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î±Ï? Î´Ï?Ï?ÎµÎ¹ Î¼Î¹Î± Î±Ï?Ï?Î±Î»Î® Î½ÎÎ± Ï?Î±Ï?Ï?Ï?Ï?Î·Ï?Î±, Î´Î¹Ï?Ï?Î¹ Î´ÎµÎ½ ÎÏ?ÎµÎ¹ Ï?Ï?Ï?Ï?Î²Î±Ï?Î· Ï?Ï?Î¿ Tor Control Port:\n\nÎ§Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¿ Î Î±ÎºÎÏ?Î¿ Î¦Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Tor;
-torbutton.popup.use_tbb = Î¦Î±Î¯Î½ÎµÏ?Î±Î¹ Ï?Ï?Î¹ Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¿ Torbutton Î¼Î±Î¶Î¯ Î¼Îµ Firefox, Ï?Ï?Î½Î´Ï?Î±Ï?Î¼Ï?Ï? Ï?Î¿Ï? Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î¿ Ï?Î»ÎµÎ¿Î½ Î±Ï?Ï?Î±Î»Î®Ï?.\n\nÎ£Î±Ï? Ï?Ï?Î¿Ï?ÎµÎ¯Î½Î¿Ï?Î¼Îµ Î½Î± Î»Î¬Î²ÎµÏ?Îµ Ï?Î·Î½ Î½ÎµÏ?Ï?ÎµÏ?Î· ÎÎºÎ´Î¿Ï?Î· Ï?Î¿Ï? Î Î±ÎºÎÏ?Î¿Ï? Î¦Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Tor, Ï?Ï?ÎÎ»Î½Î¿Î½Ï?Î±Ï? ÎÎ½Î± email Ï?Ï?Î· Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· gettor@xxxxxxxxxxxxxx Î® ÎºÎ±Ï?ÎµÎ²Î¬Î¶Î¿Î½Ï?Î¬Ï? Ï?Î¿ Î±Ï?Ï? Ï?Î·Î½ Î±ÎºÏ?Î»Î¿Ï?Î¸Î· Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· URL:
 torbutton.popup.pref_error = Î¤Î¿ Torbutton Î´ÎµÎ½ Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± ÎµÎ½Î·Î¼ÎµÏ?Ï?Ï?ÎµÎ¹ Ï?Î¹Ï? Ï?Ï?Î¿Ï?Î¹Î¼Î®Ï?ÎµÎ¹Ï? Ï?Ï?Î¿Î½ ÎºÎ±Ï?Î¬Î»Î¿Î³Î¿ Ï?Î¿Ï? Ï?Ï?Î¿Ï?Î¯Î» Ï?Î±Ï?Ï?Î¿Ï? Î¦Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Tor.
 torbutton.popup.permission_denied = Î Î±Ï?Î±ÎºÎ±Î»Î¿Ï?Î¼Îµ ÎµÎ¯Ï?Îµ Î½Î± ÎµÏ?Î±Î½Î±Ï?ÎÏ?ÎµÏ?Îµ Ï?Î¹Ï? Î¬Î´ÎµÎ¹ÎµÏ? Ï?Î¿Ï? ÎºÎ±Ï?Î±Î»Ï?Î³Î¿Ï? Î¦Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Tor ÎµÎ¯Ï?Îµ Î½Î± Ï?Î¿Î½ Î±Î½Ï?Î¹Î³Ï?Î¬Ï?ÎµÏ?Îµ Ï?Îµ Î¼Î¹Î± Î½ÎÎ± Ï?Î¿Ï?Î¿Î¸ÎµÏ?Î¯Î±.
 torbutton.popup.device_full = Î? Î´Î¯Ï?ÎºÎ¿Ï? Ï?Î±Î¯Î½ÎµÏ?Î±Î¹ Ï?Ï?Î¹ ÎµÎ¯Î½Î±Î¹ Î³ÎµÎ¼Î¬Ï?Î¿Ï?. Î Î±Ï?Î±ÎºÎ±Î»Î¿Ï?Î¼Îµ ÎµÎ»ÎµÏ?Î¸ÎµÏ?Ï?Ï?Ï?Îµ Ï?Ï?Ï?Î¿ Ï?Ï?Î¿Î½ Î´Î¯Ï?ÎºÎ¿ Î® Î¼ÎµÏ?Î±ÎºÎ¹Î½Î®Ï?Ï?Îµ Ï?Î¿Î½ Î¦Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Tor Ï?Îµ ÎºÎ¬Ï?Î¿Î¹Î¿Î½ Î¬Î»Î»Î¿ Î´Î¯Ï?ÎºÎ¿.
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index 67c630b..935cce1 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP unknown
 torbutton.circuit_display.onion_site = Onion site
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Download an external file type?
 torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n
 torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Download file
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Automatically download files from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/eo/torbutton.properties b/src/chrome/locale/eo/torbutton.properties
index 890ae20..643fce1 100644
--- a/src/chrome/locale/eo/torbutton.properties
+++ b/src/chrome/locale/eo/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Rezigni
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index a29234b..50c78d5 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Habilitar Tor
-torbutton.button.tooltip.enabled = Deshabilitar Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconocida
 torbutton.circuit_display.onion_site = Sitio onion
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = PaÃs desconocido
 torbutton.content_sizer.margin_tooltip = El Navegador Tor aÃ±ade este margen para hacer el ancho y el alto de su ventana menos distintivo, y reducir de esta forma la capacidad de la gente de rastrearle en lÃnea.
 torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor
 torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor
-torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins).
-torbutton.panel.plugins.enabled = Haga clic para deshabilitar extensiones (plugins).
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton proporciona un botÃ³n para configurar las preferencias de Tor y limpiar rÃ¡pida y fÃ¡cilmente los datos de navegaciÃ³n privada.
-torbutton.popup.history.warning = Torbutton bloqueo la actividad de una pestaÃ±a cargada en un estado diferente de Tor. \n \nEsto es para evitar los errores de programaciÃ³n 409737 y 417869 de Firefox.\n\nSi este diÃ¡logo aparece sin ninguna razÃ³n aparente, una de sus pestaÃ±as estÃ¡ intentando recargarse en segundo plano, y esta operaciÃ³n ha sido bloqueada.\n\nPara recargar esta pestaÃ±a en el estado actual de Tor, presione la tecla  'enter' en la barra de direcciÃ³n URL. \n \n
-torbutton.popup.plugin.warning = Torbutton bloqueÃ³ la carga directa por Tor del contenido del plugin.\n\nUse â??Guardar comoâ?? en su lugar.\n\n
-torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que no tiene Autoridades de Certificados (CA) personalizadas. Examinar la lista por defecto de CAs es una operaciÃ³n lenta y ralentiza la activaciÃ³n de Tor. Â¿Desea deshabilitar el aislamiento de los certificados de CAs? (Permite verificar certificados con las CAs que los firmaron si a su vez estÃ¡n certificadas, sin tener que buscar a quÃ© cadena de confianza de quÃ© CA de la lista corresponderÃa. Si no entiende esto, hacer clic en Aceptar es seguro)
-torbutton.popup.ff3.warning = Â¡Advertencia!\n\nTorbutton sobre Firefox 3 es conocido por revelar su zona horaria y marcadores activos (livemarks) a travÃ©s de Tor.\n\nÂ¿Desea continuar de todos modos?
-torbutton.popup.toggle.warning = Tiene que activar Tor o reiniciar para que sus preferencias sean aplicadas.
 torbutton.popup.test.success = Â¡La prueba con "proxy" Tor finalizÃ³ con Ã©xito!
 torbutton.popup.test.failure = Â¡La prueba con "proxy" Tor FALLÃ?! Revise su configuraciÃ³n para proxy y Polipo.
 torbutton.popup.test.confirm_toggle = La prueba mÃ¡s reciente con "proxy" Tor fallÃ³ al usar Tor.\n\nÂ¿EstÃ¡ seguro de que quiere habilitarlo de todos modos?\n\nNota: Si ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias para proxy de Torbutton para eliminar esta advertencia.
 torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias para "proxy" Tor. Esta prueba se harÃ¡ en segundo plano. Por favor, tenga paciencia.
-torbutton.panel.label.verified = Tor verficado
-torbutton.popup.test.auto_failed = La prueba automÃ¡tica con "proxy" Tor fallÃ³ al usar Tor.\n \nÂ¿EstÃ¡ seguro de que quiere habilitarlo de todos modos?
-torbutton.prefs.recommended = (recomendado)
-torbutton.prefs.optional = (opcional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Â¿Descargar un tipo de fichero externo?
 torbutton.popup.external.app = El Navegador Tor no puede mostrar este fichero. TendrÃ¡ que abrirlo con otra aplicaciÃ³n.\n\n
 torbutton.popup.external.note = Algunos tipos de ficheros pueden hacer que ciertas aplicaciones se conecten a Internet sin usar Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Descargar fichero
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = Descargar ficheros automÃ¡ticamente a partir de ahora
 torbutton.popup.test.no_http_proxy = Prueba con "proxy" Tor: El proxy HTTP local es inalcanzable. Â¿EstÃ¡ Polipo funcionando correctamente?
-torbutton.popup.captcha.title = Â¿Evitar los captchas de Google?
-torbutton.popup.captcha.ask = Torbutton detectÃ³ un captcha de Google. Â¿Desea que su peticiÃ³n sea redirigida a otro motor de bÃºsqueda?
-torbutton.popup.captcha.always = En adelante realizar siempre esta acciÃ³n
-torbutton.popup.redirect = Redirigir
-torbutton.popup.no_redirect = No redirigir
 torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versiÃ³n en inglÃ©s de las pÃ¡ginas web. Esto podrÃa causar que pÃ¡ginas que prefiera leer en su idioma nativo se muestren en inglÃ©s en su lugar. \n \nÂ¿Le gustarÃa solicitar pÃ¡ginas web en inglÃ©s para mejor privacidad?
 torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\nÂ¿EstÃ¡ ejecutando el Paquete de Navegador Tor?
-torbutton.popup.use_tbb = Parece que estÃ¡ usando Torbutton con Firefox, cuya combinaciÃ³n dejÃ³ de ser una configuraciÃ³n segura recomendada.\n\nEn su lugar, recomendamos que obtenga el Ãºltimo Paquete de Navegador Tor enviando un correo a gettor@xxxxxxxxxxxxxx o descargÃ¡ndolo en la siguiente URL:
 torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en la carpeta de perfiles del Navegador Tor.
 torbutton.popup.permission_denied = Permiso denegado: reinicie los permisos de la carpeta del Navegador Tor o bien cÃ³pielo a una nueva ubicaciÃ³n.
 torbutton.popup.device_full = El disco parece estar lleno. Libere espacio o mueva el Navegador Tor a un nuevo dispositivo.
diff --git a/src/chrome/locale/et/torbutton.properties b/src/chrome/locale/et/torbutton.properties
index f0402b6..4c1518a 100644
--- a/src/chrome/locale/et/torbutton.properties
+++ b/src/chrome/locale/et/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Aktiveeri Tor
-torbutton.button.tooltip.enabled = Deaktiveeri Tor
 torbutton.panel.tooltip.disabled = Vajuta, et aktiveerida Tor
 torbutton.panel.tooltip.enabled = Vajuta, et deaktiveerida Tor
-torbutton.panel.plugins.disabled = Kliki pluginate sisselÃ¼litamiseks
-torbutton.panel.plugins.enabled = Kliki pluginate vÃ¤ljalÃ¼litamiseks
 torbutton.panel.label.disabled = Tor on mitteaktiivne
 torbutton.panel.label.enabled = Tor on aktiivne
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blokeeris Tori otse laadimast plugina sisu.\n\nKasuta "Salvesta nimega" selle asemel.\n\n
-torbutton.popup.confirm_ca_certs = Torbuttoni teade: tundub, et sul pole Ã¼htegi iselisatud sertifikaadi autoriteeti. Sertifikaadi autoriteetite nimekirja uurimine on aeglane tegevus ning aeglustab Tori kasutamise ja mittekasutamise vahetamist. Kas sa soovid lÃµpetada sertifikaadi autoriteetide isoleerimise? (Kui sa ei mÃµista, millest jutt kÃ¤ib, siis vÃµid julgelt seda teha.)
-torbutton.popup.ff3.warning = Hoiatus!\n\nTorbutton lekitab Firefox 3-s su ajatsooni ning elusad jÃ¤rjehoidjad lÃ¤bi Tori.\n\nKas sa soovid ikka jÃ¤tkata?
-torbutton.popup.toggle.warning = Sa pead Tori olekut muutma vÃµi Firefoxi taaskÃ¤ivitama, et muudatused tÃ¶Ã¶le hakkaksid.
 torbutton.popup.test.success = Tor vaheserveri kontroll Ãµnnestus!
 torbutton.popup.test.failure = Tor vaheserveri kontroll ebaÃµnnestus! Kontrolli oma vaheserveri ja Polipo seadeid.
 torbutton.popup.test.confirm_toggle = Viimasel Tori vaheserveri kontrollimisel ei Ãµnnestunud Tori kasutada.\n\nKas sa oled kindel, et tahad Tori ikkagi aktiveerida?\n\nTeade: kui sa oled probleemi parandanud, siis sa saad kontrolli uuesti kÃ¤ima panna Torbuttoni vaheserveri eelistuste aknas, et sellest hoiatusest lahti saada.
 torbutton.popup.test.ff3_notice = Vajuta OK, et kontrollida Tori vaheserveri seadeid. See kontroll jookseb taustal. Palun ole kannatlik.
-torbutton.panel.label.verified = Tor verifitseeritud
-torbutton.popup.test.auto_failed = Automaatsel Tori vaheserveri kontrollimisel ei Ãµnnestunud Tori kasutada.\n\nKas sa oled kindel, et soovid Tori ikkagi aktiveerida?
-torbutton.prefs.recommended = (soovitatud)
-torbutton.prefs.optional = (valikuline)
-torbutton.prefs.crucial = (Ã¼lioluline)
 torbutton.popup.external.title = Lae vÃ¤list sisu?
 torbutton.popup.external.app = VÃ¤list rakendust on vaja, et kÃ¤sitseda:\n\n
 torbutton.popup.external.note = \n\nTeadaanne: vÃ¤lised rakendused ei ole vaikimisi Toriga koos kasutades turvalised ning vÃµivad sind paljastada.\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = KÃ¤ivita rakendus
 torbutton.popup.cancel = Katkesta
 torbutton.popup.dontask = Alati kÃ¤ivita rakendusi edaspidi
 torbutton.popup.test.no_http_proxy = Tor vaheserveri kontroll: kohalik HTTP vaheserver kÃ¤ttesaamatu. Kas Polipo jookseb korralikult?
-torbutton.popup.captcha.title = VÃ¤ltida Google CAPTCHA-sid?
-torbutton.popup.captcha.ask = Tor tuvastas Google CAPTCHA. Kas sa soovid, et sind suunatakse selle pÃ¤ringuga Ã¼mber mÃµne teise otsingumootori juurde?
-torbutton.popup.captcha.always = NÃ¼Ã¼dsest edasi soorita alati see tegevus
-torbutton.popup.redirect = Suuna Ã¼mber
-torbutton.popup.no_redirect = Ã?ra suuna Ã¼mber
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = NÃ¤ib, et sa kasutat Torbuttonit koos Firefoxiga, mis pole enam soovitatud turvaline lahendus.\n\nMe soovitame sul selle asemel hankida Tori Veebilehitseja Pakett saates e-posti aadressile gettor@xxxxxxxxxxxxxx vÃµi laadides selle alla jÃ¤rgnevalt aadressilt: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index 2136510..8c886e1 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Tor gaitu
-torbutton.button.tooltip.enabled = Tor ezgaitu
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP ezezaguna
 torbutton.circuit_display.onion_site = Onion webgunea
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Herrialde ezezaguna
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko
 torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko
-torbutton.panel.plugins.disabled = Sakatu gehigarriak gaitzeko
-torbutton.panel.plugins.enabled = Sakatu gehigarriak ezgaitzeko
 torbutton.panel.label.disabled = Tor Ezgaitua
 torbutton.panel.label.enabled = Tor Gaitua
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbuttonek Tor ezarpenak konfiguratzeko eta nabigatze pribatuko datuak azkar eta erraz garbitzeko botoi bat hornitzen du
-torbutton.popup.history.warning = Torbuttonek Tor egoera ezberdinean kargatutako fitxa bateko jarduera blokeatu du.\n\nHau 409737 eta 417869 Firefox Bugsen inguruko lana da.\n\nAzaleratze hau arrazoirik gabe agertu dela baldin badirudi, zure fitxetakoren bat atzeko planoan bere burua birkargatzen saiatzen ari da, eta hau blokeatu da.\n\nFitxa Tor egoera honetan birkargatzeko, sakatu 'intro' URL kokaleku kutxan.\n
-torbutton.popup.plugin.warning = Torbuttonek gehigarri edukien Tor karga zuzena blokeatu du.\n\nErabili Gorde-honela bere ordez.\n\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Oharra: Pertsonalizatutako Ziurtagiri Aginpiderik ez duzula ematen du. Ziurtagiri Aginpide zerrenda aztertzea eragiketa motela da eta Tor egoera aldaketa moteltzen du. Ziurtagiri Aginpideen ziurtagirien isolamendua ezgaitzea nahiko al zenuke? (Hau ulertzen ez baduzu, Ados sakatzea segurua da)
-torbutton.popup.ff3.warning = Oharra!\n\nEzaguna da Firefox 3n Torbuttonek zure denbora-gunea eta bizi-markak Tor bidez jakinarazten dituela.\n\nJarraitu nahi al duzu hala ere?
-torbutton.popup.toggle.warning = Toren egoera aldatu edo berrabiarazi behar duzu zure ezarpenek eragina izan dezaten.
 torbutton.popup.test.success = Tor proxy froga arrakastatsua!
 torbutton.popup.test.failure = Tor proxy frogak HUTS EGIN DU! Egiaztatu zure proxy eta Polipo ezarpenak.
 torbutton.popup.test.confirm_toggle = Azken Tor proxy frogak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?\n\nOharra: Arazoa konpondu baduzu, froga berriz exekuta dezakezu Torbutton Proxy Ezarpenak leihoan abisu hau ezabatzeko.
 torbutton.popup.test.ff3_notice = Sakatu Ados Tor proxy ezarpenak frogatzeko. Froga hau atzeko planoan gertatuko da. Mesedez pazientzia izan.
-torbutton.panel.label.verified = Tor Egiaztatua
-torbutton.popup.test.auto_failed = Tor proxy froga automatikoak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?
-torbutton.prefs.recommended = (gomendatua)
-torbutton.prefs.optional = (hautazkoa)
-torbutton.prefs.crucial = (erabakigarria)
 torbutton.popup.external.title = Kanpoko fitxategi mota bat desargatu?
 torbutton.popup.external.app = Tor Nabigatzailea ezin du fitxategi hau bistaratu. Irekitzeko beste aplikazio bat behar izango duzu.\n\n
 torbutton.popup.external.note = Fitxategi mota batzuk Tor erabili gabe aplikaziok Internetera konektatzea sor ditzake.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Fitxategia deskargatu
 torbutton.popup.cancel = Utzi
 torbutton.popup.dontask = Hemendik aurrera fitxategiak automatikoki deskargatu
 torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da?
-torbutton.popup.captcha.title = Saihestu Googleren Captchak?
-torbutton.popup.captcha.ask = Torbuttonek Google Captcha dat detektatu du. Beste bilaketa motor batera birbideratua izan nahi al duzu eskakizun honetarako?
-torbutton.popup.captcha.always = Beti egin ekintza hau hemendik aurrera
-torbutton.popup.redirect = Birzuzendu
-torbutton.popup.no_redirect = Ez birzuzendu
 torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko?
 torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara?
-torbutton.popup.use_tbb = Badirudi Torbutton Firefoxekin erabiltzen ari zarela, gehiago gomendatzen ez den segurtasun konfigurazioa izanik.\n\nHorren ordez, azkenengo Tor Browser Bundlea eskura dezazun gomendatzen dizugu, bai gettor@xxxxxxxxxxxxxxxxxx email bat bidaliz bai hurrengo URLetik jaitsiz:
 torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direktorioan hobespenak eguneratu.
 torbutton.popup.permission_denied = Mesedez berrezarri Tor Browser direktorioaren baimenak edo kopia ezazu beste kokaleku batera.
 torbutton.popup.device_full = Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea gailu berri batera.
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 195b17b..f094569 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
-torbutton.button.tooltip.enabled = ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
 torbutton.circuit_display.internet = Ø§Û?Ù?ØªØ±Ù?Øª
 torbutton.circuit_display.ip_unknown = IP Ù?Ø§Ø´Ù?Ø§Ø®ØªÙ?
 torbutton.circuit_display.onion_site = Ø³Ø§Û?Øª Ù¾Û?Ø§Ø²
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Ú©Ø´Ù?Ø± Ù?Ø§Ø´Ù?Ø§Ø®ØªÙ?
 torbutton.content_sizer.margin_tooltip = Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø§Ø¶Ø§Ù?Ù? Ù?Û? Ú©Ù?Ø¯ Ø§Û?Ù? ØØ§Ø´Û?Ù? Ø±Ø§ Ø¨Ù? Ø¹Ø±Ø¶ Ù? Ø§Ø±ØªÙ?Ø§Ø¹ Ù¾Ù?Ø¬Ø±Ù? Ø´Ù?Ø§ Ú©Ù? Ú©Ù?ØªØ± Ù?Ø´Ø®Øµ Ø´Ù?Ø¯Ø? Ù? Ø¯Ø± Ù?ØªÛ?Ø¬Ù? Ø¨Ø§Ø¹Ø« Ú©Ø§Ù?Ø´ ØªÙ?Ø§Ù?Ø§Û?Û? Ø¨Ù? Ø±Ø¯Û?Ø§Ø¨Û? Ø¢Ù?Ù?Ø§Û?Ù? Ø´Ù?Ø§ Ø´Ù?Ø¯.
 torbutton.panel.tooltip.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
 torbutton.panel.tooltip.enabled = Ø¨Ø±Ø§Û? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø± Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
-torbutton.panel.plugins.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Ù?Ù? Ù?Ø§ Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
-torbutton.panel.plugins.enabled = Ø¨Ø±Ø§Û? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Ù?Ù? Ù?Ø§ Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
 torbutton.panel.label.disabled = ØªÙ?Ø±ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ø´Ø¯
 torbutton.panel.label.enabled = ØªÙ?Ø± Ù?Ø¹Ø§Ù? Ø´Ø¯
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton Ø¯Ú©Ù?Ù? Ø§Û? Ø±Ø§ Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ù?Ø±Ø§Ù?Ù? Ù?Û?Ù?Ù?Ø§Û?Ø¯ ØªØ§ ØªÙ?Ø¸Û?Ù?Ø§Øª "ØªØ±" Ø±Ø§ Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ú©Ø±Ø¯Ù? Ù? Ø¨ØªÙ?Ø§Ù?Û?Ø¯ Ø¨Ù? Ø±Ø§ØØªÛ? Ù? Ø³Ø±Ø¹ØªØ? Ø¯Ø§Ø¯Ù? Ù?Ø§Û? Ø®ØµÙ?ØµÛ? Ù?Ø±Ù?Ø±Ú¯Ø±ØªØ§Ù? Ø±Ø§ Ù¾Ø§Ú© Ú©Ù?Û?Ø¯.
-torbutton.popup.history.warning = Torbutton .Ù?Ø¹Ø§Ù?Û?Øª Û?Ú© ØªØ¨ Ø±Ø§ Ú©Ù? Ø¯Ø± Ù?Ø¶Ø¹Û?Øª Ù?ØªÙ?Ø§Ù?ØªÛ? Ø§Ø² "ØªØ±" Ø¨Ø§Ø±Ú¯Û?Ø±Û? Ø´Ø¯Ù? Ø¨Ù?Ø¯Ø? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯.\n\nØ§Û?Ù? Ú©Ø§Ø± Ø¨Ø±Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Ø´Ú©Ù? Ù?Ø§Ø´Û? Ø§Ø² Ù?Ù?Øµ Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø±Û? Ø¨Ø§ Ú©Ø¯ 409737 Ù? 417869 Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ø§Ø³Øª.\n\nØ§Ú¯Ø± Ø§Û?Ù? Ù¾Ø§Ù¾Ø§Ù¾ (Ù?Ù?Ù?Û? Ù?Ø±Ø¹Û?)Ø? Ø¨Ù? Ù?Ø¸Ø± Ø¨Ø¯Ù?Ù? Ù?Û?Ú? Ø¯Ù?Û?Ù?Û? Ø§Û?Ø¬Ø§Ø¯ Ø´Ø¯Ù?Ø? Û?Ú©Û? Ø§Ø² ØªØ¨Ù?Ø§Û? Ø´Ù?Ø§ Ø¯Ø± ØªÙ?Ø§Ø´ Ø§Ø³Øª ØªØ§ Ø®Ù?Ø¯Ø´ Ø±Ø§ Ø¯Ø± Ù¾Ø´Øª Ø²Ù?Û?Ù?Ù?Ø? Ø¨Ø§Ø±Ú¯Û?Ø±Û? Ù?Ø¬Ø¯Ø¯ Ú©Ù?Ø¯ Ú©Ù? Ø¬Ù?Ù?Û? Ø§Û?Ù? Ù?Ø³Ø§Ù?Ù? Ú¯Ø±Ù?ØªÙ? Ø´Ø¯Ù? Ø§Ø³Øª.\n\nØ¨Ø±Ø§Û? Ø¨Ø§Ø±Ú¯Û?Ø±Û? Ù?Ø¬Ø¯Ø¯ ØªØ¨ Ø¯Ø± Ø§Û?Ù? ØØ§Ù?Øª Ø§Ø² "ØªØ±"Ø? Enter Ø±Ø§ Ø¯Ø± Ù?Ù?Ø§Ø± URL Ø¨Ø²Ù?Û?Ø¯.\n
-torbutton.popup.plugin.warning = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ù?Ø§Ù?Ø¹ Ø§Ø² Ù?ØµØ¨ Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Ú© Ù¾Ù?Ø§Ú¯Ù?Ù? Ø´Ø¯.\n\nØ¯Ø± Ø¹Ù?Ø¶ Save-As Ø±Ø§ Ø¨Ú©Ø§Ø± Ø¨Ø¨Ø±Ù?Ø¯.\n\n
-torbutton.popup.confirm_ca_certs = Ù?Ù?ØªÙ? Ø§Û? Ø¯Ø±Ø¨Ø§Ø±Ù? Torbutton : Ø¨Ù?Ø¸Ø± Ù?Ù? Ø±Ø³Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¯Ø§Ø±Ø§Û? Ú¯Ù?Ø§Ù?Û? ØªØ§Û?Û?Ø¯ Ø±Ø³Ù?Û? Ù?Ù?Û? Ø¨Ø§Ø´Ù?Ø¯. Ø¨Ø±Ø±Ø³Û? Ù?Û?Ø³Øª Ú¯Ù?Ø§Ù?Û? ØªØ§Û?Û?Ø¯Ø? Ø¹Ù?Ù?Û?Ø§ØªÛ? Ø²Ù?Ø§Ù?Ø¨Ø± Ø§Ø³Øª Ù? ØªØ¨Ø¯Û?Ù? Ù?Ø¶Ø¹Û?Øª "ØªØ±" Ø±Ø§ Ú©Ù?Ø¯ Ù?Û?Ú©Ù?Ø¯. Ø¢Ù?Ø§ Ù?Û? Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¬Ø¯Ø§Ø³Ø§Ø²Û? Ú¯Ù?Ø§Ù?Û? ØªØ§Û?Û?Ø¯ Ø±Ø§ ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø? (Ø§Ú¯Ø±Ø§Û?Ù? Ù?Ù?Ø¶Ù?Ø¹ Ø±Ø§ Ù?ØªÙ?Ø¬Ù? Ù?Ù?Û? Ø´Ù?Ù?Ø¯, Ø¨Ù?ØªØ± Ø§Ø³Øª Ø±Ù?Û? OK Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯).
-torbutton.popup.ff3.warning = Ù?Ø´Ø¯Ø§Ø±!\n\nØ¯Ú©Ù?Ù? ØªÙ?Ø± Ø¯Ø± Ù?Ø§Ù?Ø±Ù?Ø§Ú©Ø³ 3 Ù?ØØ¯Ù?Ø¯Ù? Ø²Ù?Ø§Ù?Û? Ù? Ø¨Ù?Ú© Ù?Ø§Ø±Ú© Ù?Ø§ Ø±Ø§ Ø§Ø² Ø·Ø±Ù?Ù? ØªÙ?Ø±Ø§Ù?Ø´Ø§ Ù?Ù?Ú©Ù?Ø¯.\n\nØ¢Ù?Ø§ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Ø§Ù?Ù? Ø¨Ù? Ø§Ø¯Ø§Ù?Ù? Ù?Ø³ØªÙ?Ø¯Ø?
-torbutton.popup.toggle.warning = Ø´Ù?Ø§ Ø¨Ø§Ù?Ø¯ ØªÙ?Ø± Ø±Ø§ Ù?Ø¹Ø§Ù?/ØºÙ?Ø± Ù?Ø¹Ø§Ù? Ù?Ù?Ø§ Ù?Ø§Ù?Ø±Ù?Ø§Ú©Ø³ Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø±Ø§Ù? Ø§Ù?Ø¯Ø§Ø²Û? Ú©Ù?Ù?Ø¯ ØªØ§ ØªØºÙ?Ù?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ù?Ø¯.
 torbutton.popup.test.success = ØªÙ?Ø±Ø¨Ø§ Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ø²Ù?Ø§Ù?Ø´ Ø±Ø§ Ø³Ù¾Ø±Û? Ú©Ø±Ø¯!
 torbutton.popup.test.failure = Ø¢Ø²Ù?Ø§Ù?Ø´ ØªÙ?Ø± Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ù?Ù?Ø² Ù?Ø¨Ù?Ø¯! ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ù? Ù¾Ù?Ù?Ù?Ù¾Ù? Ø±Ø§ Ø¨Ø±Ø±Ø³Û? Ú©Ù?Ù?Ø¯.
 torbutton.popup.test.confirm_toggle = Ø¢Ø®Ù?Ø±Ù? ØªØºÙ?Ù?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ø¯Ù? Ø¯Ø± ØªÙ?Ø± Ù¾Ø±Ø§Ú©Ø³Û? Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ù?Ù?Ø² Ù?Ø¨Ù?Ø¯.\n\nØ¢Ù?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ù?Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ø¢Ù?Ù?Ø§ Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø?\n\nÙ?Ú©ØªÙ?: Ø§Ú¯Ø±Ù?Ø´Ú©Ù?Ø§Øª Ù?Ù?Ø¬Ù?Ø¯ Ø±Ø§ ØÙ? Ú©Ø±Ø¯Ù?Ø¯Ø? Ù?Ù?ØªÙ?Ø§Ù?Ù?Ø¯ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¢Ø²Ù?Ù?Ù? Ø¨Ø±Ø±Ø³Û? Ø±Ø§ Ø¯Ø± Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Ù?Ø¯ ØªØ§ Ø¯Ù?Ú¯Ø± Ø§Ù?Ù? Ø§Ø®Ø·Ø§Ø± Ø±Ø§ Ø¯Ø±Ù?Ø§Ù?Øª Ù?Ú©Ù?Ù?Ø¯.
 torbutton.popup.test.ff3_notice = Ø¨Ø± Ø±Ù?Û? OK Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯ ØªØ§ ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø¢Ø²Ù?Ø§Ù?Ø´ Ø´Ù?Ø¯. Ø§Ù?Ù? Ø¢Ø²Ù?Ø§Ù?Ø´ Ø¯Ø± Ù¾Ø³ Ø¶Ù?Ù?Ù?Ù? Ø§ØªÙ?Ø§Ù? Ù?Ù? Ø§Ù?ØªØ¯. Ù?Ø·Ù?Ø§ ØµØ¨Ù?Ø± Ø¨Ø§Ø´Ù?Ø¯.
-torbutton.panel.label.verified = ØªÙ?Ø±ØªØ§Ù?Ù?Ø¯ Ø´Ø¯
-torbutton.popup.test.auto_failed = ØªØ³Øª Ø®Ù?Ø¯Ú©Ø§Ø± Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø±Ø¨Ø§ Ø§Ø®Ø·Ø§Ø± Ù?Ù?Ø§Ø¬Ù? Ø´Ø¯.\n\nØ¢Ù?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Ù? Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¢Ù? Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø?
-torbutton.prefs.recommended = (ØªÙ?ØµÙ?Ù? Ø´Ø¯Ù?)
-torbutton.prefs.optional = (Ø§Ø®ØªÙ?Ø§Ø±Û?)
-torbutton.prefs.crucial = (Ø¨Ø³Ù?Ø§Ø± Ù?Ù?Ù?)
 torbutton.popup.external.title = Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ Û?Ú© Ù?Ø§Û?Ù? Ù?Ù?Ø¹ Ø¨Û?Ø±Ù?Ù?Û? Ø¯Ø§Ù?Ù?Ù?Ø¯ Ø´Ù?Ø¯Ø?
 torbutton.popup.external.app = Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ù?Û?ØªÙ?Ø§Ù?Ø¯ Ø§Û?Ù? Ù?Ø§Û?Ù? Ø±Ø§ Ù?Ù?Ø§Û?Ø´ Ø¯Ù?Ø¯Ø? Ù?Ø§Ø²Ù? Ø§Ø³Øª ØªØ§ Ø¨Ø§ Ø¨Ø±Ù?Ø§Ù?Ù? Ø¯Û?Ú¯Ø±Û? Ø¢Ù? Ø±Ø§ Ø¨Ø§Ø² Ú©Ù?Û?Ø¯.\n
 torbutton.popup.external.note = Ø¨Ø±Ø®Û? Ø§Ø² Ø§Ù?Ù?Ø§Ø¹ Ù?Ø§Û?Ù?Ù?Ø§Ø? Ø¨Ø§Ø¹Ø« Ù?Û?Ø´Ù?Ù?Ø¯ Ú©Ù? Ø¨Ø±Ù?Ø§Ù?Ù? Ù?Ø§ Ø¨Ø¯Ù?Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² "ØªØ±" Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ù?ØªØµÙ? Ø´Ù?Ù?Ø¯.\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø§Û?Ù?
 torbutton.popup.cancel = Ù?ØºÙ?
 torbutton.popup.dontask = Ø§Ø² Ø§Û?Ù? Ù¾Ø³Ø?  Ù?Ø§Û?Ù?Ù?Ø§ Ø¨Ù? Ø·Ù?Ø± Ø®Ù?Ø¯Ú©Ø§Ø± Ø¯Ø§Ù?Ù?Ù?Ø¯ Ø´Ù?Ø¯.
 torbutton.popup.test.no_http_proxy = Ø¢Ø²Ù?Ù?Ù? Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø±: Ù¾Ø±Ø§Ú©Ø³Û? HTTP Ù?ØÙ?Û? Ù?Ø§Ø¨Ù? Ø¯Ø³ØªØ±Ø³Û? Ù?Û?Ø³Øª. Ø¢Û?Ø§ Ù¾Ù?Ù?Û?Ù¾Ù? Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ø§Ø¬Ø±Ø§ Ø´Ø¯Ù? Ø§Ø³ØªØ?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Ø§Ø² Ø§Û?Ù? Ù¾Ø³Ø? Ø¨Ø±Ø§Û? Ù?Ù?Û?Ø´Ù? Ø§Û?Ù? Ø§Ù?Ø¯Ø§Ù? ØµÙ?Ø±Øª Ú¯Û?Ø±Ø¯.
-torbutton.popup.redirect = Ø¹Ø·Ù? Ù?Ø¬Ø¯Ø¯ Ø¨Ù? Ù?Ø³Û?Ø± Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø±
-torbutton.popup.no_redirect = Ø¹Ø¯Ù? Ø¹Ø·Ù? Ù?Ø¬Ø¯Ø¯ Ø¨Ù? Ù?Ø³Û?Ø± Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø±
 torbutton.popup.prompted_language = Ø¨Ø±Ø§Û? ØÙ?Ø§Ø¸Øª Ø¨Ù?Ø´ØªØ± Ø§Ø² ØØ±Ù?Ù? Ø®ØµÙ?ØµÛ? Ø´Ù?Ø§Ø? Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ù?Û?â??ØªÙ?Ø§Ù?Ø¯ Ù?Ø³Ø®Ù? Ø§Ù?Ú¯Ù?Ù?Ø³Û? ØµÙ?ØØ§Øª Ù?Ø¨ Ø±Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ù?Ø¯. Ø§Ù?Ù? Ù?Ù?Ø¶Ù?Ø¹ Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ø§Ø¹Ø« Ø´Ù?Ø¯ ØµÙ?ØÙ?â??Ù?Ø§Û?Û? Ø±Ø§ Ú©Ù? ØªØ±Ø¬Û?Ø Ù?Û?Ø¯Ù?Û?Ø¯ Ø¨Ù? Ø²Ø¨Ø§Ù? Ù?Ø§Ø¯Ø±Û? Ø®Ù?Ø¯ Ø¨Ø®Ù?Ø§Ù?Ù?Ø¯Ø? Ø¯Ø± Ø¹Ù?Ø¶ Ø¨Ù? Ø§Ù?Ú¯Ù?Ù?Ø³Û? Ù?Ù?Ø§Ù?Ø´ Ø¯Ø§Ø¯Ù? Ø´Ù?Ù?Ø¯.\n\nØ¢Ù?Ø§ Ø¨Ø§ Ø§Ù?Ù? Ù?Ø¬Ù?Ø¯ Ù?Û?â??Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¨Ø±Ø§Û? ØÙ?Ø§Ø¸Øª Ø¨Ù?Ø´ØªØ± Ø§Ø² ØØ±Ù?Ù? Ø®ØµÙ?ØµÛ? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù?Ø³Ø®Ù? Ø§Ù?Ú¯Ù?Ù?Ø³Û? ØµÙ?ØØ§Øª Ø±Ø§ Ø¨Ø¯Ù?Ù?Ø¯Ø?
 torbutton.popup.no_newnym = Torbutton Ù?Ù?Û? ØªÙ?Ø§Ù?Ø¯ Ø¨Ù? Ø´Ù?Ø§ Û?Ú© Ø´Ù?Ø§Ø³Ù? Ø¬Ø¯Û?Ø¯ Ø§Ù?Ù? Ø¨Ø¯Ù?Ø¯. Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ù¾Ù?Ø±Øª Ú©Ù?ØªØ±Ù? Ù?Û?Ø¯Ø§Ù?Û?Ø§ Ø§Ù?Ú©Ø§Ù? Ù¾Ø°Û?Ø± Ù?Û?Ø³Øª.\n\n Ø¢Û?Ø§ Ø´Ù?Ø§ Ø¯Ø± ØØ§Ù? Ø§Ø¬Ø±Ø§ Ø¨Ø³ØªÙ? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø±Û? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ù?Ø³ØªÛ?Ø¯Ø?
-torbutton.popup.use_tbb = Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯  Ø´Ù?Ø§ Ø¯Ø± ØØ§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Torbutton  Ø¨Ø§ Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ù?Ø³ØªÛ?Ø¯Ø? Ú©Ù? Ø¯Û?Ú¯Ø± Ø¨Ù? Ø¹Ù?Ù?Ø§Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù? ØªÙ?Ù?Û? Ù?Ù?Û? Ø´Ù?Ø¯.\n\n Ø¯Ø± Ø¹Ù?Ø¶ Ø? Ù?Ø§ ØªÙ?ØµÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? Ú©Ù? Ø¢Ø®Ø±Û?Ù? Ø¨Ø³ØªÙ? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø±Û? Ù?Ø±Ù?Ø±Ú¯Ø± Tor  Ø§Ø² Ø·Ø±Û?Ù? Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? gettor@xxxxxxxxxxxxxx Û?Ø§ Ø¨Ø§ Ø¯Ø§Ù?Ù?Ù?Ø¯ Ø¢Ù? Ø±Ø§ Ø¯Ø± Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ø¨Ø¯Ø³Øª Ø¢Ù?Ø±Û?Ø¯:
 torbutton.popup.pref_error = Torbutton  Ù?Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ ØªÙ?Ø¸Û?Ù?Ø§Øª Ø±Ø§ Ø¯Ø± Ø¯Ø§Û?Ø±Ú©ØªÙ?Ø±Û? Ù?Ø´Ø®ØµØ§Øª Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø±Ø§ Ø¨Ù? Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û? Ú©Ù?Ø¯
 torbutton.popup.permission_denied = Ù?Ø·Ù?Ø§ Û?Ú©Û? Ø§Ø² Ø¯Ù? ØªÙ?Ø¸Û?Ù? Ù?Ø¬Ø¯Ø¯ Ù?Ø¬Ù?Ø² Ø¯Ø§Û?Ø±Ú©ØªÙ?Ø±Û? Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ù? Û?Ø§ Ú©Ù¾Û? Ø¢Ù? Ø±Ø§ Ø¨Ù? Û?Ú© Ù?Ú©Ø§Ù? Ø¬Ø¯Û?Ø¯.
 torbutton.popup.device_full = Ø¯Û?Ø³Ú© Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Ù¾Ø± Ø´Ø¯Ù? Ø§Ø³Øª. Ù?Ø·Ù?Ø§ Ù?Ù?Ø¯Ø§Ø±Û? Ù?Ø¶Ø§ Ø®Ø§Ù?Û? Ú©Ù?Û?Ø¯ Û?Ø§ ØªÙ?Ø± Ø±Ø§ Ø¨Ù? Ù?Ú©Ø§Ù? Ø¬Ø¯Û?Ø¯Û? Ø§Ù?ØªÙ?Ø§Ù? Ø¯Ù?Û?Ø¯.
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 36e718f..4c11024 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Ota Tor kÃ¤yttÃ¶Ã¶n
-torbutton.button.tooltip.enabled = Poista Tor kÃ¤ytÃ¶stÃ¤.
 torbutton.panel.tooltip.disabled = KÃ¤ynnistÃ¤ Tor napsauttamalla.
 torbutton.panel.tooltip.enabled = Poista Tor kÃ¤ytÃ¶stÃ¤ napsauttamalla.
-torbutton.panel.plugins.disabled = Salli lisÃ¤osat napsauttamalla
-torbutton.panel.plugins.enabled = EstÃ¤ lisÃ¤osat napsauttamalla
 torbutton.panel.label.disabled = Tor pois kÃ¤ytÃ¶stÃ¤.
 torbutton.panel.label.enabled = Tor kÃ¤ytÃ¶ssÃ¤.
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbuttonin lisÃ¤Ã¤ painikkeen, jolla voi muokata Torin asetuksia sekÃ¤ poistaa nopeasti ja helposti selaustiedot.
-torbutton.popup.history.warning = Torbutton esti vÃ¤lilehden lataamisen joka oli avattu eri Tor-tilassa.\n\nKyseessÃ¤ on Firefox Bug 409737 ja 417869.\n\nJos tÃ¤mÃ¤ nÃ¤yttÃ¤Ã¤ tapahtuvan ilman syytÃ¤, jokin vÃ¤lilehdistÃ¤ pyrkii lataamaan itsensÃ¤ taustalla, ja se estettiin.\n\nLadataksesi vÃ¤lilehden tÃ¤ssÃ¤ Tor-tilassa, paina 'enteriÃ¤' selaimen osoiterivillÃ¤ (navigointipalkissa).\n\n
-torbutton.popup.plugin.warning = Torbutton esti lisÃ¤osan lataamisen Tor-tilassa.\n\nKÃ¤ytÃ¤ Save-As toimintoa.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton huomautus: Vaikuttaa ettÃ¤ sinulla ei ole itsemÃ¤Ã¤riteltyÃ¤ Sertifikaattien Tunnistusta. Sertifikaattien tarkistaminen on hidas prosessi ja hidastaa Tor- tilan vaihtamista. Haluaisitko poistaa tÃ¤mÃ¤n toiminnon kÃ¤ytÃ¶stÃ¤ nopeuttaaksesi toimintaa? (Jos et tiedÃ¤ mistÃ¤ on kyse, voit turvallisesti klikata OK)
-torbutton.popup.ff3.warning = Varoitus!\n\nTorbuttonin kÃ¤yttÃ¶ Firefox 3:ssa saattaa paljastaa aikavyÃ¶hykkeesi ja muita tietoja Torrin kautta.\n\nHaluatko siitÃ¤ huolimatta jatkaa?
-torbutton.popup.toggle.warning = Vaihda Tor tilaa tai kÃ¤ynnistÃ¤ uudestaan jotta muutokset astuvat voimaan.
 torbutton.popup.test.success = Tor-vÃ¤lityspalvelimen testaus onnistui!
 torbutton.popup.test.failure = Tor-vÃ¤lityspalvelimen testaus EPÃ?ONNISTUI! Tarkista vÃ¤lityspalvelimen ja Polipon asetukset.
 torbutton.popup.test.confirm_toggle = Viimeisin suoritettu Tor vÃ¤lityspalvelintesti epÃ¤onnistui.\n\nHaluatko siitÃ¤ huolimatta kÃ¤Ã¤ntÃ¤Ã¤ Torin pÃ¤Ã¤lle?\n\nHuom: Jos olet korjannut ongelman, voit ajaa testin uudestaan kÃ¤yttÃ¤mÃ¤llÃ¤ Torbutton Proxy Preferences ikkunaa, niin et enÃ¤Ã¤ saa tÃ¤tÃ¤ varoitusta uudestaan.
 torbutton.popup.test.ff3_notice = Klikkaa OK testataksesi Tor vÃ¤lityspalvelinasetukset. Testi tapahtuu taustalla, odota rauhassa, ilmoitus annetaan kuin testi on valmis.
-torbutton.panel.label.verified = Tor vahvistettu
-torbutton.popup.test.auto_failed = Automaattinen Tor vÃ¤lityspalvelimen testi ei onnistunut kÃ¤yttÃ¤mÃ¤Ã¤n Toria.\nHaluatko aktivoida Torin jokatapauksessa?
-torbutton.prefs.recommended = (suositeltu)
-torbutton.prefs.optional = (valinnainen)
-torbutton.prefs.crucial = (kriittinen)
 torbutton.popup.external.title = Ladataanko ulkopuolinen sisÃ¤ltÃ¶?
 torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n
 torbutton.popup.external.note = \nHUOM: Ulkoiset sovellukset eivÃ¤t lÃ¤htÃ¶kohtaisesti ole Tor turvallisia ja saattavat paljastaa identiteettisi!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = KÃ¤ynnistÃ¤ sovellus
 torbutton.popup.cancel = Peruuta
 torbutton.popup.dontask = Jatkossa kÃ¤ynnistÃ¤ aina sovellukset
 torbutton.popup.test.no_http_proxy = Tor vÃ¤lityspalvelintesti: Paikallista HTTP vÃ¤lityspalvelinta ei lÃ¶ydy. Onko polipo kÃ¤ynnissÃ¤?
-torbutton.popup.captcha.title = VÃ¤ltÃ¤ Google Captchat?
-torbutton.popup.captcha.ask = Torbutton havaitsi Google Captchan. Haluatko ettÃ¤ tÃ¤mÃ¤ kysely uudelleenohjataan toiselle hakukoneelle?
-torbutton.popup.captcha.always = Suorita tÃ¤mÃ¤ toimenpide joka kerta tÃ¤stÃ¤ eteenpÃ¤in
-torbutton.popup.redirect = Uudelleenohjaa
-torbutton.popup.no_redirect = Ã?lÃ¤ uudelleenohjaa
 torbutton.popup.prompted_language = Yksityisyytesi lisÃ¤Ã¤miseksi Torbutton voi pyytÃ¤Ã¤ webbisivuista englanninkielisen version. TÃ¤mÃ¤ saattaa aiheuttaa sen, ettÃ¤ webbisivut, jotka luet mieluiten Ã¤idinkielellÃ¤si, nÃ¤ytetÃ¤Ã¤n englanniksi.\n\nHaluatko pyytÃ¤Ã¤ webbisivut englanniksi yksityisyyden lisÃ¤Ã¤miseksi?
 torbutton.popup.no_newnym = Torbutton ei voi taata sinulle turvallisesti uutta identiteettiÃ¤. SillÃ¤ ei ole pÃ¤Ã¤syÃ¤ Tor-hallintaporttiin.\n\nOnko Tor Browser Bundle kÃ¤ytÃ¶ssÃ¤?
-torbutton.popup.use_tbb = NÃ¤yttÃ¤Ã¤ siltÃ¤, ettÃ¤ kÃ¤ytÃ¤t Torbuttonia Firefoxin kanssa, mitÃ¤ ei enÃ¤Ã¤ suositella turvallisena yhdistelmÃ¤nÃ¤.\n\nSen sijaan suosittelemme, ettÃ¤ hankit uusimman Tor Browser Bundlen lÃ¤hettÃ¤mÃ¤llÃ¤ sÃ¤hkÃ¶postin osoitteeseen gettor@xxxxxxxxxxxxxx tai lataamalla sen osoitteesta:
 torbutton.popup.pref_error = Torbutton ei voi pÃ¤ivittÃ¤Ã¤ asetuksia Tor Browserin profiilihakemistossa.
 torbutton.popup.permission_denied = Aseta Tor Browserin hakemiston kÃ¤yttÃ¶oikeudet uusiksi tai kopioi se uuteen sijaintiin.
 torbutton.popup.device_full = Levy nÃ¤yttÃ¤isi olevan tÃ¤ysi. Vapauta tilaa tai siirrÃ¤ Tor Browser uudelle laitteelle.
diff --git a/src/chrome/locale/fil/torbutton.properties b/src/chrome/locale/fil/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/fil/torbutton.properties
+++ b/src/chrome/locale/fil/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/fo/torbutton.properties b/src/chrome/locale/fo/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/fo/torbutton.properties
+++ b/src/chrome/locale/fo/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index e5161e2..5e5a808 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Activer Tor
-torbutton.button.tooltip.enabled = DÃ©sactiver Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP inconnue
 torbutton.circuit_display.onion_site = Site onion
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Pays inconnu
 torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenÃªtre soit moins distinctive, et ainsi rÃ©duire la capacitÃ© des personnes Ã  vous repÃ©rer en ligne.
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour dÃ©sactiver Tor
-torbutton.panel.plugins.disabled = Cliquer pour activer les plugins
-torbutton.panel.plugins.enabled = Cliquer pour dÃ©sactiver les plugins
 torbutton.panel.label.disabled = Tor Inactif
 torbutton.panel.label.enabled = Tor Actif
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton fournit un bouton pour configurer les paramÃ¨tres de Tor et nettoie rapidement et facilement les donnÃ©es de navigation privÃ©e.
-torbutton.popup.history.warning = Torbutton a bloquÃ© l'activitÃ© provenant d'un onglet ouvert dans un Ã©tat Tor diffÃ©rent.\n\nCeci permet de contourner les bogues Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaÃ®tre sans raison, un de vos onglets essaie de se recharger en l'arriÃ¨re-plan, et a Ã©tÃ© bloquÃ©.\n\nAfin de recharger l'onglet dans cet Ã©tat Tor, appuyer sur Â« EntrÃ©e Â» dans le champ URL.\n\n
-torbutton.popup.plugin.warning = Torbutton a bloquÃ© le chargement direct par Tor du contenu du plugin.\n\nUtiliser plutÃ´t la fonction Enregistrer sous.\n\n
-torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'AutoritÃ© personnalisÃ©. Examiner la liste des Certificats d'AutoritÃ© est une opÃ©ration lente qui ralentit la bascule vers Tor. Voulez-vous dÃ©sactiver l'isolation des Certificats d'AutoritÃ© ? (Si vous ne comprenez pas, il est bon de rÃ©pondre OK)
-torbutton.popup.ff3.warning = Attention !\n\nTorbutton sur Firefox 3 est connu pour rÃ©vÃ©ler votre fuseau horaire et vos livemarks par Tor.\n\nVoulez vous continuer malgrÃ© tout?
-torbutton.popup.toggle.warning = Vous devez activer/dÃ©sactiver Tor ou redÃ©marrer pour que vos changements soient pris en compte.
 torbutton.popup.test.success = Test du proxy Tor rÃ©ussi !
 torbutton.popup.test.failure = Ã?CHEC du test du proxy Tor ! VÃ©rifiez les configurations du proxy et de Polipo.
 torbutton.popup.test.confirm_toggle = Le dernier test de proxy Tor a Ã©chouÃ©.\n\nEtes-vous sÃ»r de vouloir tout de mÃªme continuer?\n\nNote: Si vous avez reglÃ© le problÃ¨me, vous pouvez relancer le test dans la fenÃªtre des PrÃ©fÃ©rences du Proxy Torbutton afin de supprimer cet avertissement.
 torbutton.popup.test.ff3_notice = Cliquez sur OK pour tester vos paramÃ¨tres de proxy Tor. Ce test s'effectuera en tÃ¢che de fond. Merci de votre patience.
-torbutton.panel.label.verified = Tor VÃ©rifiÃ©
-torbutton.popup.test.auto_failed = Le test automatique du proxy Tor n'a pas rÃ©ussi Ã  utiliser Tor.\n\nÃ?tes vous sÃ»r de vouloir tout de mÃªme l'activer ?
-torbutton.prefs.recommended = (recommandÃ©)
-torbutton.prefs.optional = (facultatif)
-torbutton.prefs.crucial = (indispensable)
 torbutton.popup.external.title = TÃ©lÃ©charger un type de fichier externe
 torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application.
 torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions Ã  l'Internet sans passer par Tor pour certaines applications 
@@ -37,14 +23,8 @@ torbutton.popup.launch = TÃ©lÃ©charger le fichier
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = TÃ©lÃ©charger automatiquement Ã  partir de maintenant
 torbutton.popup.test.no_http_proxy = Test du proxy Tor : le proxy HTTP local est injoignable. Est-ce que Polipo fonctionne correctement ?
-torbutton.popup.captcha.title = Eviter les captchas (test permettant de diffÃ©rencier un utilisateur humain d'un ordinateur) de Google ?
-torbutton.popup.captcha.ask = Torbutton a dÃ©tectÃ© un captcha Google. Voulez-vous Ãªtre redirigÃ© vers un autre moteur de recherche pour cette recherche ?
-torbutton.popup.captcha.always = Toujours effectuer cette action Ã  partir de maintenant
-torbutton.popup.redirect = Rediriger
-torbutton.popup.no_redirect = Ne pas rediriger
 torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous prÃ©fÃ©rez lire dans votre langue prÃ©fÃ©rÃ©e pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais afin d'amÃ©liorer votre anonymat ?
 torbutton.popup.no_newnym = Torbutton ne peut pas dÃ©livrer une nouvelle identitÃ© de maniÃ¨re sÃ©curitaire. Il n'a pas accÃ¨s au port de contrÃ´le de Tor.\n\nUtilisez-vous le paquet du Navigateur Tor ?
-torbutton.popup.use_tbb = Il semble que vous utilisez Torbutton avec Firefox, ce qui n'est plus une configuration sÃ©curitaire recommandÃ©e.\n\nNous vous recommandons plutÃ´t d'obtenir le dernier paquet du Navigateur Tor en envoyant un courriel Ã  gettor@xxxxxxxxxxxxxx ou en le tÃ©lÃ©chargeant depuis l'URL suivante :
 torbutton.popup.pref_error = Torbutton ne peut pas mettre Ã  jour les prÃ©fÃ©rences dans le rÃ©pertoire du profil du Navigateur Tor.
 torbutton.popup.permission_denied = Merci de rÃ©initialiser les permissions du rÃ©pertoire du Navigateur Tor  ou de le copier dans un nouvel emplacement.
 torbutton.popup.device_full = Le disque semble Ãªtre plein. Merci de libÃ©rer de la place ou dÃ©placer le Navigateur Tor vers un nouveau pÃ©riphÃ©rique.
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/fy/torbutton.properties b/src/chrome/locale/fy/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/fy/torbutton.properties
+++ b/src/chrome/locale/fy/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index a7eaae5..c3abbac 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index a8a9c14..38489f9 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯ àª?àª°à«?
-torbutton.button.tooltip.enabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«?
 torbutton.panel.tooltip.disabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
 torbutton.panel.tooltip.enabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
-torbutton.panel.plugins.disabled = àªªà«?àª²àª?àª?àª¨à«?àª¸ àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
-torbutton.panel.plugins.enabled = àªªà«?àª²àª?àª?àª¨à«?àª¸ àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
 torbutton.panel.label.disabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯
 torbutton.panel.label.enabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = àª?à«?àª° àªªà«?àª°à«?àª?à«?àª¸à«? àª?àª?àª¾àª¸àª£à«? àª¸àª«àª³!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (àª¸à«?àª?àªµà«?àª²)
-torbutton.prefs.optional = (àªµà«?àª?àª²à«?àªªàª¿àª?)
-torbutton.prefs.crucial = (àª?àª°à«?àª°à«?)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¶àª°à«? àª?àª°à«?
 torbutton.popup.cancel = àª°àª¦à«? àª?àª°à«?
 torbutton.popup.dontask = àª¹àªµà«? àªªàª?à«? àª¹àª?àª®à«?àª¶àª¾ àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¶àª°à«? àª?àª°à«?
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = àª?à«?àª?àª² àª?à«?àªªà«?àª?àª¾ àª?àªµàª?àª£àª¶à«??
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = àª¹àªµà«? àªªàª?à«? àª¹àª?àª®à«?àª¶àª¾ àª? àª?à«?àª°àª¿àª¯àª¾ àª?àª°àª¶à«?
-torbutton.popup.redirect = àª¬à«?àª?à«? àª®à«?àª?àª²à«?
-torbutton.popup.no_redirect = àª¬à«?àª?à«? àª¨ àª®à«?àª?àª²à«?
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/gun/torbutton.properties b/src/chrome/locale/gun/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/gun/torbutton.properties
+++ b/src/chrome/locale/gun/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ha/torbutton.properties b/src/chrome/locale/ha/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ha/torbutton.properties
+++ b/src/chrome/locale/ha/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index da7328c..f079f06 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = ×?×¤×¢×? ×?×ª Tor
-torbutton.button.tooltip.enabled = ×?×?×? ×?×ª Tor
 torbutton.panel.tooltip.disabled = ×?×?×¥ ×?×?×¤×¢×?×ª Tor
 torbutton.panel.tooltip.enabled = ×?×?×¥ ×?×?×?×?×?×? Tor
-torbutton.panel.plugins.disabled = ×?×?×¥ ×?×?×¤×¢×?×ª ×ª×?×¡×¤×?×?
-torbutton.panel.plugins.enabled = ×?×?×¥ ×?×?×?×?×?×? ×ª×?×¡×¤×?×?
 torbutton.panel.label.disabled = Tor ×?×?×?×?×?
 torbutton.panel.label.enabled = Tor ×¤×?×¢×?
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton ×?×¡×? ×¤×¢×?×?×?×ª ×?×?×?×? ×©× ×?×¢×? ×?×?×¦×? ×?×?×¨ ×©×? Tor.\n\n×¤×¢×?×?×? ×?×? × ×?×¢×?×? ×?×¢×§×?×£ ×?×ª ×?×?×?×?×?×? 409737 ×?-417869 ×?×¤×?×?×¨×¤×?×§×¡.\n\n×?×? ×?×?×?×¢×? ×?×? × ×¨×?×?×ª ×?×?×? ×?×? ×¡×?×?×?, ×?×ª×?×? ×©×?×?×? ×?×?×ª×¨×?×? ×?× ×¡×? ×?×?×¢×?×? ×?×ª ×¢×¦×?×? ×?×?×?×© ×?×¨×§×¢, ×?×¤×¢×?×?×? ×?×? × ×?×¡×?×?.\n\n×?×?×? ×?×?×¢×?×? ×?×?×?×© ×?×ª×¨ ×?×¢×?×¨×ª Tor, ×?×?×¥ ×¢×? ×?× ×?×¨ ×?×©×?×¨×ª ×?×?×ª×?×?×ª ×©×?×?.\n\n
-torbutton.popup.plugin.warning = Torbutton ×?×¡×? ×?×¢×?× ×? ×©×? ×ª×?×?×? ×ª×?×¡×¤×?×?.\n\n×?× ×? ×?×©×ª×?×© ×?×?×¤×©×¨×?×ª "×©×?×?×¨ ×?×©×?" ×?×?×§×?×?.\n\n
-torbutton.popup.confirm_ca_certs = ×?×¢×¨×ª Torbutton: × ×¨×?×? ×©×?×?×? ×?×? ×¨×©×?×?×?×ª ×?×?×©×?×¨×?×? ×?×?×ª×?×?×?×? ×?×?×©×?×ª. ×?×?×?× ×ª ×¨×©×?×?×ª ×?×¨×©×?×?×?×ª ×?×?×? ×¤×¢×?×?×? ×?×?×?×?×ª ×?×©×¨ ×?×?×?×?×? ×?×ª Tor. ×?×?×? ×?×ª×? ×¨×?×¦×? ×?×?×?×? ×?×ª ×?×?×?×?×?×? ×©×? ×ª×¢×?×?×?×ª ×?×?×¡×?×?×?×ª? (×?×? ×?×ª×? ×?×? ×?×?×?× ×?×? ×?×ª ×?×?, ×?×? ×?×?×?×? ×?×?×?×?×¥ ×¢×? ×?×?×©×?×¨)
-torbutton.popup.ff3.warning = ×?×?×?×¨×?!\n\nTorbutton ×?×?×¤×?×¤×? Firefox 3 ×?×?×?×¢ ×?×?×?×?×¤×ª ×?×?×?×¢ ×?×?×?×?×ª ×?×?×?×¨ ×?×?×? ×?×¨×? Tor.\n\n×?×?×? ×?×¨×¦×?× ×? ×?×?×?×©×?×? ×?×?×¨×?×ª ×?×?×ª?
-torbutton.popup.toggle.warning = ×¢×?×?×? ×?×?×¤×¢×?×? ×?×? ×?×?×ª×?×? ×?×ª Tor ×¢×? ×?× ×ª ×©×?×?×?×?×¨×?×ª ×?×?× ×¡×? ×?×ª×?×§×¤×?.
 torbutton.popup.test.success = ×?×?×?×§×ª ×?×¤×¨×?×§×¡×? ×©×? Tor ×¢×?×¨×? ×?×?×¦×?×?×?!
 torbutton.popup.test.failure = ×?×?×?×§×ª ×?×¤×¨×?×§×¡×? ×©×? Tor × ×?×©×?×?! ×?×?×?×§ ×?×ª ×?×?×?×¨×?×ª ×?×¤×¨×?×§×¡×? ×?-Polipo.
 torbutton.popup.test.confirm_toggle = ×?×?×?×§×ª ×?×¤×¨×?×§×¡×? ×?×?×?×¨×?× ×? × ×?×©×?×? ×?×©×?×?×?×© ×?-Tor.\n\n×?×?×? ×?×ª×? ×?×?×?×? ×©×?×¨×¦×?× ×? ×?×?×?×©×?×? ×?×?×? ×?×§×¨×??\n\n×?×¢×¨×?: ×?×? ×ª×?×§× ×ª ×?×ª ×?×?×¢×?×?×?, ×?×ª×? ×?×?×?×? ×?×?×?×?×¨ ×¢×? ×?×?×?×?×§×? ×?×ª×¤×¨×?×? ×?×?×?×¨×?×ª ×?×¤×¨×?×§×¡×? ×©×? Torbutton ×?×?×? ×?×?×?×? ×?×?×?×¢×? ×?×?.
 torbutton.popup.test.ff3_notice = ×?×?×¥ ×?×?×©×?×¨ ×?×?×? ×?×?×?×?×§ ×?×ª ×?×?×?×¨×?×ª ×?×¤×¨×?×§×¡×? ×©×? Tor. ×?×?×?×§×? ×?×? ×ª×ª×?×¦×¢ ×?×¨×§×¢. ×?× ×? ×?×?×ª×? ×?×¡×?×?× ×?×ª.
-torbutton.panel.label.verified = Tor ×?×?×?×?×ª
-torbutton.popup.test.auto_failed = ×?×?×?×§×ª ×?×¤×¨×?×§×¡×? × ×?×©×?×? ×?×©×?×?×?×© ×?-Tor.\n\n×?×?×? ×?×ª×? ×?×?×?×? ×©×?×¨×¦×?× ×? ×?×?×?×©×?×? ×?×?×? ×?×§×¨×??
-torbutton.prefs.recommended = (×?×?×?×?×¥)
-torbutton.prefs.optional = (×?×?×¤×¦×?×?× ×?×?×?)
-torbutton.prefs.crucial = (×?×©×?×?!)
 torbutton.popup.external.title = ×?×?×¢×?×? ×ª×?×?×? ×?×?×¦×?× ×??
 torbutton.popup.external.app = ×ª×?×?× ×? ×?×?×¦×?× ×?×ª × ×?×?×¦×? ×?×?×? ×?×?×¤×? ×?:\n
 torbutton.popup.external.note = \n\n×©×?×? ×?×?: ×ª×?×?× ×?×ª ×?×?×¦×?× ×?×?×ª ×?×?× ×? ×?×?×?×?×?×ª ×?×¢×©×?×?×?×ª ×?×¤×?×?×¢ ×?×¤×¨×?×?×?×ª ×©×?×?!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = ×?×¤×¢×? ×ª×?×?× ×?
 torbutton.popup.cancel = ×?×?×?×?×?
 torbutton.popup.dontask = ×ª×?×?×? ×?×¤×¢×? ×?×ª ×?×ª×?×?× ×? ×?×¢×ª×? ×?×?×?×?×?
 torbutton.popup.test.no_http_proxy = ×?×?×?×§×ª ×¤×¨×?×§×¡×? ×©×? Tor: ×¤×¨×?×§×¡×? HTTP ×?×§×?×?×? ×?×?× ×? ×?×?×?×?. ×?×?×? Polipo ×¤×?×¢×? ×?×¨×?×?×??
-torbutton.popup.captcha.title = ×?×?×?× ×¢ ×?×?×?×?×?×? ×ª×?×?× ×? ×©×? ×?×?×?×??
-torbutton.popup.captcha.ask = Torbutton ×?×?×ª×¨ ×?×?×?×?×? ×ª×?×?× ×? ×©×? ×?×?×?×?. ×?×?×? ×?×¨×¦×?× ×? ×?×¢×?×?×¨ ×?×?× ×?×¢ ×?×?×¤×?×© ×?×?×¨?
-torbutton.popup.captcha.always = ×?×¦×¢ ×ª×?×?×? ×¤×¢×?×?×? ×?×? ×?×¢×ª×? ×?×?×?×?×?
-torbutton.popup.redirect = ×¢×?×?×¨
-torbutton.popup.no_redirect = ×?×? ×ª×¢×?×?×¨
 torbutton.popup.prompted_language = ×¢×? ×?× ×ª ×?×?×?×?×ª ×?×¤×¨×?×?×?×ª ×?×?×?×?×¨×ª, Torbutton ×?×?×?×? ×?×?×§×© ×?×ª ×?×?×¨×¡×? ×?×?× ×?×?×?×ª ×©×? ×?×ª×¨×? ×?×?× ×?×¨× ×?. ×?×? ×¢×©×?×? ×?×?×¨×?×? ×?×?×? ×©×?×ª×¨×?×? ×?×?×?×?×? ×?×ª×? ×¨×?×?×? ×?×?×¦×?×? ×?×?× ×?×?×?×ª.\n\n×?×?×? ×?×¨×¦×?× ×? ×?×?×§×© ×?×¦×¤×?×ª ×?×?×ª×¨×?×? ×?×?× ×?×?×?×ª ×?×¦×?×¨×? ×¤×¨×?×?×?×ª ×?×?×?×?×¨×ª?
 torbutton.popup.no_newnym = Torbutton ×?×?× ×? ×?×¡×?×?×? ×?×¡×¤×§ ×?×? ×?×?×?×ª ×?×?×©×? ×?×?×?×?×?×?×?. ×?×?×? ×?×?×©×? ×?×? Tor Control Port.\n\n×?×?×? ×?×ª×? ×?×¤×¢×?×? ×?×ª 
-torbutton.popup.use_tbb = × ×¨×?×? ×©×?×ª×? ×?×©×ª×?×© ×?-Torbutton ×¢×? ×¤×?×?×¨×¤×?×§×¡, ×?×?×¨ ×©×?×?× ×? ×?×?×?×?×¥ ×¢×?×?.\n\n×?×?×§×?×?, ×?× ×? ×?×?×?×?×¦×?×? ×©×ª×©×ª×?×© ×?×?×¨×?×? ×?×?×?×¨×?× ×? ×©×? Tor Browser Bundle, ×?×?×ª×? ×ª×?×?×? ×?×?×©×?×? ×?×?×?×¦×¢×?×ª ×?×?×?"×? ×?×?×ª×?×?×ª gettor@xxxxxxxxxxxxxx ×?×? ×?×?×?×¨×?×? ×?×?×?×ª×?×?×ª: 
 torbutton.popup.pref_error = Torbutton ×?×?× ×? ×?×?×?×? ×?×¢×?×?×? ×?×ª ×?×?×¢×?×¤×?×ª ×?×ª×?×§×?×ª ×?×¤×¨×?×¤×?×?.
 torbutton.popup.permission_denied = ×?× ×? ×§×?×¢ ×?×¨×©×?×?×ª ×?×?×©×?×ª ×?×ª×?×§×?×?×? ×?×? × ×?×¦×? ×?×¤×?×¤×? Tor ×?×? ×?×¢×ª×§ ×?×?×ª×? ×?×?×?×§×?×? ×?×?×©.
 torbutton.popup.device_full = ×?×?×?×¡×§ × ×¨×?×? ×?×?×? ×©×?×? ×?×?×¡×?×? ×¤× ×?×?. ×?× ×? ×¤× ×? ×?×§×?×? ×?×? ×?×¢×?×¨ ×?×ª ×?×¤×?×¤×? Tor ×?×?×?×§×?×? ×?×?×©.
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index 07a75bf..249ae86 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = à¤°à¤¦à¥?à¤¦ à¤?à¤°à¥?à¤? 
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 9b1174c..2b77fee 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = OmoguÄ?i Tor
-torbutton.button.tooltip.enabled = OnemoguÄ?i Tor
 torbutton.panel.tooltip.disabled = Kliknite da biste omoguÄ?ili Tor
 torbutton.panel.tooltip.enabled = Kliknite da biste onemoguÄ?ili Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor onemoguÄ?en
 torbutton.panel.label.enabled = Tor omoguÄ?en
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ht/torbutton.properties b/src/chrome/locale/ht/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ht/torbutton.properties
+++ b/src/chrome/locale/ht/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index 8df628f..fc68af6 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Tor bekapcsolÃ¡sa
-torbutton.button.tooltip.enabled = Tor kikapcsolÃ¡sa
 torbutton.panel.tooltip.disabled = Kattintson rÃ¡ a Tor bekapcsolÃ¡sÃ¡hoz
 torbutton.panel.tooltip.enabled = Kattintson rÃ¡ a Tor kikapcsolÃ¡sÃ¡hoz
-torbutton.panel.plugins.disabled = Kattintson rÃ¡ a bÅ?vÃtmÃ©nyek engedÃ©lyezÃ©sÃ©hez
-torbutton.panel.plugins.enabled = Kattintson rÃ¡ a bÅ?vÃtmÃ©nyek tiltÃ¡sÃ¡hoz
 torbutton.panel.label.disabled = Tor kikapcsolva
 torbutton.panel.label.enabled = Tor bekapcsolva
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = A Torbutton egy gombot biztosÃt a Tor beÃ¡llÃtÃ¡sok mÃ³dosÃtÃ¡sÃ¡hoz Ã©s a gyors Ã©s kÃ¶nnyÅ± takarÃtÃ¡sÃ¡hoz a privÃ¡t bÃ¶ngÃ©szÃ©si adatoknak.
-torbutton.popup.history.warning = Torbutton blokkolt egy tevÃ©kenysÃ©get Tor nÃ©lkÃ¼li Ã¡llapotÃº fÃ¼lÃ¶n.\n\nEz egy kerÃ¼lÅ? megoldÃ¡s a Firefox #409737 Ã©s #417869 hibÃ¡ira.\n\nHa ez az elÅ?ugrÃ³ ablak ok nÃ©lkÃ¼linek tÅ±nik, akkor valamelyik fÃ¼lÃ¶n az egyik oldal megprÃ³bÃ¡lta magÃ¡t ÃºjratÃ¶lteni, Ã©s ez blokklÃ¡sra kerÃ¼lt.\n\nAz oldal ÃºjratÃ¶ltÃ©sÃ©hez ebben a Tor Ã¡llapotban nyomjon 'Enter'-t a a cÃmsorÃ¡ban ennek a fÃ¼lnek.\n
-torbutton.popup.plugin.warning = A Torbutton blokkolta a kÃ¶zvetlen Tor letÃ¶ltÃ©sÃ©t egy beÃ©pÃ¼lÅ? modul tartalomnak.\n\nHasznÃ¡lja helyette a MentÃ©s mÃ¡skÃ©nt opciÃ³t.\n
-torbutton.popup.confirm_ca_certs = Torbutton MegjegyzÃ©s: Ã?gy tÅ±nik, hogy nincs egyÃ©ni hitelesÃtÃ©sszolgÃ¡ltatÃ³ listÃ¡ja. A HitelesÃtÃ©s szolgÃ¡ltatÃ³k listÃ¡jÃ¡nak vizsgÃ¡lata lassÃº esemÃ©ny, Ã©s lelassÃtja a Tor-t a vÃ¡ltÃ¡skor. SzeretnÃ© kikapcsolni a HitelesÃtÃ©sszolgÃ¡ltatÃ³k izolÃ¡ciÃ³jÃ¡t? (Ha nem Ã©rti ezt, akkor nyugodtan kattintson az OK gombra)
-torbutton.popup.ff3.warning = Figyelem!\n\nIsmert hiba a Torbutton Firefox 3 verziÃ³n futtatÃ¡sa esetÃ©n, hogy kiszivÃ¡rog az idÅ?zÃ³na, Ã©s a livemarks adat Tor-on keresztÃ¼l.\n\nEnnek ellenÃ©re folytatni akarja?
-torbutton.popup.toggle.warning = VÃ¡ltania kell tTor Ã¡llapotot vagy ÃºjraindÃtania azt, hogy a beÃ¡llÃtÃ¡sok megvÃ¡ltozÃ¡sai Ã©rvÃ©nyre jussanak
 torbutton.popup.test.success = A Tor proxy teszt sikeres!
 torbutton.popup.test.failure = Tor proxy teszt SIKERTELEN! EllenÅ?rizze a proxy Ã©s a Polipo beÃ¡llÃtÃ¡sokat.
 torbutton.popup.test.confirm_toggle = A legutÃ³bbi Tor proxy teszt nem tudta a Tor-t hasznÃ¡lni.\n\nBiztos benne, hogy mindenkÃ©ppen engedÃ©lyezi?\n\nMegjegyzÃ©s: Ha kijavÃtott a problÃ©mÃ¡t, akkor Ãºjra futtathatja a tesztet a Torbutton Proxy beÃ¡llÃtÃ¡sok ablakban, hogy megszÃ¼ntesse ezt a figyelmeztetÃ©st.
 torbutton.popup.test.ff3_notice = Kattintson az OK gombra, a Tor proxy beÃ¡llÃtÃ¡sok tesztelÃ©sÃ©hez. Ez a teszt a hÃ¡ttÃ©rben tÃ¶rtÃ©nik. KÃ©rjÃ¼k, legyen tÃ¼relmes.
-torbutton.panel.label.verified = A Tor ellenÅ?rizve
-torbutton.popup.test.auto_failed = Az automatikus Tor proxy teszt nem tudta a Tor-t hasznÃ¡lni.\n\nBiztos benne, hogy mindenkÃ©ppen engedÃ©lyezi?
-torbutton.prefs.recommended = (ajÃ¡nlott)
-torbutton.prefs.optional = (opcionÃ¡lis)
-torbutton.prefs.crucial = (kritikus)
 torbutton.popup.external.title = KÃ¼lsÅ? tartalom betÃ¶ltÃ©se?
 torbutton.popup.external.app = Egy kÃ¼lsÅ? alkalmazÃ¡s szÃ¼ksÃ©ges a kezelÃ©shez:\n
 torbutton.popup.external.note = \nMEGJEGYZÃ?S: A kÃ¼lsÅ? alkalmazÃ¡sok alaphelyzetben NEM biztonsÃ¡gosak Ã©s felfedhetik kilÃ©tÃ©t.\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = AlkalmazÃ¡s indÃtÃ¡sa
 torbutton.popup.cancel = MÃ©gse
 torbutton.popup.dontask = Mindig indÃtsa az alkalmazÃ¡sokat mostantÃ³l
 torbutton.popup.test.no_http_proxy = Tor proxy teszt: A helyi HTTP Proxy elÃ©rhetetlen. A Polipo megfelelÅ?en mÅ±kÃ¶dik?
-torbutton.popup.captcha.title = KerÃ¼lje a Google CAPTCHA-kat?
-torbutton.popup.captcha.ask = Torbutton Google Captcha-t Ã©szlelt. SzeretnÃ©, hogy Ã¡t legyen irÃ¡nyÃtva egy mÃ¡sik keresÅ?hÃ¶z, ezen lekÃ©rdezÃ©ssel?
-torbutton.popup.captcha.always = MostantÃ³l mindig ezt tegye
-torbutton.popup.redirect = IrÃ¡nyÃtson Ã¡t
-torbutton.popup.no_redirect = Ne irÃ¡nyÃtson Ã¡t
 torbutton.popup.prompted_language = A mÃ©g tÃ¶bb adatvÃ©delem Ã©rdekÃ©ben a Torbutton kÃ©rheti a weboldaltÃ³l, hogy angol nyelvÅ± oldalt szolgÃ¡ljon ki. Ez azt jelenti, hogy a sajÃ¡t nyelve helyet az oldal angolul jelenhet meg.\n\nSzeretnÃ© kÃ©rni a magasabb biztonsÃ¡g Ã©rdekÃ©ben az angol nyelvÅ± oldalak lekÃ©rÃ©sÃ©t?
 torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ã?j szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ? porthoz.\n\nNem a Tor bÃ¶ngÃ©szÅ? csomagot hasznÃ¡lja?
-torbutton.popup.use_tbb = Ã?gy tÅ±nik, hogy jelenleg Torbutton-t hasznÃ¡l Firefox bÃ¶ngÃ©szÅ?vel, ami mÃ¡r nem az ajÃ¡nlott biztonsÃ¡gos konfigurÃ¡ciÃ³.\n\nHelyette azt javasoljuk, hogy szerezze be a legfrissebb Tor BÃ¶ngÃ©szÅ? csomagot a gettor@xxxxxxxxxxxxxx cÃmre kÃ¼ldÃ¶tt emaillel vagy a kÃ¶vetkezÅ? cÃmrÅ?l tÃ¶rtÃ©nÅ? letÃ¶ltÃ©ssel:
 torbutton.popup.pref_error = A Torbutton nem tudja frissÃteni a beÃ¡llÃtÃ¡sokat a Tor bÃ¶ngÃ©szÅ? profil kÃ¶nyvtÃ¡rÃ¡ban.
 torbutton.popup.permission_denied = KÃ©rjÃ¼k, vagy Ã¡llÃtsa vissza a jogosultsÃ¡gokat a Tor Browser kÃ¶nyvtÃ¡rhoz, vagy mÃ¡solja azt egy Ãºj helyre.
 torbutton.popup.device_full = Ã?gy tÅ±nik, hogy a lemez megtelt. KÃ©rjÃ¼k, szabadÃtson fel helyet, vagy helyezze Ã¡t a Tor Browser-t egy mÃ¡sik hÃ¡ttÃ©rtÃ¡rolÃ³ra.
diff --git a/src/chrome/locale/hy/torbutton.properties b/src/chrome/locale/hy/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/hy/torbutton.properties
+++ b/src/chrome/locale/hy/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 1315a62..abaacb5 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Aktifkan Tor
-torbutton.button.tooltip.enabled = Nonaktifkan Tor
 torbutton.panel.tooltip.disabled = Klik untuk mengaktifkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
-torbutton.panel.plugins.disabled = Klik untuk mengaktifkan plugin
-torbutton.panel.plugins.enabled = Klik untuk menonaktifkan plugin
 torbutton.panel.label.disabled = Tor dinonaktifkan
 torbutton.panel.label.enabled = Tor diaktifkan
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton memblokir aktivitas dari sebuah tab yang dimuat dalam kondisi Tor yang berbeda.\n\nIni bekerja untuk bug 409737 dan 417869.\n\nApabila popup ini muncul tanpa sebab, salah satu tab Anda mencoba untuk memuat ulang sendiri di latar belakang, dan terblokir.\n\nUntuk memuat ulang tab pada kondisi Tor saat ini, tekan 'enter' pada kotak URL.\n\n
-torbutton.popup.plugin.warning = Torbutton memblokir pemuatan langsung atas konten plugin Tor.\n\nSilahkan Gunakan Save-As saja.\n\n
-torbutton.popup.confirm_ca_certs = Catatan Torbutton: Tampaknya Anda tidak memiliki Certificate Authorities yang disesuaikan. Memeriksa daftar Certificate Authorities merupakan proses yang lambat dan melambatkan peralihan Tor. Apakah Anda berkenan untuk menonaktifkan pengisolasian sertifikat Certificate Authorities? (Apabila Anda tidak paham, adalah aman untuk mengeklik OK)
-torbutton.popup.ff3.warning = Peringatan!\n\nTorbutton pada Firefox 3 diketahui membocorkan zona waktu Anda dan livermarks melalui Tor.\n\nApakah Anda tetap ingin meneruskan?
-torbutton.popup.toggle.warning = Anda perlu mengalihkan Tor atau merestart agar pengaturan Anda dapat dirasakan efeknya.
 torbutton.popup.test.success = Pengujian proxy Tor berhasil!
 torbutton.popup.test.failure = Pengujian proxy Tor GAGAL! Periksa pengaturan proxy dan polipo Anda.
 torbutton.popup.test.confirm_toggle = Pengujian proxy Tor terakhir gagal menggunakan Tor.\n\nApakah Anda yakin untuk tetap mengaktifkannya?\n\nCatatan: Apabila Anda telah memperbaiki masalahnya, Anda dapat melakukan pengujian ulang pada jendela Preferensi Proxy Tor untuk menghapus peringatan ini.
 torbutton.popup.test.ff3_notice = Klik OK untuk menguji pengaturan proxy Tor. Pengujian ini akan berjalan pada latar belakang. Mohon bersabar.
-torbutton.panel.label.verified = Tor Terverifikasi
-torbutton.popup.test.auto_failed = Pengujian proxy Tor otomatis gagal menggunakan Tor.\n\nApakah Anda yakin ingin mengaktifkannya?
-torbutton.prefs.recommended = (disarankan)
-torbutton.prefs.optional = (opsional)
-torbutton.prefs.crucial = (krusial)
 torbutton.popup.external.title = Muat konten eksternal?
 torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
 torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Luncurkan aplikasi.
 torbutton.popup.cancel = Batal
 torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
 torbutton.popup.test.no_http_proxy = Pengujian proxy Tor: Proxy HTTP lokal tidak dapat dijangkau. Apakah Polipo berjalan sebagaimana mestinya?
-torbutton.popup.captcha.title = Hindari Captcha Google?
-torbutton.popup.captcha.ask = Torbutton mendeteksi sebuah Captcha Google. Apakah Anda ingin beralih pada mesin pencari lainnya untuk pencarian kali ini?
-torbutton.popup.captcha.always = Selalu lakukan hal ini mulai dari sekarang
-torbutton.popup.redirect = Pemindahan jalur
-torbutton.popup.no_redirect = Jangan Pindahkan jalur
 torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â?? â?? Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik?
 torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. â??â?? Apakah Anda sedang menjalankan paket browser Tor?
-torbutton.popup.use_tbb = Tampaknya Anda menggunakan Torbutton dengan Firefox, yang mana bukan lagi merupakan konfigurasi aman yang direkomendasikan.â??â?? sebaliknya, Kami rekomendasikan Anda untuk mendapatkan paket browser Tor yang terbaru dengan mengirimkan email ke gettor@xxxxxxxxxxxxxx atau dengan mendownload melalui URL berikut:
 torbutton.popup.pref_error = Torbutton tidak dapat memperbarui preferensi di dalam petunjuk profil browser Tor.
 torbutton.popup.permission_denied = Silahkan reset izin petunjuk dari browser Tor atau copy ke lokasi baru
 torbutton.popup.device_full = Disk tampaknya sudah penuh. Harap kosongkan tempat atau pindahkan browser Tor ke alat baru.
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 761aabb..1e3e110 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = HÃ¦tta viÃ°
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index a7f6173..ef1dd41 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Attiva Tor
-torbutton.button.tooltip.enabled = Disattiva Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP sconosciuto
 torbutton.circuit_display.onion_site = sito Onion
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Paese sconosciuto
 torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, cosÃ¬ si riduce la possibilitÃ  di che tu sia tracciato in linea.
 torbutton.panel.tooltip.disabled = Fai clic per attivare Tor
 torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor
-torbutton.panel.plugins.disabled = Fai clic per attivare i plugin
-torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin
 torbutton.panel.label.disabled = Tor disattivato
 torbutton.panel.label.enabled = Tor attivato
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton fornisce un pulsante per configurare le impostazioni di Tor e rimuovere velocemente e facilmente i dati di navigazione privati.
-torbutton.popup.history.warning = Torbutton ha bloccato le attivitÃ  in una scheda caricata con un diverso stato Tor.\n\nQuesta operazione evita i Bug 409737 e 417869 di Firefox.\n\nSe questo messaggio popup appare senza motivo, una delle vostre schede Ã¨ stata bloccata perchÃ¨ sta tentando di autoricaricarsi in modo silenzioso.\n\nPer ricaricare la scheda in questo stato Tor, premere "invio" nella barra degli indirizzi.\n\n
-torbutton.popup.plugin.warning = Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
-torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority Ã¨ un'operazione lenta e rallenta l'attivazione/disattivazione di Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
-torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 divulga il tuo fuso orario ed i tuoi livemark via Tor.\n\nVuoi continuare ugualmente?
-torbutton.popup.toggle.warning = Devi attivare e disattivare Tor o riavviare per far sÃ¬ che le impostazioni abbiano effetto.
 torbutton.popup.test.success = Il test del proxy Tor ha avuto successo!
 torbutton.popup.test.failure = Il test del proxy Tor Ã¨ FALLITO! Verifica la configurazione del proxy e di Polipo.
 torbutton.popup.test.confirm_toggle = Il test piÃ¹ recente di un proxy Tor ha fallito nell'usare Tor.\n\nSei sicuro di volerlo abilitare comunque?\n\nNota: Se hai risolto il problema, puoi riavviare il test nella finestra Preferenze Proxy Torbutton per eliminare questo avviso.
 torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrÃ  in background. Sii paziente.
-torbutton.panel.label.verified = Tor verificato
-torbutton.popup.test.auto_failed = Il test automatico del proxy Tor non Ã¨ riuscito ad usare Tor.\n\nSei sicuro di volerlo abilitare ugualmente?
-torbutton.prefs.recommended = (raccomandato)
-torbutton.prefs.optional = (facoltativo)
-torbutton.prefs.crucial = (essenziale)
 torbutton.popup.external.title = Si desidera scaricare un tipo di file esterno?
 torbutton.popup.external.app = Tor Browser non Ã¨ in grado di aprire questo file. SarÃ  necessario usare un'altra applicazione per aprirlo.\n\n
 torbutton.popup.external.note = Alcuni tipi di file possono far sÃ¬ che le applicazioni si connettano a Internet senza usare Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Scaricare il file
 torbutton.popup.cancel = Annulla
 torbutton.popup.dontask = Scaricare automaticamente i file d'ora in poi
 torbutton.popup.test.no_http_proxy = Test Tor proxy: Proxy HTTP locale non Ã¨ raggiungibile. Polipo Ã¨ in funzione correttamente?
-torbutton.popup.captcha.title = Evitare i Captcha di Google?
-torbutton.popup.captcha.ask = Torbutton ha rilevato un Captchta di Google. Preferisci essere reindirizzato a un altro motore di ricerca per questa query?
-torbutton.popup.captcha.always = Da adesso eseguire sempre questa azione
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = No redirect
 torbutton.popup.prompted_language = Per aumentare la tua privacy, Torbutton puÃ² richiedere la versione inglese delle pagine web. PerciÃ² alcune pagine che preferiresti leggere nella tua lingua potrebbero essere visualizzate in inglese.\n\nPreferisci richiedere le pagine web in inglese per una maggiore privacy?
 torbutton.popup.no_newnym = Torbutton non puÃ² assegnarti una nuova identitÃ  in modo sicuro, poichÃ© non ha accesso alla porta di controllo di Tor.\n\nStai usando Tor Browser Bundle?
-torbutton.popup.use_tbb = Sembra che si stia usando Torbutton con Firefox, modalitÃ  non piÃ¹ raccomandata come configurazione sicura.\n\nIn alternativa, si consiglia di scaricare la versione piÃ¹ recente del Tor Browser Bundle, inviando una email a gettor@xxxxxxxxxxxxxx o scaricandolo da uno dei seguenti indirizzi:
 torbutton.popup.pref_error = Torbutton non puÃ² aggiornare le preferenze nella cartella profilo del Tor Browser.
 torbutton.popup.permission_denied = Si prega di reimpostare i permessi della cartella Tor Browser oppure di spostarla altrove.
 torbutton.popup.device_full = Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un altro dispositivo.
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 1f3cc35..84c7fdd 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Torã??æ??å?¹ã?«ã??ã??
-torbutton.button.tooltip.enabled = Torã??ç?¡å?¹ã?«ã??ã??
 torbutton.circuit_display.internet = ã?¤ã?³ã?¿ã?¼ã??ã??ã??
 torbutton.circuit_display.ip_unknown = ä¸?æ??ã?ªIP
 torbutton.circuit_display.onion_site = Onion ã?µã?¤ã??
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = ä¸?æ??ã?ªå?½
 torbutton.content_sizer.margin_tooltip = Tor Browser ã?¯ã?¦ã?£ã?³ã??ã?¦ã?®ã?µã?¤ã?ºã??å¹³å?¡ã?«ã??ã??ã??ã??ã?«ã??ã?®ã??ã?¼ã?¸ã?³ã??è¿½å? ã??ã?¾ã??ã??ã??ã??ã?«ã??ã??ã??ã??ã?ªã??ã?®ã??ã?¨ã??ã?ªã?³ã?©ã?¤ã?³ã?§è¿½è·¡ã??ã?«ã??ã??ã??ã?¾ã??ã??
 torbutton.panel.tooltip.disabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??æ??å?¹ã?«ã??ã??
 torbutton.panel.tooltip.enabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??ç?¡å?¹ã?«ã??ã??
-torbutton.panel.plugins.disabled = ã??ã?©ã?°ã?¤ã?³ã??æ??å?¹ã?«ã??ã??
-torbutton.panel.plugins.enabled = ã??ã?©ã?°ã?¤ã?³ã??ç?¡å?¹ã?«ã??ã??
 torbutton.panel.label.disabled = Tor ç?¡å?¹
 torbutton.panel.label.enabled = Tor æ??å?¹
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbuttonã?¯Torã?®è¨å®?ã??æ§?æ??ã??ã??ç´ æ?©ã??ã??ã?¤å®¹æ??ã?«ã??ã?©ã?¤ã??ã?¼ã??ã?ªé?²è¦§ã??ã?¼ã?¿ã??ã?¯ã?ªã?¢ã??ã??ã??ã?¿ã?³ã??æ??ä¾?ã??ã?¾ã??ã??
-torbutton.popup.history.warning = Torbutton ã?¯ç?°ã?ªã??Torã?®ç?¶æ??ã?§èªã?¿è¾¼ã?¾ã??ã??ã?¿ã??ã??ã??ã?®æ´»å??ã??ã??ã?ã??ã?¯ã??ã?¾ã??ã??ã??\n\nã??ã??ã?¯Firefoxã?®ã??ã?° 409737ã?¨417869ã?§å??é?¿ã??ã?¾ã??ã??\n\nã??ã?®ã??ã??ã??ã?¢ã??ã??ã??ç??ç?±ã?ªã??å?ºã?¦ã??ã??ã??ã??ã?«ã?¿ã??ã??å ´å??ã?¯ã??ã?¿ã??ã?®ä¸?ã?¤ã??ã??ã??ã?¯ã?°ã?©ã?¦ã?³ã??ã?§ã?ªã?ã?¼ã??ã??è©¦ã?¿ã?¦ã??ã??ã??ã??ã??ã??ã??ã?ã??ã?¯ã??ã??ã?¾ã??ã??ã??\n\nã??ã?®Torã?®ç?¶æ??ã?§ã?¿ã??ã??ã?ªã?ã?¼ã??ã??ã??ã?«ã?¯ã??URLå?¥å??ã??ã??ã?¯ã?¹ã?§ã??ã?¨ã?³ã?¿ã?¼ã??ã??æ?¼ã??ã?¦ã??ã? ã??ã??ã??\n\n\n
-torbutton.popup.plugin.warning = Torbuttonã?¯ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã??ã??ã?³ã?³ã??ã?³ã??ã??ç?´æ?¥èªã?¿è¾¼ã?¾ã??ã??ã??ã?¨ã??ã??ã?ã??ã?¯ã??ã?¾ã??ã??ã??\n\nä»£ã??ã??ã?«å??å??ã??ä»?ã??ã?¦ä¿?å?ã??ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??\n
-torbutton.popup.confirm_ca_certs = Torbutton æ³¨æ??: ã?«ã?¹ã?¿ã? èª?è¨¼å±?ã??ã?ªã??ã??ã??ã?§ã??ã?? èª?è¨¼å±?ã?ªã?¹ã??ã?®è©¦é¨?ã?¯é??ã??æ??ä½?ã?§ã??ã??ã??Torã?®å??ã??æ?¿ã??ã??é??ã??ã??ã??ã?¾ã??ã?? èª?è¨¼å±?ã?®èª?è¨¼ã?®å??é?¢ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??ï¼?(ã??ã??ã??ã??ã??ã?ªã??å ´å??ã?¯ã??OKã??ã?¯ã?ªã??ã?¯ã??ã??ã?°å®?å?¨ã?§ã??ã??)
-torbutton.popup.ff3.warning = è¦å??\n\nFirefox 3ä¸?ã?§Torbuttonã??ä½¿ç?¨ã??ã??ã?¨ã??ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??ã?©ã?¤ã??ã??ã??ã?¯ã??ã?¼ã?¯ã?®æ??å ±ã??Torã??é??ã??ã?¦æ¼?æ´©ã??ã??æ??ã??ã??ã??ã??ã?¾ã??ã??\n\nå?©ç?¨ã??ç¶?ç¶?ã??ã?¾ã??ã??ï¼?
-torbutton.popup.toggle.warning = è¨å®?ã?®å¤?æ?´ã??å??æ? ã??ã??ã??ã??ã??ã?«ã??å??æ??å?¹å??ã??ã??ã??Torã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??ã??
 torbutton.popup.test.success = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«æ??å??ã??ã?¾ã??ã??
 torbutton.popup.test.failure = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã?? ã??ã?ã?¯ã?·ã?¨Polipoã?®è¨å®?ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??
 torbutton.popup.test.confirm_toggle = ç?´è¿?ã?®Torã??ã?ã?ã?·ã??ã?¹ã??ã??Torã?®ä½¿ç?¨ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n\næ?¬å½?ã?«ã??ã??ã?§ã??æ??å?¹ã?«ã??ã?¾ã??ã??ï¼?\n\næ³¨: ã??ã?®å??é¡?ã??ä¿®æ£ã??ã??å ´å??ã?¯ã??Torbuttonã?®ã??ã?ã?ã?·è¨å®?ã?¦ã?£ã?³ã??ã?¦ã?§ã??ã?¹ã??ã?«æ?»ã??ã??ã??ã?®è¦å??ã??æ¶?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??
 torbutton.popup.test.ff3_notice = Torã?®ã??ã?ã?ã?·è¨å®?ã??ã??ã?¹ã??ã??ã??ã?«ã?¯OKã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??ã??ã?®ã??ã?¹ã??ã?¯ã??ã??ã?¯ã?°ã?©ã?¦ã?³ã??ã?§å®?è¡?ã??ã??ã?¾ã??ã?®ã?§ã??ã??ã?°ã??ã??ã??å¾?ã?¡ã??ã? ã??ã??ã??
-torbutton.panel.label.verified = Tor ç¢ºèª?æ¸?ã?¿
-torbutton.popup.test.auto_failed = Torã??ä½¿ç?¨ã??ã??ã??ã??ã?®è?ªå??Torã??ã?ã?ã?·ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n\nå¼·å?¶ç??ã?«æ??å?¹å??ã??ã?¾ã??ã??ï¼?
-torbutton.prefs.recommended = (æ?¨å¥¨)
-torbutton.prefs.optional = (ã?ªã??ã?·ã?§ã?³)
-torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = å¤?é?¨ã??ã?¡ã?¤ã?«ç¨®å?¥ã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¾ã??ã??
 torbutton.popup.external.app = Tor ã??ã?©ã?¦ã?¶ã?¯ã??ã?®ã??ã?¡ã?¤ã?«ã??è¡¨ç¤ºã?§ã??ã?¾ã??ã??ã??å?¥ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?§é??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??\n
 torbutton.popup.external.note = ã??ã?¡ã?¤ã?«ã?®ã?¿ã?¤ã??ã?®ä¸ã?«ã??ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?? Tor ã??ä½¿ç?¨ã??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«æ?¥ç¶?ã??ã??å??å? ã?¨ã?ªã??å?¯è?½æ?§ã??ã??ã??ã??ã?®ã??ã??ã??ã?¾ã??ã??\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = ã??ã?¡ã?¤ã?«ã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã??
 torbutton.popup.cancel = ã?ã?£ã?³ã?»ã?«
 torbutton.popup.dontask = ä»?ã??ã??ã??ã?¡ã?¤ã?«ã??è?ªå??ç??ã?«ã??ã?¦ã?³ã?ã?¼ã??ã??ã??
 torbutton.popup.test.no_http_proxy = Torã??ã?ã?ã?·ã??ã?¹ã??: ã?ã?¼ã?«ã?«HTTPã??ã?ã?ã?·ã?«å?°é??ã?§ã??ã?¾ã??ã??ã??Polipoã?¯æ£å¸¸ã?«å??ä½?ã??ã?¦ã??ã?¾ã??ã??ï¼?
-torbutton.popup.captcha.title = Google CAPTCHAã??å??é?¿ã??ã?¾ã??ã??ï¼?
-torbutton.popup.captcha.ask = Torbuttonã?¯Google CAPTCHAã??æ¤?å?ºã??ã?¾ã??ã??ã??ã??ã?®ã?¯ã?¨ã?ªã??å?¥ã?®æ¤?ç´¢ã?¨ã?³ã?¸ã?³ã?§å®?è¡?ã??ã?¾ã??ã??ï¼?
-torbutton.popup.captcha.always = ä»?å¾?ã??ã?®ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã?¤ã??å®?è¡?ã??ã??
-torbutton.popup.redirect = ã?ªã??ã?¤ã?¬ã?¯ã??ã??ã??
-torbutton.popup.no_redirect = ã?ªã??ã?¤ã?¬ã?¯ã??ã??ã?ªã??
 torbutton.popup.prompted_language = ã??ã??ã??ã?©ã?¤ã??ã?·ã?¼ã??å®?ã??ã??ã??ã?«ã??Torbuttonã?¯ã?¦ã?§ã??ã??ã?¼ã?¸ã?®è?±èª?ç??ã??è¦?æ±?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã?? ã??ã??ã?¯ã??ã?ªã??ã??æ¯?å?½èª?ã?§èªã?¿ã??ã??ã?¦ã?§ã??ã??ã?¼ã?¸ã??ä»£ã??ã??ã?«è?±èª?ã?§è¡¨ç¤ºã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??\n\nã??ã??é«?ã??ã??ã?©ã?¤ã??ã?·ã?¼ã?®ã??ã??ã?«ã??è?±èª?ã?®ã?¦ã?§ã??ã??ã?¼ã?¸ã??è¦?æ±?ã??ã?¾ã??ã??ï¼?
 torbutton.popup.no_newnym = Torã?³ã?³ã??ã?ã?¼ã?«ã??ã?¼ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??Torbuttonã?¯æ?°ã??ã??æ?¥ç¶?çµ?è·¯ã??å®?å?¨ã?«ç?¨æ??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??\n\nTorã??ã?©ã?¦ã?¶ã??ã?³ã??ã?«ã??èµ·å??ã??ã?¦ã??ã?¾ã??ã??ï¼?
-torbutton.popup.use_tbb = Firefoxã?§Torbuttonã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã??ã?§ã??ã??ã??ã??ã??ã?¯ã??ã?¯ã??æ?¨å¥¨ã??ã??ã??å®?å?¨ã?ªæ§?æ??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??\n\nä»£ã??ã??ã?«ã??ç§?ã??ã?¡ã?¯gettor@xxxxxxxxxxxxxxã?«ã?¡ã?¼ã?«ã??é??ã??ã??ã??ä»¥ä¸?ã?®URLã?§ã??ã?¦ã?³ã?ã?¼ã??ã??ã??ã??ã?¨ã?§ã??æ??æ?°ã?®Tor Browser Bundleã??æ??ã?«å?¥ã??ã??ã??ã?¨ã??ã??å?§ã??ã??ã?¾ã??ã??:
 torbutton.popup.pref_error = Torbuttonã?¯ã??ã?ã??ã?¡ã?¤ã?«ã??ã?£ã?¬ã?¯ã??ã?ªã?«ã??ã??è¨å®?ã??ã?¢ã??ã??ã??ã?¼ã??ã?§ã??ã?¾ã??ã??ã??
 torbutton.popup.permission_denied = Torã??ã?©ã?¦ã?¶ã??ã?£ã?¬ã?¯ã??ã?ªã?®ã??ã?¼ã??ã??ã?·ã?§ã?³ã??ã?ªã?»ã??ã??ã??ã??ã??ã??æ?°ã??ã?ªå ´æ??ã?«ã?³ã??ã?¼ã??ã?¦ã??ã? ã??ã??ã??
 torbutton.popup.device_full = è¨?æ?¶è£?ç½®ã?®ç©ºã??å®¹é??ã??ä¸?è¶³ã??ã?¦ã??ã??ã??ã??ã?§ã??ã??ç©ºã??å®¹é??ã??å¢?ã??ã??ã??ã??Torã??ã?©ã?¦ã?¶ã??æ?°ã??ã?ªè¨?æ?¶è£?ç½®ã?¸ç§»å??ã??ã?¦ã??ã? ã??ã??ã??
diff --git a/src/chrome/locale/jv/torbutton.properties b/src/chrome/locale/jv/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/jv/torbutton.properties
+++ b/src/chrome/locale/jv/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/kn/torbutton.properties b/src/chrome/locale/kn/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/kn/torbutton.properties
+++ b/src/chrome/locale/kn/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index 51c5601..b09f028 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Tor í??ì?±í??
-torbutton.button.tooltip.enabled = Tor ë¹?í??ì?±í??
 torbutton.circuit_display.internet = ì?¸í?°ë?·
 torbutton.circuit_display.ip_unknown = ë¯¸í??ì?¸ IP
 torbutton.circuit_display.onion_site = Onion ì?¬ì?´í?¸
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = ë¯¸í??ì?¸ êµê°?
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Torë¥¼ í??ì?±í??í??ë ¤ë©´ í?´ë¦
 torbutton.panel.tooltip.enabled = Torë¥¼ ë¹?í??ì?±í??í??ë ¤ë©´ í?´ë¦
-torbutton.panel.plugins.disabled = í??ë?¬ê·¸ì?¸ì?? í??ì?±í??í??ë ¤ë©´ í?´ë¦
-torbutton.panel.plugins.enabled = í??ë?¬ê·¸ì?¸ì?? ë¹?í??ì?±í??í??ë ¤ë©´ í?´ë¦
 torbutton.panel.label.disabled = Tor ë¹?í??ì?±í??
 torbutton.panel.label.enabled = Tor í??ì?±í??
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbuttonì?? Tor ì?¤ì ?ì?? í?´ ì£¼ë?? ë²?í?¼ì?? ì ?ê³µí??ê³ , ë¹ ë¥´ê³  ì?½ê²? ê°?ì?¸ ë¸?ë?¼ì?°ì§? ë?°ì?´í?°ë¥¼ ì§?ì?? ì¤?ë??ë?¤.
-torbutton.popup.history.warning = Torbuttonì?? ë?¤ë¥¸ Tor ì??í??ì??ì?? ì?´ë¦° í?ì?? í??ë??ì?? ë§?ì??ì?µë??ë?¤.\n\nì?´ê²?ì?? Firefox ë²?ê·¸ 409737ê³¼ 417869 ë??ë¬¸ì?? ì?¼ì?´ë?¬ì?µë??ë?¤.\n\në§?ì?½ ì?´ í??ì??ì?´ ì?´ì?  ì??ì?´ ì?¼ì?´ë?? ê²?ì²?ë?¼ ë³´ì?¸ë?¤ë©´, ê·?í??ì?? í? ì¤? í??ë??ê°? ë°±ê·¸ë?¼ì?´ë??ì??ì?? ë?¤ì?? ì?´ë¦¬ë ¤ê³  í??ë?? ê²?ì?´ê³ , ì?´ê²?ì?´ ë§?í??ì?µë??ë?¤.\n\nê·¸ í?ì?? ì?´ Tor ì??í??ì??ì?? ì?´ê¸° ì??í??ì?¬, URL ì??ì??ì?? Enter í?¤ë¥¼ ë??ë¥´ì?ì??ì?¤.\n
-torbutton.popup.plugin.warning = Torbuttonì?? í??ë?¬ê·¸ì?¸ ì½?í??ì¸ ì?? ì§?ì ? Tor ë¡?ë??ë¥¼ ë§?ì??ì?µë??ë?¤.\n\në?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥ì?? ë??ì?  ì?¬ì?©í??ì?ì??ì?¤.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: ì?¬ì?©ì?? ì ?ì?? ì?¸ì¦? ê¸°ê´?ì?´ ì??ë?? ê²?ì?¼ë¡? ë³´ì??ë??ë?¤. ì?¸ì¦? ê¸°ê´? ëª©ë¡? ê²?ì?¬ë?? ë??ë¦¬ê³ , Tor toggle ì??ë??ê°? ë??ë ¤ì§?ë??ë?¤. ì?¸ì¦? ê¸°ê´? ì?¸ì¦?ì??ì?? ê²©ë¦¬ë¥¼ í?´ì ?í??ì??ê² ì?µë??ê¹?? (ë§?ì?½ ì?´í?´ê°? ì?? ë??ì? ë?¤ë©´, OKë¥¼ ë??ë?¬ë?? ì??ì ?í?©ë??ë?¤.)
-torbutton.popup.ff3.warning = ê²½ê³ !\n\nFirefox 3 ì??ì?? Torbuttonì?? í??ì??ì¡´ê³¼ Livemarkë¥¼ Torë¥¼ í?µí?´ ë??ì¶?ì??í?µë??ë?¤.\n\nê·¸ë??ë?? ê³?ì??í??ì??ê² ì?µë??ê¹??
-torbutton.popup.toggle.warning = ê·?í??ì?? ì?¤ì ?ì?´ í?¨ê³¼ë¥¼ ë°?í??í??ê¸° ì??í?´ì??ë??, Torë¥¼ í? ê¸?í??ê±°ë?? ì?¬ì??ì??í?  í??ì??ê°? ì??ì?µë??ë?¤.
 torbutton.popup.test.success = Tor í??ë¡?ì?? í??ì?¤í?¸ ì?±ê³µ!
 torbutton.popup.test.failure = Tor í??ë¡?ì?? í??ì?¤í?¸ "ì?¤í?¨"! í??ë¡?ì??ì?? Polipo ì?¤ì ?ì?? í??ì?¸í??ì?ì??ì?¤.
 torbutton.popup.test.confirm_toggle = ìµ?ê·¼ ë??ë¶?ë¶? Torë¥¼ ì?¬ì?©í??ê¸° ì??í?? Tor í??ë¡?ì?? í??ì?¤í?¸ê°? ì?¤í?¨í??ì??ì?µë??ë?¤.\n\nì?´ì¨?ë?  í??ì?±í??í??ì??ê¸°ë¥¼ ì??í??ë?? ê²?ì?´ í??ì?¤í??ì?ë??ê¹??\n\nNote: ë¬¸ì ?ë¥¼ ê³ ì¹?ì?¨ë?¤ë©´, ì?´ ê²½ê³ ë¥¼ ì??ì? ê¸° ì??í?´ Tor í??ë¡?ì?? ì?¤ì ?ì?? í??ì?¤í?¸ë¥¼ ë?¤ì?? í?  ì?? ì??ì?µë??ë?¤.
 torbutton.popup.test.ff3_notice = OKë¥¼ ë??ë¥´ì??ë©´ Tor í??ë¡?ì?? ì?¤ì ?ì?? í??ì?¤í?¸í?©ë??ë?¤. ì?´ í??ì?¤í?¸ë?? ë°±ê·¸ë?¼ì?´ë??ì??ì?? ì??ì??ë?©ë??ë?¤. ì? ì?? ê¸°ë?¤ë ¤ ì¥¡ì??ì?¤.
-torbutton.panel.label.verified = Tor ê²?ì¦?ë?¨.
-torbutton.popup.test.auto_failed = ì??ë?? Tor í??ë¡?ì?? í??ì?¤í?¸ê°? ì?¤í?¨í??ì??ì?µë??ë?¤.\n\nì?´ì¨?ë?  í??ì?±í??í??ê¸°ë¥¼ ì??í??ì??ë?? ê²?ì?´ í??ì?¤í??ì?ë??ê¹??
-torbutton.prefs.recommended = (ì¶?ì²?)
-torbutton.prefs.optional = (ì? í??)
-torbutton.prefs.crucial = (ì¤?ì??)
 torbutton.popup.external.title = ì?¸ë¶? í??ì?¼ ì? í??ì?? ë?¤ì?´ë¡?ë?? í??ì??ê² ì?µë??ê¹??
 torbutton.popup.external.app = Tor ë¸?ë?¼ì?°ì ?ë??ì?´ í??ì?¼ì?? ë³¼ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?© í??ë¡?ê·¸ë?¨ì??ì?? ì?´ì?´ì?¼í?©ë??ë?¤.\n\n
 torbutton.popup.external.note = í??ì?¼ ì? í??ì?? ì??ì?© í??ë¡?ê·¸ë?¨ì?´ Torë¥¼ ì?¬ì?©í??ì§? ì??ê³  ì?¸í?°ë?·ì?? ì?°ê²°í??ë?? ì??ì?¸ì?´ ë?  ì??ì??ë?? ê²?ì?´ ì??ì?µë??ë?¤.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = í??ì?¼ì?? ë?¤ì?´ë¡?ë?? í??ê¸°
 torbutton.popup.cancel = ì·¨ì??
 torbutton.popup.dontask = ì§?ê¸?ë¶?í?° í??ì?¼ì?? ì??ë??ì?¼ë¡? ë?¤ì?´ë¡?ë??
 torbutton.popup.test.no_http_proxy = Tor í??ë¡?ì?? í??ì?¤í?¸: ë¡?ì»¬ HTTP í??ë¡?ì??ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. Polipoê°? í??ì?¤í?? ì??ë??ì¤? ì??ë??ê¹??
-torbutton.popup.captcha.title = Google Capchas í?¼í??ê¸°?
-torbutton.popup.captcha.ask = Torbuttonì?´ Google Capcthaë¥¼ ê°?ì§?í??ì?µë??ë?¤. ì?´ ì¿¼ë¦¬ë¥¼ ì??í?´ ë?¤ë¥¸ ê²?ì?? ì??ì§?ì?¼ë¡? ë¦¬ë?¤ì?´ë ?í?¸ í??ì??ê² ì?µë??ê¹??
-torbutton.popup.captcha.always = ì§?ê¸?ë¶?í?° ì?´ ë??ì?? ê¸°ì?µí??ê¸°
-torbutton.popup.redirect = ë¦¬ë?¤ì?´ë ?í?¸
-torbutton.popup.no_redirect = ë¦¬ë?¤ì?´ë ?í?¸ í??ì§? ì??ì??
 torbutton.popup.prompted_language = ë?? ë§?ì?? ê°?ì?¸ ì ?ë³´ë¥¼ ì??í?´, Torbuttonì?? ì??ì?´ ë²?ì ? ì?¹í??ì?´ì§?ë¥¼ ì??ì²í?  ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ê·?í??ì?? ëª¨êµì?´ ë??ì?  ì??ì?´ë¥¼ í??ì??í??ë?? ì?¹ í??ì?´ì§?ë¥¼ ì?¼ì?¼í?¬ ì?? ì??ì?µë??ë?¤.\n\në?? ë??ì?? ê°?ì?¸ ì ?ë³´ë¥¼ ì??í?´ ì??ì?´ ì?¹ í??ì?´ì§?ë¥¼ ì??ì²í??ì??ê² ì?µë??ê¹??
 torbutton.popup.no_newnym = Torbuttonì?? ì??ì ?í??ê²? ì??ë¡?ì?´ ì? ì??ì?? ì¤? ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? Tor ì»¨í?¸ë¡¤ í?¬í?¸ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤.\n\nTor Browser Bundleì?? ì?¬ì?©í??ê³  ê³?ì?ë??ê¹??
-torbutton.popup.use_tbb = ì?´ê²?ì?? Torbuttonì?? í??ì?´ì?´í?ì?¤ì?? í?¨ê»? ì?¬ì?©í??ì?¤ ë?? ë??í??ë?©ë??ë?¤. ê·¸ë¦¬ê³  ë?©ì?? ì¶?ì²?ë??ë?? ì??ì ? ì?¤ì ?ì?´ ì??ë??ë??ë?¤.\n\në??ì? , ì ?í?¬ë?? gettor@xxxxxxxxxxxxxx ì??ê²? ë©?ì?¼ì?? ë³´ë?´ê±°ë??, ë?¤ì?? URLì?? ì ?ì??í?´ì?? ìµ?ì?  Tor browser bundleì?? ë°?ë?? ê²?ì?? ì¶?ì²?ë??ë¦½ë??ë?¤:
 torbutton.popup.pref_error = Torbuttonì?? Tor Browser í??ë¡?í??ì?¼ ë??ë ?í?´ë¥¼ ì??ë?°ì?´í?¸ í?  ì?? ì??ì?µë??ë?¤.
 torbutton.popup.permission_denied = Tor Browser ë??ë ?í? ë¦¬ì?? ê¶?í??ì?? ì´?ê¸°í?? í??ì??ê±°ë??,  Tor browserë¥¼ ì??ë¡?ì?´ ì??ì¹?ë¡? ì?®ê²¨ ì£¼ì?ì??ì?¤.
 torbutton.popup.device_full = ì?´ ë??ì?¤í?¬ë?? ê°?ë?? ì°¬ ê²? ê°?ì?µë??ë?¤. ë¹? ê³µê°?ì?? ë§?ë??ì??ê±°ë?? ì??ë¡?ì?´ ì?¥ì¹?ë¡? Tor browserë¥¼ ì?®ê²¨ ì£¼ì?ì??ì?¤.
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/kw/torbutton.properties b/src/chrome/locale/kw/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/kw/torbutton.properties
+++ b/src/chrome/locale/kw/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ky/torbutton.properties b/src/chrome/locale/ky/torbutton.properties
index 9ffe1a3..0700ab3 100644
--- a/src/chrome/locale/ky/torbutton.properties
+++ b/src/chrome/locale/ky/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Ð?Ð¹Ð½Ñ?Ñ?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/lb/torbutton.properties b/src/chrome/locale/lb/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/lb/torbutton.properties
+++ b/src/chrome/locale/lb/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/lg/torbutton.properties b/src/chrome/locale/lg/torbutton.properties
index 6ccd278..7924713 100644
--- a/src/chrome/locale/lg/torbutton.properties
+++ b/src/chrome/locale/lg/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,8 +15,3 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
diff --git a/src/chrome/locale/ln/torbutton.properties b/src/chrome/locale/ln/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ln/torbutton.properties
+++ b/src/chrome/locale/ln/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/lo/torbutton.properties b/src/chrome/locale/lo/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/lo/torbutton.properties
+++ b/src/chrome/locale/lo/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/lt/torbutton.properties b/src/chrome/locale/lt/torbutton.properties
index 30e3e6e..77e5bbf 100644
--- a/src/chrome/locale/lt/torbutton.properties
+++ b/src/chrome/locale/lt/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Ä®galinti Tor
-torbutton.button.tooltip.enabled = Atjungti Tor
 torbutton.panel.tooltip.disabled = Paspauskite kad Ä¯galinti Tor
 torbutton.panel.tooltip.enabled = Paspauskite kad atjungti Tor
-torbutton.panel.plugins.disabled = Paspauskite kad Ä¯galinti priedus
-torbutton.panel.plugins.enabled = Paspauskite kad atjungti priedus
 torbutton.panel.label.disabled = Tor atjungtas
 torbutton.panel.label.enabled = Tor Ä¯galintas
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy testas pasisekÄ?!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor patvirtintas
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = AtÅ¡aukti
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Nukreipti
-torbutton.popup.no_redirect = Ne nukreipti
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/lv/torbutton.properties b/src/chrome/locale/lv/torbutton.properties
index 676168d..0551ab9 100644
--- a/src/chrome/locale/lv/torbutton.properties
+++ b/src/chrome/locale/lv/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = IespÄ?jot Tor
-torbutton.button.tooltip.enabled = AtspÄ?jot Tor
 torbutton.panel.tooltip.disabled = NoklikÅ¡Ä·inÄ?t, lai iespÄ?jotu Tor
 torbutton.panel.tooltip.enabled = NoklikÅ¡Ä·inÄ?t, lai atspÄ?jotu Tor
-torbutton.panel.plugins.disabled = NoklikÅ¡Ä·inÄ?t, lai iespÄ?jotu spraudÅ?us
-torbutton.panel.plugins.enabled = NoklikÅ¡Ä·inÄ?t, lai atspÄ?jotu spraudÅ?us
 torbutton.panel.label.disabled = Tor ir atspÄ?jots
 torbutton.panel.label.enabled = Tor ir iespÄ?jots
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton ir poga ar kuru konfigurÄ?t Tor iestatÄ«jumus, kÄ? arÄ« Ä?tri un Ä?rti attÄ«rÄ«t personÄ«gos pÄ?rlÅ«koÅ¡anas datus.
-torbutton.popup.history.warning = Torbutton bloÄ·Ä?ja cilnes aktivitÄ?ti, kura ielÄ?dÄ?ta citÄ? Tor stÄ?voklÄ«.â?? â?? Tas nepiecieÅ¡ams, lai novÄ?rstu Firefox kÄ¼Å«das nr. 409737 un 417869.â?? â?? Ja Å¡is uznirstoÅ¡ais elements parÄ?dÄ«jÄ?s bez Å¡Ä·ietama iemesla, tad kÄ?da no jÅ«su cilnÄ?m cenÅ¡as sevi fonÄ? pÄ?rlÄ?dÄ?t, taÄ?u Å¡is mÄ?Ä£inÄ?jums tika bloÄ·Ä?ts.â?? â??Lai pÄ?rlÄ?dÄ?tu cilni Å¡ajÄ? Tor stÄ?voklÄ«, lodziÅ?Ä? URL atraÅ¡anÄ?s vieta nospiediet taustiÅ?u "IevadÄ«t".â?? â??\n
-torbutton.popup.plugin.warning = Torbutton bloÄ·Ä?ja tieÅ¡u Tor spraudÅ?a satura ielÄ?di. â?? â?? TÄ?dÄ? gadÄ«jumÄ? lietojiet SaglabÄ?t kÄ?. â?? â??\n
-torbutton.popup.confirm_ca_certs = Torbutton piezÄ«me: Å Ä·iet, ka jums nav pielÄ?gotu SertificÄ?Å¡anas iestÄ?Å¾u. SertificÄ?Å¡anas iestÄ?Å¾u pÄ?rbaude ir laikietilpÄ«ga darbÄ«ba un palÄ?nina Tor pÄ?rslÄ?gÅ¡anos. Vai vÄ?laties atspÄ?jot sertificÄ?Å¡anas iestÄ?Å¾u sertifikÄ?tu izolÄ?Å¡anu? (Ja nesaprotat, kas tieÅ¡i te ir domÄ?ts, tad, ziniet, ka ir droÅ¡i noklikÅ¡Ä·inÄ?t Labi jeb OK)
-torbutton.popup.ff3.warning = BrÄ«dinÄ?jums!â?? â??Ir zinÄ?ms, ka Torbutton, strÄ?dÄ?jot Firefox 3, ar Tor starpniecÄ«bu nopludina jÅ«su laika joslu un tieÅ¡atzÄ«mes.â?? â?? Vai vÄ?laties tomÄ?r turpinÄ?t? 
-torbutton.popup.toggle.warning = NepiecieÅ¡ams pÄ?rslÄ?gt vai pÄ?rstartÄ?t Tor, lai iestatÄ«jumi stÄ?tos spÄ?kÄ?.
 torbutton.popup.test.success = Tor starpnieka pÄ?rbaude ir sekmÄ«ga!
 torbutton.popup.test.failure = Tor starpnieka pÄ?rbaudes tests NEIZDEVÄ?S! PÄ?rbaudiet starpnieka un Polipo iestatÄ«jumus.
 torbutton.popup.test.confirm_toggle = PÄ?dÄ?jÄ? Tor starpnieka pÄ?rbaudÄ? neizdevÄ?s izmantot Tor.â?? â?? Vai esat pÄ?rliecinÄ?ts, ka tomÄ?r vÄ?laties to iespÄ?jot?â?? â?? PiezÄ«me: Ja esat atrisinÄ?jis Å¡o problÄ?mu, varat atkÄ?rtoti palaist pÄ?rbaudi lodziÅ?Ä? Torbutton starpnieka preferences, lai nebÅ«tu Å¡Ä« brÄ«dinÄ?juma. 
 torbutton.popup.test.ff3_notice = NoklikÅ¡Ä·iniet Labi jeb OK, lai pÄ?rbaudÄ«tu Tor starpnieka iestatÄ«jumus. Å Ä« pÄ?rbaude notiks fonÄ?. LÅ«dzu, esiet pacietÄ«gs.  
-torbutton.panel.label.verified = Tor ir verificÄ?ts
-torbutton.popup.test.auto_failed = AutomÄ?tiskÄ? Tor starpnieka pÄ?rbaudÄ? neizdevÄ?s izmantot Tor.â?? â?? Vai esat pÄ?rliecinÄ?ts, ka tomÄ?r vÄ?laties to iespÄ?jot?
-torbutton.prefs.recommended = (ieteicams)
-torbutton.prefs.optional = (neobligÄ?ts)
-torbutton.prefs.crucial = (bÅ«tisks)
 torbutton.popup.external.title = IelÄ?dÄ?t Ä?rÄ?ju saturu?
 torbutton.popup.external.app = NepiecieÅ¡ama Ä?rÄ?ja lietotne, lai apstrÄ?dÄ?tu:â?? â??\n
 torbutton.popup.external.note = \nâ?? â??PIEZÄªME: PÄ?c noklusÄ?juma Ä?rÄ?jas lietotnes NAV gana droÅ¡as Tor un var jÅ«s atklÄ?t!â??\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Palaist lietotni
 torbutton.popup.cancel = Atcelt
 torbutton.popup.dontask = TurpmÄ?k vienmÄ?r palaist lietotnes
 torbutton.popup.test.no_http_proxy = Tor starpnieka pÄ?rbaude: HTTP vietÄ?jais starpnieks nav sasniedzams. Vai Polipo darbojas pareizi?
-torbutton.popup.captcha.title = IzvairÄ«ties no Google Captchas?
-torbutton.popup.captcha.ask = Torbutton konstatÄ?ja Google Captcha. Vai vÄ?laties, lai Å¡is vaicÄ?jums tiktu pÄ?radresÄ?ts uz citu meklÄ?tÄ?jprogrammu?
-torbutton.popup.captcha.always = TurpmÄ?k vienmÄ?r veikt Å¡o darbÄ«bu
-torbutton.popup.redirect = NovirzÄ«t
-torbutton.popup.no_redirect = NenovirzÄ«t
 torbutton.popup.prompted_language = Lai nodroÅ¡inÄ?tu jums lielÄ?ku privÄ?tuma lÄ«meni, Torbutton var pieprasÄ«t tÄ«mekÄ¼a vietÅ?u angÄ¼u valodas versiju. Tas var radÄ«t situÄ?ciju, ka tÄ«mekÄ¼a vietnes, kuras izvÄ?laties lasÄ«t dzimtajÄ? valodÄ?, tiek attÄ?lotas angÄ¼u valodÄ?.â?? â?? Vai vÄ?laties pieprasÄ«t tÄ«mekÄ¼a vietnes angÄ¼u valodÄ?, lai nodroÅ¡inÄ?tu lielÄ?ku privÄ?tuma lÄ«meni?
 torbutton.popup.no_newnym = Torbutton nespÄ?j droÅ¡i sniegt jums jaunu identitÄ?ti. Tai nav piekÄ¼uves pie Tor vadÄ«bas porta. â?? â?? Vai esat palaidis PÄ?rlÅ«ka Tor komplektu?
-torbutton.popup.use_tbb = Å Ä·iet, ka strÄ?dÄ?jot ar Firefox lietojat Torbutton, kas vairs nav rekomendÄ?ta droÅ¡a konfigurÄ?cija.â?? â?? TÄ? vietÄ? mÄ?s iesakÄ?m izmantot jaunÄ?ko pÄ?rlÅ«ka Tor komplektu, ko iespÄ?jams saÅ?emt nosÅ«tot epastu, kurÅ¡ adresÄ?ts gettor@torprojec , vai lejupielÄ?dÄ?jot komplektu norÄ?dÄ«tajÄ? URL: 
 torbutton.popup.pref_error = Torbutton nespÄ?j atjauninÄ?t preferences PÄ?rlÅ«ka Tor profila direktorijÄ?.
 torbutton.popup.permission_denied = LÅ«dzu vai nu atiestatiet pÄ?rlÅ«ka Tor direktorijas atÄ¼aujas, vai arÄ« kopÄ?jiet to uz jaunu vietu.
 torbutton.popup.device_full = Å Ä·iet, ka cietais disks ir pilns. LÅ«dzu, atbrÄ«vojiet vietu uz diska vai pÄ?rvietojiet pÄ?rlÅ«ku Tor uz citu ierÄ«ci.
diff --git a/src/chrome/locale/mg/torbutton.properties b/src/chrome/locale/mg/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/mg/torbutton.properties
+++ b/src/chrome/locale/mg/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/mi/torbutton.properties b/src/chrome/locale/mi/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/mi/torbutton.properties
+++ b/src/chrome/locale/mi/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/mk/torbutton.properties b/src/chrome/locale/mk/torbutton.properties
index 15f6e5b..609623b 100644
--- a/src/chrome/locale/mk/torbutton.properties
+++ b/src/chrome/locale/mk/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Ð?ÐºÐ»Ñ?Ñ?Ð¸ Ð³Ð¾ Ð¢Ð¾Ñ?
-torbutton.button.tooltip.enabled = Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸ Ð³Ð¾ Ð¢Ð¾Ñ?
 torbutton.panel.tooltip.disabled = Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?
 torbutton.panel.tooltip.enabled = Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¸Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?
-torbutton.panel.plugins.disabled = Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð´Ð° Ð¸Ð¼Ð° Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¸
-torbutton.panel.plugins.enabled = Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð´Ð° Ð½ÐµÐ¼Ð° Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¸
 torbutton.panel.label.disabled = Ð¢Ð¾Ñ? Ðµ Ð¸Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½
 torbutton.panel.label.enabled = Ð¢Ð¾Ñ? Ðµ Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð½Ð¾Ñ?Ñ? Ð½Ð° Ð½ÐµÐºÐ¾Ñ? Ñ?Ð°Ð± ÐºÐ¾Ñ? Ñ?Ñ?Ð¾ Ð±Ð¸Ð» Ð²Ñ?Ð¸Ñ?Ð°Ð½ Ð²Ð¾ Ð¸Ð½Ð°ÐºÐ²Ð°\nÐ¢Ð¾Ñ?-Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð±Ð°.\n\nÐ?Ð²Ð° Ñ?Ð»Ñ?Ð¶Ð¸ Ð·Ð° Ð´Ð° Ñ?Ðµ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ð°Ñ? Ð±Ð°Ð³Ð¾Ð²Ð¸Ñ?Ðµ Ð±Ñ?. 409737 Ð¸ 417869 Ð½Ð° Firefox.\n\nÐ?ÐºÐ¾ Ð?Ð¸ Ñ?Ðµ Ñ?Ð¸Ð½Ð¸ Ð´ÐµÐºÐ° Ð¾Ð²Ð°Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ° Ñ?Ðµ Ñ?Ð°Ð²Ñ?Ð²Ð° Ð±ÐµÐ· Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð°, Ð½ÐµÐºÐ¾Ñ? Ð¾Ð´ Ð?Ð°Ñ?Ð¸Ñ?Ðµ\nÑ?Ð°Ð±Ð¾Ð²Ð¸ Ñ?Ðµ Ð¾Ð±Ð¸Ð´Ñ?Ð²Ð° Ð´Ð° Ñ?Ðµ Ñ?ÐµÐ»Ð¾Ð°Ð´Ð¸Ñ?Ð° Ð²Ð¾ Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð°, Ð¸ Ð·Ð°Ñ?Ð°Ð´Ð¸ Ñ?Ð¾Ð° Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½.\n\nÐ?Ð¾ÐºÐ¾Ð»ÐºÑ? Ñ?Ð°ÐºÐ°Ñ?Ðµ Ð´Ð° Ð³Ð¾ Ñ?ÐµÐ»Ð¾Ð°Ð´Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ð±Ð¾Ñ? Ð²Ð¾ Ñ?ÐµÐºÐ¾Ð²Ð½Ð°Ñ?Ð° Ð¢Ð¾Ñ?-Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð±Ð°, \nÐ¿Ñ?Ð¸Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ ÐµÐ½Ñ?ÐµÑ? Ð²Ð¾ Ð¿Ð¾Ð»ÐµÑ?Ð¾ Ð·Ð° Ð²Ð½ÐµÑ?Ñ?Ð²Ð°Ñ?Ðµ URL Ð°Ð´Ñ?ÐµÑ?Ð¸.\n\n
-torbutton.popup.plugin.warning = Torbutton Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ðµ Ð²Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ñ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð° Ð·Ð° Ð¿Ð»Ð°Ð³Ð¸Ð½ Ð¿Ñ?ÐµÐºÑ? Ð¢Ð¾Ñ?.\n\nÐ?Ð°Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð°, ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ â??Ð¡Ð½Ð¸Ð¼Ð¸ ÐºÐ°ÐºÐ¾â??.\n\n
-torbutton.popup.confirm_ca_certs = Ð?Ð°Ð±ÐµÐ»ÐµÑ?ÐºÐ° Ð¾Ð´ Torbutton: Ð?Ð¾ Ñ?Ñ? Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð´ÐµÐºÐ° Ð½ÐµÐ¼Ð°Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð½Ð¸ Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð¸ Ð·Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸. Ð?Ñ?Ð¿Ð¸Ñ?Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð²Ð¸Ðµ Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð¸ Ðµ Ð±Ð°Ð²Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ð¸ Ð³Ð¾ Ñ?Ñ?Ð¿Ð¾Ñ?Ñ?Ð²Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð»Ð°Ñ?ÐµÑ?Ð¾ Ð²Ð¾ Ð¢Ð¾Ñ? Ñ?ÐµÐ¶Ð¸Ð¼. Ð?Ð°Ð»Ð¸ Ñ?Ð°ÐºÐ°Ñ?Ðµ Ð´Ð° Ð¸Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸ Ð´Ð° Ð±Ð¸Ð´Ð°Ñ? Ð¸Ð·Ð¾Ð»Ð¸Ñ?Ð°Ð½Ð¸? (Ð?ÐºÐ¾ Ð½Ðµ Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ñ?Ð¾Ð°, Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ Ðµ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° Ð?Ð?)\n
-torbutton.popup.ff3.warning = Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!\n\nTorbutton Ñ?Ð¾ Firefox 3 Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¸ Ð¾Ñ?ÐºÑ?Ð¸Ðµ Ð?Ð°Ñ?Ð°Ñ?Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° Ð·Ð¾Ð½Ð° Ð¸ livemark-Ð¾Ð²Ð¸.\n\nÐ?Ð°Ð»Ð¸ Ñ?ÐµÐ¿Ð°Ðº Ñ?Ð°ÐºÐ°Ñ?Ðµ Ð´Ð° Ð¿Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ðµ?
-torbutton.popup.toggle.warning = Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ðµ Ð´Ð° Ð³Ð¾ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ/Ð¸Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ? Ð¸Ð»Ð¸ Ð´Ð° Ñ?ÐµÑ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð° Ð?Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ð° Ð¸Ð¼Ð°Ð°Ñ? ÐµÑ?ÐµÐºÑ?.
 torbutton.popup.test.success = Ð¢ÐµÑ?Ñ?Ð¾Ñ? Ð·Ð° Ð¢Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾ Ð±ÐµÑ?Ðµ Ñ?Ñ?Ð¿ÐµÑ?ÐµÐ½!
 torbutton.popup.test.failure = Ð¢ÐµÑ?Ñ?Ð¾Ñ? Ð·Ð° Ð¢Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾ Ð?Ð? Ð£Ð¡Ð?Ð?Ð?! Ð?Ñ?Ð¾Ð²ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ Ð?Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¸Ð»Ð¸ Ð½Ð° Polipo.
 torbutton.popup.test.confirm_toggle = Ð?Ð¾Ñ?Ð»ÐµÐ´Ð½Ð¸Ð¾Ñ? Ñ?ÐµÑ?Ñ? Ð·Ð° Ð¢Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾ Ð½Ðµ Ñ?Ñ?Ð¿ÐµÐ° Ð´Ð° Ð³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¢Ð¾Ñ?.\n\nÐ?Ð°Ð»Ð¸ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ Ð´ÐµÐºÐ° Ñ?Ð°ÐºÐ°Ñ?Ðµ Ð´Ð° Ð³Ð¾ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð²Ð¾ Ñ?ÐµÐºÐ¾Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ??\n\nÐ?Ð°Ð±ÐµÐ»ÐµÑ?ÐºÐ°: Ð?ÐºÐ¾ Ð²Ð¾ Ð¼ÐµÑ?Ñ?Ð²Ñ?ÐµÐ¼Ðµ Ñ?Ñ?Ðµ Ð³Ð¾ Ñ?ÐµÑ?Ð¸Ð»Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¾Ñ?, Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾ Ð´Ð° Ð³Ð¾ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¾Ñ? Ð²Ð¾ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð¾Ñ? Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ð° Torbutton Ð·Ð° Ð´Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð½Ðµ Ð¾Ð²Ð° Ð¿Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ´Ñ?Ð²Ð°Ñ?Ðµ.
 torbutton.popup.test.ff3_notice = Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ Ð?Ð? Ð·Ð° Ð´Ð° Ð³Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ð° Ð·Ð° Ð¢Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾. Ð?Ð²Ð¾Ñ? Ñ?ÐµÑ?Ñ? Ñ?Ðµ Ð¸Ð·Ð²ÐµÐ´Ñ?Ð²Ð° Ð²Ð¾ Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð°, Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð·Ð° Ñ?Ñ?Ð¿ÐµÐ½Ð¸Ðµ.
-torbutton.panel.label.verified = Ð¢Ð¾Ñ? - Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½
-torbutton.popup.test.auto_failed = Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸-Ñ?ÐµÑ?Ñ? Ð½Ðµ Ñ?Ñ?Ð¿ÐµÐ° Ð´Ð° Ð³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¢Ð¾Ñ?.\n\nÐ?Ð°Ð»Ð¸ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ Ð´ÐµÐºÐ° Ñ?ÐµÐ¿Ð°Ðº Ñ?Ð°ÐºÐ°Ñ?Ðµ Ð´Ð° Ð³Ð¾ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ?
-torbutton.prefs.recommended = (Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ð°Ñ?Ð°Ð½Ð¾)
-torbutton.prefs.optional = (Ð¿Ð¾ Ð¶ÐµÐ»Ð±Ð°)
-torbutton.prefs.crucial = (ÐºÐ»Ñ?Ñ?Ð½Ð¾)
 torbutton.popup.external.title = Ð?Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° ÐµÐºÑ?Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð°?
 torbutton.popup.external.app = Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ðµ ÐµÐºÑ?Ñ?ÐµÑ?Ð½Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð·Ð° Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ð²Ð°Ñ?Ðµ Ñ?Ð¾:\n\n
 torbutton.popup.external.note = \n\nÐ?Ð?Ð?Ð?Ð?Ð?Ð¨Ð?Ð?: Ð?ÐºÑ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ð¸ Ð¾Ð±Ð¸Ñ?Ð½Ð¾ Ð?Ð? Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð½Ð¸ Ð·Ð° Ð¢Ð¾Ñ? Ð¸ Ð¼Ð¾Ð¶Ð°Ñ? Ð´Ð° Ð²Ðµ Ð¾Ñ?ÐºÑ?Ð¸Ñ?Ð°Ñ?!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Ð?Ð°Ð½Ñ?Ð¸Ñ?Ð°Ñ? Ñ?Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°Ñ?Ð°
 torbutton.popup.cancel = Ð?Ñ?ÐºÐ°Ð¶Ð¸ Ñ?Ðµ
 torbutton.popup.dontask = Ð?Ñ?Ñ?ÐµÐ³Ð° Ð½Ð°Ñ?Ð°Ð¼Ñ?, Ñ?ÐµÐºÐ¾Ð³Ð°Ñ? Ð»Ð°Ð½Ñ?Ð¸Ñ?Ð°Ñ? Ð³Ð¸ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ð¸Ñ?Ðµ
 torbutton.popup.test.no_http_proxy = Ð¢ÐµÑ?Ñ?Ð¾Ñ? Ð·Ð° Ð¢Ð¾Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸: Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ñ?Ð¾ HTTP Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¾. Ð?Ð°Ð»Ð¸ Polipo Ðµ Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½?
-torbutton.popup.captcha.title = Ð?Ð·Ð±ÐµÐ³Ð½Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Google Captchas?
-torbutton.popup.captcha.ask = Torbutton Ð´ÐµÑ?ÐµÐºÑ?Ð¸Ñ?Ð°Ñ?Ðµ ÐµÐ´Ð½Ð¾ Google Captcha. Ð?Ð°Ð»Ð¸ Ð·Ð° Ð¾Ð²Ð° Ð±Ð°Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð?Ðµ Ð¿Ñ?ÐµÐ½Ð°Ñ?Ð¾Ñ?Ð¸Ð¼Ðµ Ð¿Ñ?ÐµÐºÑ? Ð´Ñ?Ñ?Ð³ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ñ?Ð²Ð°Ñ??
-torbutton.popup.captcha.always = Ð?Ñ?Ñ?ÐµÐ³Ð° Ð½Ð°Ñ?Ð°Ð¼Ñ?, Ñ?ÐµÐºÐ¾Ð³Ð°Ñ? Ð¸Ð·Ð²Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ð° Ð¾Ð²Ð°Ð° Ð°ÐºÑ?Ð¸Ñ?Ð°
-torbutton.popup.redirect = Ð?Ñ?ÐµÐ½Ð°Ñ?Ð¾Ñ?Ð¸
-torbutton.popup.no_redirect = Ð?Ðµ Ð¿Ñ?ÐµÐ½Ð°Ñ?Ð¾Ñ?Ñ?Ð²Ð°Ñ?
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ml/torbutton.properties b/src/chrome/locale/ml/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ml/torbutton.properties
+++ b/src/chrome/locale/ml/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/mn/torbutton.properties b/src/chrome/locale/mn/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/mn/torbutton.properties
+++ b/src/chrome/locale/mn/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/mr/torbutton.properties b/src/chrome/locale/mr/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/mr/torbutton.properties
+++ b/src/chrome/locale/mr/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ms/torbutton.properties b/src/chrome/locale/ms/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ms/torbutton.properties
+++ b/src/chrome/locale/ms/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/my/torbutton.properties b/src/chrome/locale/my/torbutton.properties
index b5105f9..6ab566d 100644
--- a/src/chrome/locale/my/torbutton.properties
+++ b/src/chrome/locale/my/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Tor á??á?½á??á?ºá?·á??á??á?º
-torbutton.button.tooltip.enabled = Tor á??á?á??á?ºá??á??á?º
 torbutton.panel.tooltip.disabled = Tor á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º á??á?¾á?á??á?ºá??á?«
 torbutton.panel.tooltip.enabled = Tor á??á?á?¯ á??á?á??á?ºá??á??á?º á??á?¾á?á??á?ºá??á?«
-torbutton.panel.plugins.disabled = á??á??á??á?ºá?¡á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º á??á?¾á?á??á?ºá??á?«
-torbutton.panel.plugins.enabled = á??á??á??á?ºá?¡á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?á??á?ºá??á??á?º á??á?¾á?á??á?ºá??á?«
 torbutton.panel.label.disabled = á??á?á??á?ºá??á?¬á?¸á??á?±á?¬ Tor
 torbutton.panel.label.enabled = á??á?½á??á?ºá?·á??á?¬á?¸á??á?±á?¬ Tor
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton á??á??á?º á?¡á??á?¼á?¬á?¸ Tor á?¡á??á?¼á?±á?¡á??á?± á??á??á?ºá??á?¯á??á?½á??á?º á??á?½á??á?ºá?·á??á?¬á?¸á??á??á?ºá?· á??á?¬á?¡á??á?¾á??á?º á??á??á?ºá??á?¯á??á?¾ á??á?¾á?¯á??á?ºá??á?¾á?¬á?¸á??á?¾á?¯á??á?á?¯ á??á?á??á?ºá??á?á?¯á??á?ºá??á??á?ºá??\n\ná??á??á?ºá?¸á??á?á?¯ á??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸ á??á?»á?á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á??á??á??á?? á??á?¾á??á?ºá?· á??á??á??á??á??á?? á??á??á?ºá?¸á??á?»á??á?ºá?? á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á??á?º á??á?¼á??á?ºá??á??á?ºá??\n\ná?¡á??á??á?ºá?? á?¤á??á?½á??á?ºá?·á??á?½á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á??á?¾á?á??á?² á??á?±á?«á?ºá??á?¬á??á?«á??á?? á??á??á?ºá?· á??á?¬á?¡á??á?¾á??á?º á??á??á?ºá??á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?½á??á?ºá??á?¾ á??á?°á?·á??á?¬á??á?¬ á??á?½á??á?ºá?·á??á??á?º á??á?¼á?á?¯á?¸á??á??á?ºá?¸á??á?±á??á?¼á?®á?¸á?? á??á??á?ºá?¸á??á?á?¯ á??á?á??á?ºá??á?¬á?¸á??á??á?ºá??\n\ná?¤ Tor á?¡á??á?¼á?±á?¡á??á?±
 á??á?½á??á?º á??á?¬á?¡á??á?¾á??á?ºá?ºá??á?á?¯ á??á?¼á??á?ºá??á?½á??á?ºá?·á??á?«á??á?? URL á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?±á??á?¬ á?¡á??á?½á??á?ºá??á?²á??á?½á??á?º 'á??á??á?ºá?·á??á?½á??á?ºá?¸á??á??á?º' á??á??á?¯á??á?ºá??á?á?¯ á??á?¾á?á??á?ºá??á?«á??\n\n
-torbutton.popup.plugin.warning = Torbutton á??á??á?º á??á??á??á?ºá?¡á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?²á?? á??á?á?¯á??á?ºá??á?á?¯á??á?º Tor á??á?½á??á?ºá?·á??á?¼á??á?»á??á?ºá??á?á?¯ á??á?á??á?ºá??á?á?¯á??á?ºá??á??á?ºá??\n\ná??á??á?ºá?¸á?¡á??á?¬á?¸ Save-As á??á?á?¯ á??á?¯á?¶á?¸á??á?«á??\n\n
-torbutton.popup.confirm_ca_certs = Torbutton á??á?¾á??á?ºá??á?»á??á?º - á??á??á?ºá?·á??á?¶á?? á??á?á??á?ºá??á?¼á?á?¯á??á?º á?¡á??á?á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?á?¯á??á?ºá??á?½á??á?ºá?·á??á?»á?¬á?¸ á??á?¾á?á??á?¯á?¶á??á??á?±á?«á?ºá??á?«á?? á?¡á??á?á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?á?¯á??á?ºá??á?½á??á?ºá?· á??á?¬á??á??á?ºá?¸á??á?á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?½á??á?º á??á?¾á?±á?¸á??á?½á?±á?¸á??á??á?ºá?· á??á?¯á??á?ºá??á??á?ºá?¸á??á?¼á??á?ºá??á?¼á?®á?¸Tor á?¡á??á?á??á?ºá?¸á??á??á?¯á??á?ºá??á?á?¯ á??á?¾á?±á?¸á??á?½á?±á?¸á??á?±á??á??á?ºá?? á?¡á??á?á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?á?¯á??á?ºá??á?½á??á?ºá?· á??á??á?ºá??á?¾á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?®á?¸á??á??á?ºá?·á??á?¬á?¸á??á?¾á?á??á?¾á?¯á??á?á?¯ á??á??á?º á??á?á??á?ºá??á?á?¯á??á??á?¬á?¸á?? (á?¡á??á??á?ºá?? á?¤á?¡á??á?»á??á?ºá??á?á?¯ á??á??á?º á??á?¬á?¸á??á??á??á?ºá??á?«á??á?? á??á?±á?¬á??á?ºá?¸á??á?¼á?® á??á??á?¯á??á?ºá??á?á?¯ á??á?á??á?ºá??á?»á??á??á?ºá??á?» 
 á??á?¾á?á??á?ºá??á?á?¯á??á?ºá??á??á?º)
-torbutton.popup.ff3.warning = á??á??á?á??á?±á?¸á??á?»á??á?º!\n\ná??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸ á?? á?? á??á?¾á?á??á?±á?¬ Torbutton á??á??á?º Tor á??á??á??á??á?ºá?· á??á??á?ºá?· á??á?¶â??á??á?±á?¬á?ºá??á?»á?á??á?ºá??á?¾á??á?ºá?· livemarks á??á?á?¯á?·á??á?á?¯ á??á?±á?«á??á?ºá??á?¼á?¬á?¸á??á?±á??á?á?¯á??á?ºá??á??á?ºá??á?¯ á??á?á??á??á??á?ºá??\n\ná??á??á?º á??á??á?ºá??á??á?º á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?á?¯á??á??á?¬á?¸?
-torbutton.popup.toggle.warning = Tor á??á?á?¯ á??á?á??á?ºá??á?¼á?®á?¸ á??á??á?ºá?·á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸ á?¡á??á?»á?á?¯á?¸á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯ á??á?¾á?á??á?±á??á??á?º á??á??á?ºá?¸á??á?á?¯á?¸á??á?¼á??á?ºá??á?½á??á?ºá?·á??á?á?¯á?· á??á?á?¯á?¡á??á?ºá??á??á?ºá??
 torbutton.popup.test.success = Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?»á??á?º á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á??á?º!
 torbutton.popup.test.failure = Tor á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«! á??á??á?ºá?· á??á??á?±á?¬á??á?ºá??á?®á??á?¾á??á?ºá?· Polipo á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á??á?ºá??á?±á?¸á??á?«á??
 torbutton.popup.test.confirm_toggle = á??á??á?ºá??á??á?±á?¬ Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??\n\ná??á??á?ºá?¸á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º á??á?±á??á?»á?¬á??á??á?¬á?¸á???\n\ná??á?¾á??á?ºá??á?»á??á?º - á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º á??á?¼á?¿á??á?¬á??á?á?¯ á??á?¼á?±á??á?¾á??á?ºá?¸á??á?á?¯á??á?ºá??á?»á?¾á??á?ºá?? á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯á??á?á?¯ Torbutton á??á??á?±á?¬á??á?ºá??á?® á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á?ºá?¸á??á?á?¯á?¸á?? á??á?¼á?¯á??á?¯á??á?ºá??á?¼á?®á?¸ á?¤á??á??á?á??á?±á?¸á??á?»á??á?ºá??á?á?¯ á??á??á?º á??á??á?ºá??á?¾á?¬á?¸á??á?á?¯á??á?ºá??á??á?ºá??
 torbutton.popup.test.ff3_notice = Tor á??á??á?±á?¬á??á?ºá??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á??á?ºá?¸á??á??á?ºá??á??á?º á??á?±á?¬á??á?ºá?¸á??á?¼á?®á??á?á?¯ á??á?¾á?á??á?ºá??á?«á?? á?¤á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?¶á?? á??á?¼á??á?ºá??á?»á??á?ºá??á?¬á??á?á??á?ºá?·á??á??á?ºá?? á??á?á??á?ºá??á?¾á??á?ºá??á?±á?¸á??á??á??á?º á??á?¼á??á?ºá??á??á?ºá??
-torbutton.panel.label.verified = Tor á?¡á??á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?¼á?®
-torbutton.popup.test.auto_failed = á?¡á??á?á?¯â??á?¡á??á?»á?±á?¬á??á?º Tor â??á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??\n\ná??á??á?ºá?¸á??á??á?º á??á??á?º á??á??á??á?º á??á?½á??á?ºá?·á??á?á?¯á??á??á?¬á?¸?
-torbutton.prefs.recommended = (á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á??á?º)
-torbutton.prefs.optional = (á??á?á?¯á?¡á??á?ºá??á?«á??)
-torbutton.prefs.crucial = (á?¡á??á?½á??á?ºá??á?¼á?®á?¸á??á??á?º)
 torbutton.popup.external.title = á??á?¼á??á?ºá??á??á?¾ á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º
 torbutton.popup.external.app = á??á?¼á??á?ºá?? á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸ á??á??á?ºá??á?¯á??á?á?¯ á??á?¼á?±á??á?¾á??á?ºá?¸á??á??á?º á??á?á?¯á?¡á??á?ºá??á??á?º - \n\n
 torbutton.popup.external.note = \n\ná??á?¾á??á?ºá??á?»á??á?º - á??á?¼á??á?ºá?? á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?»á?¬á?¸á??á??á?º á??á?¯á?¶á??á?¾á??á?ºá?¡á?¬á?¸á??á?¼á??á?ºá?· á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¬ Tor á??á??á?¯á??á?ºá??á?«á?? á??á??á?ºá?¸á?? á??á??á?ºá?·á??á?á?¯ á??á?±á?«á?ºá??á?á?¯á??á?ºá??á??á?ºá??\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?á?¯ á??
 torbutton.popup.cancel = á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º
 torbutton.popup.dontask = á??á??á?¯á?¡á??á?»á?á??á?ºá??á?¾á??á??á?¼á?®á?¸ á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?¼á?² á??á?½á??á?ºá?·á??á??á?º
 torbutton.popup.test.no_http_proxy = Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?»á??á?º - á??á?á?¯á??á??á?º HTTP á??á??á?±á?¬á??á?ºá??á?®á??á?á?¯ á??á??á?ºá??á?¾á??á?ºá?¸ á??á??á?¾á?®á??á?á?¯á??á?ºá??á?«á?? Polipo á??á??á?º á??á?±á?¬á??á?ºá?¸á??á?½á??á?ºá??á?½á?¬ á?¡á??á?¯á??á?º á??á?¯á??á?ºá??á?±á??á?«á??á??á?¬á?¸?
-torbutton.popup.captcha.title = á??á?°á??á?² Captchas á??á?á?¯ á??á?¾á?±á?¬á??á?ºá??á?¾á?¬á?¸á??á??á?¬á?¸?
-torbutton.popup.captcha.ask = Torbutton á??á??á?º á??á?°á??á?² Captcha á??á?á?¯ á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?á??á??á?ºá?? á?¤á??á?±á?¸á??á?¼á??á?ºá?¸á??á?»á??á?ºá??á?á?¯ á?¡á??á?¼á?¬á?¸ á??á?¾á?¬á??á?½á?±á??á?±á?¸ á?¡á??á?ºá??á?»á??á?ºá??á?® á??á??á?ºá?¸á??á?½á?¾á?²á??á??á?ºá??á?¬á?¸?
-torbutton.popup.captcha.always = á?¤á??á?¾á?¯á??á?ºá??á?¾á?¬á?¸á??á?¾á?¯á??á?á?¯ á??á??á?¯á??á?¾á??á??á?¼á?®á?¸ á?¡á??á?¼á?²á??á??á?ºá?¸ á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á??á?º
-torbutton.popup.redirect = á??á??á?ºá?¸á??á?½á?¾á?²á??á??á?º
-torbutton.popup.no_redirect = á??á??á?ºá?¸á??á??á?½á?¾á?²á??á?«
 torbutton.popup.prompted_language = á??á??á?ºá?· á??á?á?¯á??á?ºá??á?±á?¸á??á?á?¯á??á?ºá??á?¬ á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á??á?á?¯ á??á?á?¯á??á?á?¯ á??á??á?¾á?á??á??á?ºá?? Torbutton á??á??á?º á??á?½á??á?ºá??á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬ á??á?¬á?¸á??á?¾á??á?ºá?¸á??á?¼á??á?ºá?· á??á?±á?¬á??á?ºá?¸á??á?¶á??á?±á?¸á??á?á?¯á??á?ºá??á??á?ºá?? á??á??á?ºá?¸á??á?á?¯á?·á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á??á??á?ºá?· á??á?¬á??á?¬á??á?¼á??á?ºá?· á??á??á?ºá??á?¾á?¯á??á?á?¯á??á?±á?¬ á??á?½á??á?ºá??á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬á??á??á?¼á??á?ºá?· á??á?±á?«á?ºá??á?¼á??á?±á??á??á?º á??á?¼á??á?ºá??á??á?ºá??\n\ná??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯ á??á?á?¯á??á?¾á?á??á??á?ºá?¡á??á?½á??á?º á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬á??á?¼á??á?ºá?· á??á?½á??á?ºá??á??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á??á??á?º á??á?±á?¬á??á?ºá?¸á??á?¶á??á?á?¯á?
 ?á??á?¬á?¸?
 torbutton.popup.no_newnym = Torbutton á??á??á?º á??á??á?ºá?·á?¡á?¬á?¸ á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸ á?¡á??á??á?ºá??á?á?¯ á??á?¯á?¶á??á?¯á?¶á??á?¼á?¯á?¶á??á?¼á?¯á?¶ á??á??á?±á?¸á??á?á?¯á??á?ºá??á?«á?? á??á??á?ºá?¸á??á??á?º Tor á??á?á??á?ºá?¸á??á?»á?¯á??á?ºá??á?±á?¸ Port á??á?² á??á??á??á?ºá??á?±á?¬á??á?ºá??á?á?¯á??á?ºá??á?«á??\n\nTor Browser Bundle á??á?á?¯ á??á??á?º á??á?¯á?¶á?¸á??á?½á?²á??á?±á??á??á?¬á?¸?
-torbutton.popup.use_tbb = á??á??á?ºá??á??á?º Torbutton á??á?á?¯ á??á?®á?¸â??á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸á??á?¾á??á?ºá?· á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á?¯á?¶á??á?±á?«á?ºá??á??á?ºá?? á??á??á?ºá?¸á??á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á?±á?¬ á??á?¯á?¶á??á?¼á?¯á?¶á??á??á?ºá?· á??á?¼á??á?ºá??á??á?ºá??á?»á??á?º á??á??á?¯á??á?ºá??á?±á?¬á?·á??á?«á??\n\ná??á??á?ºá?¸á?¡á??á?¬á?¸á?? á??á?±á?¬á??á?ºá??á?¯á?¶á?¸á??á?½á??á?º Tor Browser Bundle á??á?á?¯ gettor@xxxxxxxxxxxxxx á??á?¶ á?¡á?®á?¸á??á?±á?¸á??á?º á??á?±á?¸á??á?á?¯á?·á??á?¼á??á?ºá?¸á??á?¼á??á?ºá?· (á??á?á?¯á?·) á?¡á?±á?¬á??á?ºá??á?« URL á?? â??á??á?±á?«á??á?ºá?¸á??á?¯á??á?º á??á?½á?²á??á?¼á??á?ºá?¸á??á?¼á??á?ºá?· á??á??á?ºá??á??á?¾á?á??á??á?º á??á?»á?½á??á?ºá?¯á??á?ºá??á?á?¯á?· á?¡á??á?¼á?¶á??á?¼á?¯á??á?á?¯á??á??á?º -
 torbutton.popup.pref_error = Torbutton á??á??á?º á?¦á?¸â??á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ Tor Browser á??á??á?á?¯á??á?á?¯á??á?ºá?¸á??á?²á?? á??á?½á??á?ºá?¸á??á?¶á??á??á?±á?¸á??á?á?¯á??á?ºá??á?«á??
 torbutton.popup.permission_denied = Tor Browser á??á?á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?½á??á?º á??á?½á??á?ºá?·á??á?¼á?¯á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¼á??á?ºá??á?»á?á??á?ºá??á?« á??á?á?¯á?·á??á??á?¯á??á?º á??á??á?ºá?¸á??á?á?¯ á??á?±á??á?¬á?¡á??á??á?ºá??á?á?¯á?· á??á?±á?¬á?ºá??á?®á??á?°á?¸á??á?«á??
 torbutton.popup.device_full = Disk á??á?¼á??á?ºá?·á??á?±á??á?¯á?¶á??á?±á?«á?ºá??á??á?ºá?? á??á?±á??á?¬á??á?á?¯ á?¡á??á?½á??á?ºá??á?¬á?¸á??á?« (á??á?á?¯á?·) Tor Browser á??á?á?¯ á??á??á?ºá??á?á??á?á??á?¬ á?¡á??á??á?ºá??á??á?ºá??á?¯á??á?² á??á?½á?¾á?±á?·á??á?á?¯á??á?ºá??á?«á??
diff --git a/src/chrome/locale/nah/torbutton.properties b/src/chrome/locale/nah/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/nah/torbutton.properties
+++ b/src/chrome/locale/nah/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/nap/torbutton.properties b/src/chrome/locale/nap/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/nap/torbutton.properties
+++ b/src/chrome/locale/nap/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 860095b..5aa7e1e 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Aktiver Tor
-torbutton.button.tooltip.enabled = Deaktiver Tor
 torbutton.panel.tooltip.disabled = Klikk for Ã¥ aktivere Tor
 torbutton.panel.tooltip.enabled = Klikk for Ã¥ deaktivere Tor
-torbutton.panel.plugins.disabled = Klikk for Ã¥ aktivere plugins
-torbutton.panel.plugins.enabled = Klikk for Ã¥ deaktivere plugins
 torbutton.panel.label.disabled = Tor er deaktivert
 torbutton.panel.label.enabled = Tor er aktivert
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton tilbyr en knapp til Ã¥ konfigurere Tor-innstillinger, samt rask og enkel tilgang til Ã¥ slette privat nettleserhistorikk.
-torbutton.popup.history.warning = Torbutton blokkerte aktivetet fra en fane lastet i en annen Tor-tilstand.\n\nDette er for Ã¥ omgÃ¥ Firefox Bugs 409737 og 417869.\n\nHvis dette popup-vinduet Ã¥pner seg uten grunn, er det en av fanene dine som prÃ¸ver Ã¥ oppdatere seg selv i bakgrunnen, og dette ble blokkert.\n\nFor Ã¥ oppdatere fanen i denne Tor-tilstanden, trykk 'enter' pÃ¥ adresselinjen.\n\n
-torbutton.popup.plugin.warning = Torbutton blokkerte direkte Tor-lasting av plugin-innhold.\n\nBruk lagre-som istedenfor.\n
-torbutton.popup.confirm_ca_certs = Torbutton notis: Det virker som om du ikke har noen egne Certificate Authorities. Ã? undersÃ¸ke Certificate Authority-listen er en treg operasjon og kommer til Ã¥ gjÃ¸re bytte til Tor saktere. Vil du bare deaktivere isolasjonen av Certificate Authority serfikater? (Hvis du ikke forstÃ¥r dette er det trygt Ã¥ trykke pÃ¥ OK)
-torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton i Firefox 3 er kjent for Ã¥ lekke tidssone og live-bokmerker via Tor.\n\nÃ?nsker du Ã¥ fortsette allikevel?
-torbutton.popup.toggle.warning = Du mÃ¥ toggle (deaktivere+aktivere) Tor eller starte nettleseren pÃ¥ nytt for at endringene skal tre i kraft.
 torbutton.popup.test.success = Tor proxy-test vellykket!
 torbutton.popup.test.failure = Tor proxy-test feilet! Sjekk proxy og Polipo-innstillingene dine.
 torbutton.popup.test.confirm_toggle = Den nyeste Tor-proxy testen feilet Ã¥ bruke Tor.\n\nEr du sikker pÃ¥ at du Ã¸nsker Ã¥ aktivere allikevel?\n\nMerk: Hvis du har fikset problemet sÃ¥ kan du kjÃ¸re testen pÃ¥ nytt i Torbutton Proxy Innstillinger for Ã¥ eliminere denne advarselen.
 torbutton.popup.test.ff3_notice = Klikk OK for Ã¥ teste Tor proxy-innstillinger. Denne testen vil kjÃ¸re i bakgrunnen. VÃ¦r tÃ¥lmodig.
-torbutton.panel.label.verified = Tor Verifisert
-torbutton.popup.test.auto_failed = Den automatiske Tor-proxy testen klarte ikke bruke Tor.\n\nEr du sikker pÃ¥ at du Ã¸nsker Ã¥ aktivere allikevel?
-torbutton.prefs.recommended = (anbefalt)
-torbutton.prefs.optional = (valgfritt)
-torbutton.prefs.crucial = (avgjÃ¸rende)
 torbutton.popup.external.title = Laste eksternt innhold?
 torbutton.popup.external.app = Et eksternt program er nÃ¸dvendig for Ã¥ hÃ¥ndtere:\n\n
 torbutton.popup.external.note = \n\nMERK: Eksterne program er IKKE Tor-sikker som standard og kan rÃ¸pe deg!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Start program
 torbutton.popup.cancel = Avbryt
 torbutton.popup.dontask = Start alltid programmer fra nÃ¥ av
 torbutton.popup.test.no_http_proxy = Tor-proxy test: Lokal HTTP-proxy kan ikke nÃ¥s. KjÃ¸rer Polipo skikkelig?
-torbutton.popup.captcha.title = UnngÃ¥ Google Captcha-er?
-torbutton.popup.captcha.ask = Torbutton oppdaget en Google Captcha. Vil du omdirigeres til annen sÃ¸kemotor for dette sÃ¸ket?
-torbutton.popup.captcha.always = Alltid gjÃ¸r dette fra nÃ¥ av
-torbutton.popup.redirect = Omdiriger
-torbutton.popup.no_redirect = Ikke omdiriger
 torbutton.popup.prompted_language = For Ã¥ gi deg et bedre personvern, kan Torbutton spÃ¸rre om en engelsksprÃ¥klig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker Ã¥ lese pÃ¥ morsmÃ¥let ditt vises pÃ¥ engelsk istedet.\n\nVil du spÃ¸rre om engelsksprÃ¥klige nettsider for Ã¥ bedre personvernet?
 torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor Control Port.\n\nKjÃ¸rer du Tor Browser Bundle?
-torbutton.popup.use_tbb = Det ser ut som om du bruker Torbutton med Firefox, noe som ikke er en anbefalt trygg lÃ¸sning lenger. \n\nVi anbefaler at du istedet laster ned den nyeste Tor Browser Bundle ved Ã¥ sende en e-post til gettor@xxxxxxxxxxxxxx eller ved Ã¥ laste den ned pÃ¥ fÃ¸lgende URL:
 torbutton.popup.pref_error = Torbutton kan ikke oppdatere innstillingene i Tor Browser profilkatalogen.
 torbutton.popup.permission_denied = Vennligst tilbakestill enten tillatelsene til Tor Browser katalogen eller kopier den til en ny beliggenhet.
 torbutton.popup.device_full = Harddisken er full. Vennligst frigjÃ¸r plass eller flytt Tor Browser til en ny enhet.
diff --git a/src/chrome/locale/ne/torbutton.properties b/src/chrome/locale/ne/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ne/torbutton.properties
+++ b/src/chrome/locale/ne/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 234d62c..3647617 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Tor inschakelen
-torbutton.button.tooltip.enabled = Tor uitschakelen
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP-adres onbekend
 torbutton.circuit_display.onion_site = Onion-site
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Onbekend land
 torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen.
 torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen
 torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen
-torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen
-torbutton.panel.plugins.enabled = Hier klikken om plugins uit te schakelen
 torbutton.panel.label.disabled = Tor uitgeschakeld
 torbutton.panel.label.enabled = Tor ingeschakeld
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton biedt een knop aan om Tor instellingen te configuren en snel en makkelijk privÃ© surfdata op te schonen.
-torbutton.popup.history.warning = Torbutton heeft een actie verhinderd uit een tab die geladen werd in een andere Tor toestand.\n\n Dit is een wegens Firefoxfout 409737 en 417869.\n\n Indien deze melding zonder schijnbare reden verschijnt, dan heeft een van uw tabs geprobeerd zichzelf te herladen. Dit werd verhinderd.\n\n Om deze tab in de huidige Tor-toestand te laden, moet 'Enter' gedrukt worden in de adresbalk.\n\n
-torbutton.popup.plugin.warning = Torbutton heeft het rechtstreeks laden van plugin-inhoud verhinderd.\n\nGebruik Opslaan als.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Nota : Er zijn schijnbaar geen aangepaste certificatieauthoriteiten geÃ¯nstalleerd. De certificatieauthoriteitslijst controlleren is een langzame operatie en vertraagt een Tor wissel. Mag het isoleren van de certificatieauthoriteitscertificaten uitgeschakeld worden ? (Indien deze vraag niet verstaanbaar is, mag er op OK geklikt worden)
-torbutton.popup.ff3.warning = Waarschuwing ! \n\n Torbutton op Firefox 3 kan de tijdzone en de livemarks via Tor lekken.\n\nBent U zeker om door te gaan ?
-torbutton.popup.toggle.warning = Het is nodig om Tor te wisselen of om te herstarten om deze instellingen toe te passen.
 torbutton.popup.test.success = Tor proxy test geslaagd!
 torbutton.popup.test.failure = Tor proxy test MISLUKT! Proxy en Polipo instellingen controlleren.
 torbutton.popup.test.confirm_toggle = De laatst uitgevoerde Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?\n\n Opmerking: Als het probleem opgelost is, kan de test in het Torbutton Proxy instellingsscherm opnieuw uitgevoerd worden om deze melding te vermijden.
 torbutton.popup.test.ff3_notice = Klik op OK om de Tor proxy instellingen te testen. Deze test gebeurt op de achtergrond. Even geduld aub.
-torbutton.panel.label.verified = Tor vastgesteld
-torbutton.popup.test.auto_failed = De automatische Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?
-torbutton.prefs.recommended = (aanbevolen)
-torbutton.prefs.optional = (optioneel)
-torbutton.prefs.crucial = (cruciaal)
 torbutton.popup.external.title = Wilt u een extern bestandstype downloaden?
 torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U zou het moeten openen in een andere applicatie.\n\n
 torbutton.popup.external.note = Bepaalde type bestanden kunnen ervoor zorgen dat applicaties verbinding met het internet maken zonder Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Download bestand
 torbutton.popup.cancel = Annuleren
 torbutton.popup.dontask = Download bestanden automatisch vanaf nu
 torbutton.popup.test.no_http_proxy = Tor proxy test : De lokale HTTP proxy is niet bereikbaar. Werkt Polipo zoals het hoort ?
-torbutton.popup.captcha.title = Google Captchas vermijden ?
-torbutton.popup.captcha.ask = Torbutton heeft een Google Captcha ontdekt. Mag deze vraag naar een andere zoekmachine gestuurd worden ?
-torbutton.popup.captcha.always = Vanaf nu steeds deze actie uitvoeren
-torbutton.popup.redirect = Verwijzen
-torbutton.popup.no_redirect = Niet verwijzen
 torbutton.popup.prompted_language = Om je meer privacy te geven kan Torbutton pagina's in de Engelse taal opvragen. Dit kan er voor zorgen dat web pagina's die je graag in je eigen taal wilt lezen in het Engels weergegeven worden. Wil je web pagina's in de Engelse taal opvragen voor betere privacy?
 torbutton.popup.no_newnym = Torbutton je niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor Control Port.\n\nGebruik je de Tor Browser Bundle?
-torbutton.popup.use_tbb = Het lijkt er op dat je Torbutton met Firefox gebruikt, dit is niet een aangeraden veilige configuratie.\n\nIn plaats daarvan raden we je aan om de laatste Tor Browser Bundle toe verkrijgen door een email te sturen naar gettor@xxxxxxxxxxxxxx of door het te downloaden bij de volgende URL:
 torbutton.popup.pref_error = Torbutton kan instellingen niet bijwerken in de Tor Browser profiel folder.
 torbutton.popup.permission_denied = Stel de rechten van de Tor Browser folder opnieuw in of kopieer deze naar een nieuwe lokatie.
 torbutton.popup.device_full = De schijf lijkt vol te zijn. Maak ruimte vrij of verplaats Tor Browser naar een nieuw apparaat.
diff --git a/src/chrome/locale/nn/torbutton.properties b/src/chrome/locale/nn/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/nn/torbutton.properties
+++ b/src/chrome/locale/nn/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/nso/torbutton.properties b/src/chrome/locale/nso/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/nso/torbutton.properties
+++ b/src/chrome/locale/nso/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/oc/torbutton.properties b/src/chrome/locale/oc/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/oc/torbutton.properties
+++ b/src/chrome/locale/oc/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/or/torbutton.properties b/src/chrome/locale/or/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/or/torbutton.properties
+++ b/src/chrome/locale/or/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index 0998732..7866f6f 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = à¨°à©±à¨¦ à¨?à¨°à©?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/pap/torbutton.properties b/src/chrome/locale/pap/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/pap/torbutton.properties
+++ b/src/chrome/locale/pap/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index c3e9be2..7bcb6bb 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = WÅ?Ä?cz Tora
-torbutton.button.tooltip.enabled = WyÅ?Ä?cz Tora
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP nieznany
 torbutton.circuit_display.onion_site = strona Onion
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Nieznane paÅ?stwo
 torbutton.content_sizer.margin_tooltip = PrzeglÄ?darka Tor dodaje ten margines po to, aby szerokoÅ?Ä? i wysokoÅ?Ä? okna Twojej przeglÄ?darki byÅ?a mniej charakterystyczna, dziÄ?ki temu zmniejszysz szanse Å?ledzenia Ciebie online.
 torbutton.panel.tooltip.disabled = Kliknij tutaj, aby wÅ?Ä?czyÄ? Tora
 torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅ?Ä?czyÄ? Tora
-torbutton.panel.plugins.disabled = Kliknij aby wÅ?Ä?czyÄ? wtyczki
-torbutton.panel.plugins.enabled = Kliknij aby wyÅ?Ä?czyÄ? wtyczki
 torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
 torbutton.panel.label.enabled = Tor wÅ?Ä?czony
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton udostÄ?pnia przycisk do konfiguracji ustawieÅ? Tora oraz szybkiego i Å?atwego usuwania prywatnych danych z przeglÄ?darki.
-torbutton.popup.history.warning = Torbutton zablokowaÅ? dziaÅ?alnoÅ?Ä? z karty zaÅ?adowanej w innym stanie Tora.\n\nMa to na celu obejÅ?cie bÅ?Ä?dÃ³w Firefoksa o numerach 409737 i 417869."\nJeÅ?li to okienko pojawiÅ?o siÄ? bez powodu, jedna z kart prÃ³buje przeÅ?adowaÄ? siÄ? w tle, i to zostaÅ?o zablokowane.\n\nAby przeÅ?adowaÄ? tÄ? kartÄ? w tym stanie Tora, wciÅ?nij 'enter' w pasku adresu.\n\n
-torbutton.popup.plugin.warning = Torbutton zablokowaÅ? bezpoÅ?rednie odwoÅ?anie do Sieci przez plugin.\n\nUÅ¼yj Zapisz jako.\n\n
-torbutton.popup.confirm_ca_certs = Informacja Torbutton: WyglÄ?da na to, Å¼e nie posiadasz dodatkowych wpisÃ³w OÅ?rodkÃ³w CertyfikujÄ?cych. Posiadanie takiej listy spowalnia przeÅ?Ä?czanie trybÃ³w Tora. Czy chciaÅ?byÅ? wyÅ?Ä?czyÄ? sprawdzanie OÅ?rodkÃ³w CertyfikujÄ?cych? (jeÅ?li tego nie rozumiesz, moÅ¼esz bezpiecznie kliknÄ?Ä? OK)
-torbutton.popup.ff3.warning = Uwaga!\n\nTorbutton na Firefox-ie 3 ujawnia TwojÄ? strefÄ? czasowÄ? oraz livemarks.\n\nCzy mimo to chcesz kontynuowaÄ??
-torbutton.popup.toggle.warning = Musisz ponownie wÅ?Ä?czyÄ? Tora aby ustawienia odniosÅ?y skutek.
 torbutton.popup.test.success = Test proxy zakoÅ?czony pomyÅ?lnie!
 torbutton.popup.test.failure = Test proxy siÄ? NIE POWIÃ?DÅ?! SprawdÅº swoje ustawienia proxy i Polipo.
 torbutton.popup.test.confirm_toggle = Najnowszemu testowi proxy Tor nie udaÅ?o siÄ? skorzystaÄ? z Tora.\n\nNa pewno chcesz wÅ?Ä?czyÄ? mimo tego?\n\nUwaga: JeÅ?li problem zostaÅ? poprawiony, moÅ¼esz ponownie uruchomiÄ? test w oknie Preferencji Proxy Torbuttona, aby wyÅ?Ä?czyÄ? to ostrzeÅ¼enie.
 torbutton.popup.test.ff3_notice = Kliknij OK aby przetestowaÄ? ustawienia proxy. Testowanie odbywa siÄ? w tle. Prosimy o cierpliwoÅ?Ä?.
-torbutton.panel.label.verified = Tor zweryfikowany
-torbutton.popup.test.auto_failed = Automatyczny test proxy Tora zakoÅ?czyÅ? siÄ? niepowodzeniem.\n\nCzy mimo to chcesz kontynuowaÄ??
-torbutton.prefs.recommended = (zalecane)
-torbutton.prefs.optional = (opcjonalnie)
-torbutton.prefs.crucial = (krytyczne)
 torbutton.popup.external.title = PobraÄ? zewnÄ?trzny typ pliku?
 torbutton.popup.external.app = Tor Browser nie moÅ¼e wyÅ?wietliÄ? tego pliku. Musisz otworzyÄ? go z innej aplikacji\n\n
 torbutton.popup.external.note = NiektÃ³re typy plikÃ³w mogÄ? spowodowaÄ? poÅ?Ä?czenie siÄ? aplikacji z internetem bez uÅ¼ycia sieci Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Pobierz plik
 torbutton.popup.cancel = Anuluj
 torbutton.popup.dontask = Automatyczne pobieranie plikÃ³w jest od teraz wÅ?Ä?czone
 torbutton.popup.test.no_http_proxy = Test Tor proxy: Lokalne Proxy HTTP jest nieosiÄ?galne. Czy Polipo dziaÅ?a prawidÅ?owo?
-torbutton.popup.captcha.title = UnikaÄ? Google Captcha?
-torbutton.popup.captcha.ask = Torbutton wykryÅ? Google Captcha. Czy chcesz, aby CiÄ? przekierowaÄ? na innÄ? wyszukiwarkÄ? dla tego zapytania?
-torbutton.popup.captcha.always = Od teraz zawsze wykonuj tÄ? akcjÄ?
-torbutton.popup.redirect = Przekieruj
-torbutton.popup.no_redirect = Nie przekierowuj
 torbutton.popup.prompted_language = Aby daÄ? Ci wiÄ?cej prywatnoÅ?ci, Torbutton moÅ¼e Å¼Ä?daÄ? angielskich wersji stron internetowych. To moÅ¼e spowodowaÄ?, Å¼e strony, ktÃ³re wolisz czytaÄ? we wÅ?asnym jÄ?zyku bÄ?dÄ? siÄ? zamiast tego wyÅ?wietlaÄ? po angielsku.\n\nCzy chcesz Å¼Ä?daÄ? stron w jÄ?zyku angielskim dla lepszej prywatnoÅ?ci?
 torbutton.popup.no_newnym = Torbutton nie moÅ¼e bezpiecznie daÄ? Ci nowej toÅ¼samoÅ?ci. Nie ma dostÄ?pu do Portu Kontrolnego Tora.\n\nUÅ¼ywasz Paczki Tora z PrzeglÄ?darkÄ??
-torbutton.popup.use_tbb = WyglÄ?da na to, Å¼e uÅ¼ywasz Torbuttona z Firefoksem, co juÅ¼ nie jest zalecanÄ? bezpiecznÄ? konfiguracjÄ?.\n\nZamiast tego, zalecamy pobranie najnowszej Paczki Tora z PrzeglÄ?darkÄ? poprzez wysÅ?anie e-maila na gettor@xxxxxxxxxxxxxx lub pobranie jej pod nastÄ?pujÄ?cym adresem:
 torbutton.popup.pref_error = Torbutton nie moÅ¼e zaktualizowaÄ? preferencji w katalogu profilowym PrzeglÄ?darki Tora.
 torbutton.popup.permission_denied = ProszÄ? albo ponownie ustawiÄ? uprawnienia do katalogu PrzeglÄ?darki Tora albo skopiowaÄ? go w nowe miejsce.
 torbutton.popup.device_full = Dysk zdaje siÄ? byÄ? peÅ?ny. ProszÄ? zwolniÄ? miejsce lub przenieÅ?Ä? PrzeglÄ?darkÄ? Tora na nowe urzÄ?dzenie.
diff --git a/src/chrome/locale/pms/torbutton.properties b/src/chrome/locale/pms/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/pms/torbutton.properties
+++ b/src/chrome/locale/pms/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ps/torbutton.properties b/src/chrome/locale/ps/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ps/torbutton.properties
+++ b/src/chrome/locale/ps/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 15fcdf2..cc48df6 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Habilitar Tor
-torbutton.button.tooltip.enabled = Desabilitar Tor
 torbutton.panel.tooltip.disabled = Clique para habilitar Tor
 torbutton.panel.tooltip.enabled = Clique para desabilitar Tor
-torbutton.panel.plugins.disabled = Clique para habilitar plugins
-torbutton.panel.plugins.enabled = Clique para desabilitar plugins
 torbutton.panel.label.disabled = Tor desabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton fornece um botÃ£o para rapidamente configurar o Tor e facilmente limpar dados de navegaÃ§Ã£o privados.
-torbutton.popup.history.warning = Torbutton bloqueou atividade de uma aba carregada em um estado diferente do Tor.\n\nIsto Ã© para contornar os bugs 409737 e 417869  do Firefox.\n\nSe este popup pareceu ter acontecido sem motivo, uma de suas abas estÃ¡ tentando se auto atualizar em segundo plano, e isto foi bloqueado.\n
-torbutton.popup.plugin.warning = Torbutton bloqueou carregamento do plugin de conteÃºdo do TOR.\n\nUse o Salvar como.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton: VocÃª nÃ£o possui nenhum Certificado de AutenticaÃ§Ã£o. Verificar a lista de Certificado de AutenticaÃ§Ã£o pode ser uma operaÃ§Ã£o lenta para oo TOR. Gostaria de desabilitar o modo de isolamento de Certificado de AutenticaÃ§Ã£o? (Se vocÃª nÃ£o entendeu, o mais seguro Ã© clicar OK)
-torbutton.popup.ff3.warning = Aviso!\n\nTorbutton no Firefox 3 Ã© conhecido por divulgar seu fuso-horÃ¡rio e  o livemarks via Tor.\n\nVocÃª realmente deseja prosseguir?
-torbutton.popup.toggle.warning = VocÃª precisa ativar o Tor ou reiniciar para que suas configuraÃ§Ãµes tenham efeito.
 torbutton.popup.test.success = O teste do proxy Tor foi feito com sucesso.
 torbutton.popup.test.failure = O teste do proxy FALHOU! Verifique seu proxy e as configuraÃ§Ãµes do Polipo.
 torbutton.popup.test.confirm_toggle = O test do proxy Tor mais recente falhou ao usar o Tor.\n\nVocÃª tem certeza que deseja habilitar assim mesmo?\n\nNota: Se vocÃª tiver arrumado o problema, vocÃª pode retornar ao teste na janela Torbutton Proxy Preferences para eliminar este aviso.
 torbutton.popup.test.ff3_notice = Clique OK para testar as configuraÃ§Ãµes do proxy Tor. Este teste acontecerÃ¡ em segundo plano. Por favor seja paciente.
-torbutton.panel.label.verified = Tor verificado.
-torbutton.popup.test.auto_failed = O teste automÃ¡tico do Tor proxy falhou ao usar o Tor.\n\nVocÃª tem certeza que deseja habilitar assim mesmo?
-torbutton.prefs.recommended = (recomendado)
-torbutton.prefs.optional = (opcional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Carregar conteÃºdo externo?
 torbutton.popup.external.app = Uma aplicaÃ§Ã£o externa Ã© necessÃ¡ria para manipular:\n\n
 torbutton.popup.external.note = \n\nNOTA: AplicaÃ§Ãµes externas NÃ?O sÃ£o seguras por padrÃ£o e podem desmascarar vocÃª!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Rode a aplicaÃ§Ã£o
 torbutton.popup.cancel = Cancelado
 torbutton.popup.dontask = Sempre ative aplicaÃ§Ãµes a partir de agora
 torbutton.popup.test.no_http_proxy = Teste do Tor proxy: HTTP Proxy local estÃ¡ inacessÃvel. Polipo estÃ¡ rodando devidamente?
-torbutton.popup.captcha.title = Evitar Google Captchas?
-torbutton.popup.captcha.ask = Torbuttor detecetou um Google Captcha. VocÃª gostaria de ser redirecionado para outro mecanismo de busca para esta consulta?
-torbutton.popup.captcha.always = Sempre realizar esta aÃ§Ã£o de agora em diante
-torbutton.popup.redirect = Redirecionar
-torbutton.popup.no_redirect = NÃ£o redirecionar
 torbutton.popup.prompted_language = Para proporcionar mais privacidade a vocÃª, o Torbutton pode requisitar a versÃ£o em inglÃªs de pÃ¡ginas da web. Isso pode fazer com que pÃ¡ginas que vocÃª prefere ler na sua lÃngua nativa apareÃ§am em InglÃªs.
 torbutton.popup.no_newnym = O Torbutton nÃ£o pode te dar uma nova identidade com seguranÃ§a. Ele nÃ£o tem acesso Ã  Porta de Controle Tor.\n\\n\nVocÃª estÃ¡ usando o Tor Browser Bundle?
-torbutton.popup.use_tbb = Parece que vocÃª estÃ¡ usando o Torbutton com o Firefox, que nÃ£o Ã© mais uma configuraÃ§Ã£o segura recomendada.\n\nEm vez disso, recomendamos que obtenha a versÃ£o mais recente do Tor Browser Bundle, enviando um e-mail para gettor@xxxxxxxxxxxxxx ou fazendo o download no seguinte endereÃ§o:
 torbutton.popup.pref_error = O Torbutton nÃ£o pode atualizar as preferÃªncias na pasta de perfil do Tor Browser.
 torbutton.popup.permission_denied = Por favor, restaure as permissÃµes da pasta do Tor browser ou copie-a para um outro lugar.
 torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere espaÃ§o ou mova o Tor Browser para um novo dispositivo.
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index b65f4a4..e44eadd 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Ativar Tor
-torbutton.button.tooltip.enabled = Desativar Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconhecido
 torbutton.circuit_display.onion_site = Site do Onion
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = PaÃs desconhecido
 torbutton.content_sizer.margin_tooltip = O Navegador Tor adiciona esta margem para realÃ§ar a altura e a largura da sua janela, e com isso reduz  a possibilidade de as pessoas o rastrearem on-line.
 torbutton.panel.tooltip.disabled = Clique para ativar o Tor
 torbutton.panel.tooltip.enabled = Clique para desativar o Tor
-torbutton.panel.plugins.disabled = Clique para ativar as extensÃµes
-torbutton.panel.plugins.enabled = Clique para desativar as extensÃµes
 torbutton.panel.label.disabled = Tor Desativado
 torbutton.panel.label.enabled = Tor Ativado
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = o Torbutton proporciona um botÃ£o para configurar as configuraÃ§Ãµes do Tor e para limpar facilmente e rapidamente os dados de navegaÃ§Ã£o privados.
-torbutton.popup.history.warning = O Torbutton bloqueou a atividade de um separador carregado num diferente estado do Tor.\n\nIsto Ã© para contornar os erros do Firefox 409737 e 417869.\n\nSe esta janela aparecer sem qualquer motivo aparente, um dos seus separadores estÃ¡ a tentar recarregar-se em segundo plano, e este foi bloqueado.\n\nPara recarregar o separador neste estado do Tor, pressione 'enter' na caixa de localizaÃ§Ã£o do URL.\n\n
-torbutton.popup.plugin.warning = Torbutton bloqueou o carregamento direto do Tor do conteÃºdo do plugin.\n\nEm vez disso, utilize o Guardar Como.\n\n
-torbutton.popup.confirm_ca_certs = Nota de Torbutton: parece que nÃ£o possui nenhum Certificado de AutenticaÃ§Ã£o. Verificar a lista de Certificado de AutenticaÃ§Ã£o Ã© uma operaÃ§Ã£o lenta e abranda o alternar do Tor. Gostaria de desativar o modo de isolamento do Certificado de AutenticaÃ§Ã£o? (Se nÃ£o compreendeu esta mensagem, o mais seguro Ã© clicarem "CONFIRMAR")
-torbutton.popup.ff3.warning = Aviso!\n\nO Torbutton no Firefox 3 Ã© conhecido por dar a conhecer o seu fuso horÃ¡rio e os seus Live Marks, atravÃ©s da rede Tor.\n\nTem a certeza que deseja continuar?
-torbutton.popup.toggle.warning = Precisa de alternar o Tor ou reiniciar para aplicar as suas configuraÃ§Ãµes.
 torbutton.popup.test.success = Teste do proxy bem sucedido!
 torbutton.popup.test.failure = Teste do proxy Tor - FALHOU! Verifique as configuraÃ§Ãµes do proxy e Polipo.
 torbutton.popup.test.confirm_toggle = O mais recente teste de utilizaÃ§Ã£o de Tor falhou.\n\nTem a certeza que deseja continuar mesmo assim?\n\nNota: Se jÃ¡ resolveu o problema, Ã© recomendado voltar a testar a ligaÃ§Ã£o nas PreferÃªncias do Torbutton para remover este aviso.
 torbutton.popup.test.ff3_notice = Clique em "CONFIRMAR" para testar as configuraÃ§Ãµes do proxy Tor. Este teste serÃ¡ realizado em segundo plano. Por favor, seja paciente.
-torbutton.panel.label.verified = Tor Verificado
-torbutton.popup.test.auto_failed = O teste automÃ¡tico ao proxy Tor falhou.\n\nDeseja activar mesmo assim?
-torbutton.prefs.recommended = (recomendado)
-torbutton.prefs.optional = (opcional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Transferir um tipo de ficheiro externo?
 torbutton.popup.external.app = O navegador Tor nÃ£o consegue exibir este ficheiro. PoderÃ¡ ter que o abrir com outra aplicaÃ§Ã£o.\n\n
 torbutton.popup.external.note = Alguns tipos dos ficheiros podem fazer com que as aplicaÃ§Ãµes liguem Ã  Internet sem utilizar o Tor.\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Transferir ficheiro
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de agora, transferir automaticamente os ficheiros
 torbutton.popup.test.no_http_proxy = Teste do proxy do Tor: Proxy HTTP local inacessÃvel. O Polipo estÃ¡ devidamente em execuÃ§Ã£o?
-torbutton.popup.captcha.title = Evitar Captchas do Google?
-torbutton.popup.captcha.ask = O Torbutton detetou uma Captcha do Google. Deseja ser redirecionado para um novo mecanismo de procura, utilizando esta consulta?
-torbutton.popup.captcha.always = A partir de agora, efetuar sempre esta aÃ§Ã£o
-torbutton.popup.redirect = Redirecionar
-torbutton.popup.no_redirect = NÃ£o Redirecionar
 torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versÃ£o em inglÃªs em pÃ¡ginas da Internet. Isto pode causar a visualizaÃ§Ã£o em inglÃªs das pÃ¡ginas que prefere ler em portuguÃªs.\n\nPretende visualizar pÃ¡ginas em inglÃªs, para melhor privacidade?
 torbutton.popup.no_newnym = O Torbutton nÃ£o pode, em seguranÃ§a, fornecer-lhe uma nova identidade. NÃ£o tem acesso Ã  porta de controle Tor.\n\nEstÃ¡ a usar o Tor Browser Bundle?
-torbutton.popup.use_tbb = Parece estar a usar Torbutton com Firefox, o que jÃ¡ nÃ£o Ã© recomendado como uma configuraÃ§Ã£o segura.\n\nEm alternativa, sugerimos que obtenha o Ãºltimo Tor Browser Bundle atravÃ©s de envio de e-mail para: gettor@xxxxxxxxxxxxxx ou carregando para o computador o ficheiro na seguinte URL:
 torbutton.popup.pref_error = O Torbutton nÃ£o consegue atualizar as preferÃªncias na diretoria do perfil do Navegador Tor.
 torbutton.popup.permission_denied = Por favor, reinicie as permissÃµes da diretoria do Navegador Tor ou copie-a para uma nova localizaÃ§Ã£o.
 torbutton.popup.device_full = O disco parece estar cheio. Por favor, liberte espaÃ§o ou mova o Navegador Tor para um novo dispositivo.
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index 439e821..cf8e250 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Activeaza Tor
-torbutton.button.tooltip.enabled = OpreÅ?te Tor
 torbutton.panel.tooltip.disabled = Click pentru a porni Tor
 torbutton.panel.tooltip.enabled = Click pentru a opri Tor
-torbutton.panel.plugins.disabled = Click pentru a porni plugin-urile
-torbutton.panel.plugins.enabled = Click pentru a opri plugin-urile
 torbutton.panel.label.disabled = Tor a fost oprit
 torbutton.panel.label.enabled = Tor a fost pornit
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = ButonulTOR ofera posibilitatea de a configura setarile browser-ului si de a golii rapid si usor datele private ale navigarii.
-torbutton.popup.history.warning = Torbutton a blocat activitatea unei file Ã®ncÄ?rcate Ã®ntr-un alt stat Tor.\nAcesta este pentru a lucru cu bug-urile 409737 Å?i 417869 din Firefox.\nDacÄ? acest pop-up pÄ?re sÄ? se aparÄ? fÄ?rÄ? nici un motiv, una dintre filele care Ã®ncercÄ? sa se reÃ®ncarce singurÄ? Ã®n fundal, a fost blocatÄ?.\n\nPentru a reÃ®ncÄ?rca fila Ã®n aceastÄ? stare Tor, apasÄ? "Enter" Ã®n caseta de URL.\n\n
-torbutton.popup.plugin.warning = Torbutton a blocat direct Tor pentru a Ã®ncÄ?rca conÅ£inutul plugin.\n\nUtilizaÅ£i SalvaÅ£i-Ca Ã®n loc.\n\n
-torbutton.popup.confirm_ca_certs = ObservaÅ£ie Torbutton: Se pare cÄ? nu aveÅ£i nici un Certificat de autoritate. Examinarea listei cu Certificate de Autoritate este o operaÅ£ie lentÄ? Å?i Ã®ncetineÅ?te comutare Tor. DoriÅ£i sÄ? dezactivaÅ£i izolarea Certificatelelor de autoritate? (DacÄ? nu Ã®nÅ£elegem acest lucru, este sigur sÄ? faceÅ£i clic pe OK)
-torbutton.popup.ff3.warning = AtenÅ£ie!\n\nTorbutton pe Firefox 3 este cunoscut de scurgerea fusului orar Å?i livemarks prin Tor.\n\nDoriÅ£i sÄ? continuaÅ£i oricum?
-torbutton.popup.toggle.warning = Este nevoie pentru a comuta Tor sau sÄ? Ã®l reporniÅ£i pentru ca setÄ?rile sÄ? aibÄ? efect.
 torbutton.popup.test.success = Testul proxy Tor a fost efectuat cu succes!
 torbutton.popup.test.failure = Testul proxy Tor a EÅ?UAT! VerificaÅ£i setÄ?rile proxy Å?i Polipo.
 torbutton.popup.test.confirm_toggle = Cel mai recent test de proxy Tor a eÅ?uat sÄ? foloseasca Tor.\n\nEÅ?ti sigur cÄ? vrei sÄ? Ã®l activezi oricum?\n\nObservatie: DacÄ? aÅ£i fixat problema, puteÅ£i sÄ? rulaÅ£i din nou testul Proxy Torbutton din fereastra Preferences sÄ? elimine acest avertisment.
 torbutton.popup.test.ff3_notice = ApasÄ? OK pentru a testa setÄ?rile proxy Tor. Acest test se va efectua Ã®n spate. VÄ? rugÄ?m sÄ? aveÅ£i rÄ?bdare.
-torbutton.panel.label.verified = Verificat de Tor
-torbutton.popup.test.auto_failed = Testul automat pentru proxy Tor a eÅ?uat la folosirea Tor.\n\nSunteÅ£i sigur cÄ? vreÅ£i sÄ? permiteÅ£i oricum?
-torbutton.prefs.recommended = (recomandat)
-torbutton.prefs.optional = (opÅ£ional)
-torbutton.prefs.crucial = (critic)
 torbutton.popup.external.title = SÄ? Ã®ncarc conÈ?inutul extern?
 torbutton.popup.external.app = O aplicaÅ£ie externÄ? este necesarÄ? sÄ? se ocupe de:\n\n
 torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄ?rile implicite Tor, Å?i vÄ? pot demasca!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = PorneÈ?te aplicaÈ?ia
 torbutton.popup.cancel = Anulare
 torbutton.popup.dontask = Ã?ntotdeauna lanseazÄ? aplicaÅ£ii de acum Ã®ncolo
 torbutton.popup.test.no_http_proxy = Testul proxy Tor: Local proxy HTTP este inaccesibil. Este Polipo executat corect?
-torbutton.popup.captcha.title = EvitaÅ£i captcha Google?
-torbutton.popup.captcha.ask = Torbutton a detectat un captcha Google.DoreÅ?ti sa fii redirecÅ£ionat cÄ?tre un alt motor de cÄ?utare pentru aceastÄ? interogare?
-torbutton.popup.captcha.always = Se ca efectua Ã®ntotdeauna aceastÄ? acÅ£iune de acum Ã®ncolo
-torbutton.popup.redirect = RedirecÅ£ioneazÄ?
-torbutton.popup.no_redirect = Nu RedirecÅ£iona
 torbutton.popup.prompted_language = Pentru a va asigura o confidentialitate sporita, Torbutton poate solicita versiunea in limba engleza a paginilor web. Acest lucru poate determina afisarea in limba engleza a paginilor pe care ati fi dorit sa le cititi in limba dumneavoastra natala.\n\nDoriti sa solicitati versiunea in limba engleza a paginilor web pentru a va bucura de o confidentialitate sporita ?
 torbutton.popup.no_newnym = Torbutton nu va poate oferi in siguranta o noua identitate. Nu are acces la Tor Control Port\n\nSunteti sigur ca utilizati Tor Browser Bundle?
-torbutton.popup.use_tbb = Se pare ca utilizati Torbutton Ã®mpreunÄ? cu Firefox, ceea ce nu mai este recomandatÄ? ca fiind o configuratie sigurÄ?.\n\nIn schimb, va recomandam sa obtineti ultima versiune a Tor Browser Bundle trimitand un email la: gettor@xxxxxxxxxxxxxx sau prin descarcarea acesteia de la urmatoarea adresa URL: 
 torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in directorul de profile al Tor Bowser.
 torbutton.popup.permission_denied = Va rugam fie sa resetati permisiunile directorului Tor Browser fie sa il copiati intr-o locatie noua.
 torbutton.popup.device_full = Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc sau sa mutati Tor browser pe un nou dispozitiv.
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index bdda36c..65d1d63 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
-torbutton.button.tooltip.enabled = Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torbutton.circuit_display.internet = Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?
 torbutton.circuit_display.ip_unknown = IP Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?ÐµÐ½
 torbutton.circuit_display.onion_site = "Ð?Ñ?ÐºÐ¾Ð²Ñ?Ð¹" Ñ?Ð°Ð¹Ñ?
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð°
 torbutton.content_sizer.margin_tooltip = Tor Browser Ð´Ð¾Ð±Ð°Ð²Ð»Ñ?ÐµÑ? Ñ?Ñ?Ð¾Ñ? Ð¾Ñ?Ñ?Ñ?Ñ?Ð¿, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¸ Ð²Ñ?Ñ?Ð¾Ñ?Ð° Ð¾ÐºÐ½Ð° Ð±Ñ?Ð»Ð¸ Ð¼ÐµÐ½ÐµÐµ Ñ?Ð·Ð½Ð°Ð²Ð°ÐµÐ¼Ñ?Ð¼Ð¸, Ñ?Ñ?Ð¾ Ñ?Ñ?Ð»Ð¾Ð¶Ð½Ñ?ÐµÑ? Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ? Ð¾Ñ?Ñ?Ð»ÐµÐ´Ð¸Ñ?Ñ? Ð?Ð°Ñ? Ð² Ñ?ÐµÑ?Ð¸.
 torbutton.panel.tooltip.disabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torbutton.panel.tooltip.enabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
-torbutton.panel.plugins.disabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ?
-torbutton.panel.plugins.enabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ?
 torbutton.panel.label.disabled = Tor Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½
 torbutton.panel.label.enabled = Tor Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°ÐµÑ? ÐºÐ½Ð¾Ð¿ÐºÑ?, Ñ?Ñ?Ð¾Ð±Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Tor Ð¸ Ð±Ñ?Ñ?Ñ?Ñ?Ð¾ Ð¸ Ð»ÐµÐ³ÐºÐ¾ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ñ? Ð»Ð¸Ñ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð°.
-torbutton.popup.history.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? Ñ? Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸, Ð·Ð°Ð³Ñ?Ñ?Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð¸Ð· Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ñ? Tor.\n\nÐÑ?Ð¾ Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð¾Ð´Ð° Ð´ÐµÑ?ÐµÐºÑ?Ð¾Ð² Firefox 409737 417869.\n\nÐ?Ñ?Ð»Ð¸ Ñ?Ñ?Ð¾ Ð¿Ñ?ÐµÐ´Ñ?Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¾ Ð±ÐµÐ· Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ñ?, Ð¾Ð´Ð½Ð° Ð¸Ð· Ð²Ð°Ñ?Ð¸Ñ? Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð»Ð°Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ?Ñ?Ñ? Ð² Ñ?Ð¾Ð½Ð¾Ð²Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ, Ð¸ Ñ?Ñ?Ð° Ð¿Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð±Ñ?Ð»Ð° Ð¿Ñ?ÐµÑ?ÐµÑ?ÐµÐ½Ð°.\n\nÐ?Ð»Ñ? Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ð¸ Tor, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ "enter" Ð² Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐµ URL.\n\n
-torbutton.popup.plugin.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð¿Ñ?Ñ?Ð¼Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÑ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² Ñ?ÐµÑ?ÐµÐ· Tor.\n\nÐ?Ð°Ð³Ñ?Ñ?Ð¶Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? ÐºÐ°Ðº.\n\n
-torbutton.popup.confirm_ca_certs = Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ: Ð¾Ñ?ÐµÐ²Ð¸Ð´Ð½Ð¾ Ñ? Ð²Ð°Ñ? Ð½ÐµÑ? Ð¸Ð½Ð´Ð¸Ð²Ð¸Ð´Ñ?Ð°Ð»Ñ?Ð½Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸. Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð¸ Ð·Ð°Ð¼ÐµÐ´Ð»Ñ?ÐµÑ? Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Tor. Ð¥Ð¾Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð·Ð¾Ð»Ñ?Ñ?Ð¸Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸? (Ð?Ñ?Ð»Ð¸ Ð?Ñ? Ð½Ðµ Ð¿Ð¾Ð½Ð¸Ð¼Ð°ÐµÑ?Ðµ Ð¾ Ñ?ÐµÐ¼ Ñ?ÐµÑ?Ñ?, Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½ÐµÐ¹ Ð½Ð°Ð¶Ð°Ñ?Ñ? OK)
-torbutton.popup.ff3.warning = Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!\n\nÐ?Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾, Ñ?Ñ?Ð¾ Torbutton Ð² Firefox 3 Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°ÐµÑ? Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?ÐºÐ¸ Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¾ Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ livemarks Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ñ?Ñ?Ð²Ð¾Ð¼ Tor.\n\nÐ?Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ñ??
-torbutton.popup.toggle.warning = Ð§Ñ?Ð¾Ð±Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð²Ñ?Ñ?Ñ?Ð¿Ð¸Ð»Ð¸ Ð² Ñ?Ð¸Ð»Ñ?, Ð½Ñ?Ð¶Ð½Ð¾ Ð²Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð¿ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor.
 torbutton.popup.test.success = Tor proxy Ñ?ÐµÑ?Ñ? Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¿Ñ?Ð¾Ð¹Ð´ÐµÐ½!
 torbutton.popup.test.failure = Ð¢ÐµÑ?Ñ? Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð»Ñ?Ñ? Ð?Ð?Ð£Ð?Ð?Ð§Ð?Ð?! Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Polipo.
 torbutton.popup.test.confirm_toggle = Ð¡Ð°Ð¼Ð¾Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ðµ Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Tor.\n\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor Ð½Ðµ Ñ?Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð» Ñ?ÐµÑ?Ñ?Ð°?\n\nÐ?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ: Ð?Ñ?Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ?ÐµÑ?ÐµÐ½Ð°, Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ñ?Ð´ÐµÑ? Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ñ?Ñ? Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ð¹ Ð² Ð¾ÐºÐ½Ðµ 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Torbutton' Ð´Ð»Ñ? Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ð¿Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ?.
 torbutton.popup.test.ff3_notice = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ OK Ð´Ð»Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Tor. ÐÑ?Ð¾Ñ? Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð² Ñ?Ð¾Ð½Ðµ. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð´Ð¾Ð¶Ð´Ð¸Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ð².
-torbutton.panel.label.verified = Tor Ð?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½
-torbutton.popup.test.auto_failed = Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ð¹ Ñ?ÐµÑ?Ñ? Tor proxy Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Tor Ñ?ÐµÑ?Ñ?.\n\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor Ð½Ðµ Ñ?Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð» Ñ?ÐµÑ?Ñ?Ð°?
-torbutton.prefs.recommended = (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÑ?Ñ?Ñ?)
-torbutton.prefs.optional = (Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ?)
-torbutton.prefs.crucial = (ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)
 torbutton.popup.external.title = Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Ð²Ð½ÐµÑ?Ð½Ð¸Ð¹ Ñ?Ð°Ð¹Ð»?
 torbutton.popup.external.app = Tor Browser Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ? Ñ?Ð°Ð¹Ð». Ð?Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? ÐµÐ³Ð¾ Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?.\n\n
 torbutton.popup.external.note = Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ð¸Ð¿Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð² Ð¼Ð¾Ð³Ñ?Ñ? Ð²Ñ?Ð·Ð²Ð°Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?, Ñ?Ð¾ÐµÐ´Ð¸Ð½Ñ?Ñ?Ñ?Ð¸ÐµÑ?Ñ? Ñ? Ñ?ÐµÑ?Ñ?Ñ? Ð±ÐµÐ· Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð»
 torbutton.popup.cancel = Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?
 torbutton.popup.dontask = Ð¡ Ñ?Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð»Ñ? Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸
 torbutton.popup.test.no_http_proxy = Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸-Ñ?ÐµÑ?Ñ?: Ð?ÐµÑ?Ñ?Ð½Ñ?Ðµ HTTP-Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?. Ð Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?-Ð»Ð¸ Polipo Ð´Ð¾Ð»Ð¶Ð½Ñ?Ð¼ Ð¾Ð±Ñ?Ð°Ð·Ð¾Ð¼?
-torbutton.popup.captcha.title = Ð?Ð·Ð±ÐµÐ³Ð°Ñ?Ñ? Google Captcha?
-torbutton.popup.captcha.ask = Torbutton Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶Ð¸Ð» Google Captcha. Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð½Ð° Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ??
-torbutton.popup.captcha.always = Ð? Ð±Ñ?Ð´Ñ?Ñ?ÐµÐ¼ Ð²Ñ?ÐµÐ³Ð´Ð° Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?
-torbutton.popup.redirect = Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ?
-torbutton.popup.no_redirect = Ð?Ðµ Ð¿ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ?
 torbutton.popup.prompted_language = Ð?Ð»Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ñ? Ð±Ð¾Ð»Ñ?Ñ?ÐµÐ¹ Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸, Torbutton Ð¼Ð¾Ð¶ÐµÑ? Ð·Ð°Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ð¸ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÐ¾Ð¼ Ñ?Ð·Ñ?ÐºÐµ. ÐÑ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð²Ð»ÐµÑ?Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÐ¾Ð¼ Ñ?Ð·Ñ?ÐºÐµ, Ð²Ð¼ÐµÑ?Ñ?Ð¾ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¸Ñ? Ð½Ð° Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¾Ð´Ð½Ð¾Ð¼ Ñ?Ð·Ñ?ÐºÐµ.\n\nÐ¥Ð¾Ñ?Ð¸Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÐ¾Ð¼ Ñ?Ð·Ñ?ÐºÐµ Ð´Ð»Ñ? Ð±Ð¾Ð»Ñ?Ñ?ÐµÐ¹ Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸?
 torbutton.popup.no_newnym = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾ Ð´Ð°Ñ?Ñ? Ð²Ð°Ð¼ Ð½Ð¾Ð²Ñ?Ñ? Ð»Ð¸Ñ?Ð½Ð¾Ñ?Ñ?Ñ?. Ð?Ð½ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Tor Control Port.\n\nÐ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Tor Browser Bundle?
-torbutton.popup.use_tbb = Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ñ?Ñ?Ð¾ Ð²Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Torbutton Ð¸ Firefox, Ñ?Ñ?Ð¾ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÐ¼Ð¾Ð¹ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ð¹ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸ÐµÐ¹.\n\nÐ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ñ?Ð¾Ð³Ð¾, Ð¼Ñ? Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÐ¼ Ð²Ð°Ð¼ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½Ð¸Ð¹ Tor Browser Bundle Ð¾Ñ?Ð¾Ñ?Ð»Ð°Ð² email Ð½Ð° gettor@xxxxxxxxxxxxxx Ð¸Ð»Ð¸ Ñ?ÐºÐ°Ñ?Ð°Ð² ÐµÐ³Ð¾ Ð¿Ð¾ Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?ÐµÐ¹ Ñ?Ñ?Ñ?Ð»ÐºÐµ:
 torbutton.popup.pref_error = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð² Ð¿Ð°Ð¿ÐºÐµ Ð¿Ñ?Ð¾Ñ?Ð¸Ð»Ñ? Tor Browser.
 torbutton.popup.permission_denied = Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð»Ð¸Ð±Ð¾ Ñ?Ð±Ñ?Ð¾Ñ?Ñ?Ñ?Ðµ Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð¸Ñ? Ð´Ð»Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Tor Browser Ð¸Ð»Ð¸ Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐµÑ? Ð² Ð´Ñ?Ñ?Ð³Ð¾Ðµ Ð¼ÐµÑ?Ñ?Ð¾.
 torbutton.popup.device_full = Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ñ?Ñ?Ð¾ Ð´Ð¸Ñ?Ðº Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ñ?Ð¾ Ð¸Ð»Ð¸ Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Tor Browser Ð½Ð° Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ð´Ð¸Ñ?Ðº.
diff --git a/src/chrome/locale/sco/torbutton.properties b/src/chrome/locale/sco/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/sco/torbutton.properties
+++ b/src/chrome/locale/sco/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/sk/torbutton.properties b/src/chrome/locale/sk/torbutton.properties
index a9a7289..dc5055e 100644
--- a/src/chrome/locale/sk/torbutton.properties
+++ b/src/chrome/locale/sk/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = PovoliÅ¥ Tor
-torbutton.button.tooltip.enabled = ZakÃ¡zaÅ¥ Tor
 torbutton.panel.tooltip.disabled = Kliknite pre zapnutie Tor
 torbutton.panel.tooltip.enabled = Kliknite pre vypnutie Tor
-torbutton.panel.plugins.disabled = Kliknite pre zapnutie rozÅ¡ÃrenÃ
-torbutton.panel.plugins.enabled = Kliknite pre vypnutie rozÅ¡ÃrenÃ
 torbutton.panel.label.disabled = Tor vypnutÃ½
 torbutton.panel.label.enabled = Tor zapnutÃ½
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test bol ÃºspeÅ¡nÃ½!
 torbutton.popup.test.failure = Tor proxy test bol NEÃ?SPEÅ NÃ?! Skontrolujte VaÅ¡e proxy a Polipo nastavenia.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (odporÃºÄ?anÃ©)
-torbutton.prefs.optional = (voliteÄ¾nÃ©)
-torbutton.prefs.crucial = (kritickÃ©)
 torbutton.popup.external.title = NaÄ?ÃtaÅ¥ externÃ½ obsah?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = SpustiÅ¥ aplikÃ¡ciu
 torbutton.popup.cancel = ZruÅ¡iÅ¥
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = PresmerovaÅ¥
-torbutton.popup.no_redirect = NepresmerovaÅ¥
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index d01474a..4648fec 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = VkljuÄ?i anonimizacijo
-torbutton.button.tooltip.enabled = IzkljuÄ?i anonimizacijo
 torbutton.panel.tooltip.disabled = Klikni za vklop anonimizacije
 torbutton.panel.tooltip.enabled = Klikni za izklop anonimizacije
-torbutton.panel.plugins.disabled = Klikni da omogoÄ?iÅ¡ dodatke
-torbutton.panel.plugins.enabled = Klikni da onemogoÄ?iÅ¡ dodatke
 torbutton.panel.label.disabled = Anonimizacija izkljuÄ?ena
 torbutton.panel.label.enabled = Anonimizacija vkljuÄ?ena
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton obvestilo: Zdi se da nimate prirejenih dovoljenj za certifikate. pregledovanje dovoljenj za certifikate je poÄ?asno in upoÄ?asni preklop Tor-a. bi radi onemogoÄ?ili izloÄ?evanje certifikata za dovoljenje certifikatov? (Ä?e tega ne razumete, je varno da pritisnete OK)
-torbutton.popup.ff3.warning = Opozorilo!\nTorbutton s Firefoxom verzijo 3 lahko v omreÅ¾je Tor izdaja vaÅ¡e podatke o Ä?asovnem pasu.\nÅ½elite vseeno nadaljevati?
-torbutton.popup.toggle.warning = Potrebno je preklopiti Tor oziroma ponovno zagnati da bodo nove nastavitve sprejete.
 torbutton.popup.test.success = Tor proxy test je uspeÅ¡en!
 torbutton.popup.test.failure = Tor proxy test NI USPEÅ EN! preveri svoje poroxy in Polipo nastavitve.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = pritisni OK da preverite Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpeÅ¾ljivi
-torbutton.panel.label.verified = Tor preverjen
-torbutton.popup.test.auto_failed = Samodejni test Tor proxy nastavitve ni uspel.\nJo Å¾elite vseeno uporabiti?
-torbutton.prefs.recommended = (priporoÄ?eno)
-torbutton.prefs.optional = (neobvezno)
-torbutton.prefs.crucial = (obvezno)
 torbutton.popup.external.title = NaloÅ¾i zunanje vsebine?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = ZaÅ¾eni program
 torbutton.popup.cancel = PrekliÄ?i
 torbutton.popup.dontask = Vedno zaÅ¾eni program.
 torbutton.popup.test.no_http_proxy = Tor proxy test: Lokalni HTTP proxy je nedosegljiv. Ali Polipo deluje pravilno?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Zapomni si mojo odloÄ?itev
-torbutton.popup.redirect = Preusmeri
-torbutton.popup.no_redirect = Ne preusmeri
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = Na disku ni veÄ? prostora. Naredite prostor ali premaknite Tor brskalnik na drugo napravo.
diff --git a/src/chrome/locale/so/torbutton.properties b/src/chrome/locale/so/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/so/torbutton.properties
+++ b/src/chrome/locale/so/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/son/torbutton.properties b/src/chrome/locale/son/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/son/torbutton.properties
+++ b/src/chrome/locale/son/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index 21292d5..268554b 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Anullo
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/sr/torbutton.properties b/src/chrome/locale/sr/torbutton.properties
index 763d61d..eb50993 100644
--- a/src/chrome/locale/sr/torbutton.properties
+++ b/src/chrome/locale/sr/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð¸ Ð¢Ð¾Ñ?
-torbutton.button.tooltip.enabled = Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸ Ð¢Ð¾Ñ?
 torbutton.panel.tooltip.disabled = Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ð»Ð¸ Ð¢Ð¾Ñ?
 torbutton.panel.tooltip.enabled = Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸Ð»Ð¸ Ð¢Ð¾Ñ?
-torbutton.panel.plugins.disabled = Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ð»Ð¸ Ð´Ð¾Ð´Ð°Ñ?ÐºÐµ
-torbutton.panel.plugins.enabled = Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸Ð»Ð¸ Ð´Ð¾Ð´Ð°Ñ?ÐºÐµ
 torbutton.panel.label.disabled = Ð¢Ð¾Ñ? Ñ?Ðµ Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?ÐµÐ½
 torbutton.panel.label.enabled = Ð¢Ð¾Ñ? Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton nudi dugme za konfiguraciju Tor postavki i lako i brzo ciscenje pretrazivackih informacija.
-torbutton.popup.history.warning = Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ñ?Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð¾ Ð°ÐºÑ?Ð¸Ð²Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸Ð· Ñ?ÐµÐ·Ð¸Ñ?ÐºÐ° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ñ? Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð¸Ñ?ÐµÐ¼ Ð¢Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ñ?.\n\nÐ?Ð²Ð¾ Ñ?Ðµ Ð´ÐµÑ?Ð°Ð²Ð° Ñ? Ñ?Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¤Ð°Ñ?ÐµÑ?Ñ?Ð¾ÐºÑ?Ð¾Ð²Ð¸Ñ? Ð³Ñ?ÐµÑ?Ð°ÐºÐ° 409737 Ð¸ 417869.\n\nÐ£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð¸Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¾Ð³ Ñ?Ð°Ð·Ð»Ð¾Ð³Ð°, Ñ?Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?ÐµÐ´Ð°Ð½ Ð¾Ð´ Ð²Ð°Ñ?Ð¸Ñ? Ñ?ÐµÐ·Ð¸Ñ?Ð°ÐºÐ° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð²Ð° Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ð¼ Ð¾Ð´ Ñ?ÐµÐ±Ðµ, Ð° Ñ?Ð¾ Ñ?Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¾.\n\nÐ?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ñ? Ð¾Ð²Ð¾Ð¼ Ð¢Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ñ?, Ð¿Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Enter Ñ? Ð¿Ð¾Ñ?Ñ? Ð·Ð° Ñ?Ð½Ð¾Ñ? Ð²ÐµÐ± Ð°Ð´Ñ?ÐµÑ?Ðµ.\n\n
-torbutton.popup.plugin.warning = Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ñ?Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð¾ Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð° Ð´Ð¾Ð´Ð°Ñ?ÐºÐ°.\n\nÐ£Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°, ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ â??Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾â?¦â??.\n\n
-torbutton.popup.confirm_ca_certs = Ð?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ð½Ðµ Ð¿Ð¾Ñ?ÐµÐ´Ñ?Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ. Ð?Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð° Ñ?Ð°Ð´Ñ?Ð° Ð¸ Ñ? Ð¼Ð½Ð¾Ð³Ð¾Ð¼Ðµ Ñ?Ñ?Ð¿Ð¾Ñ?Ð°Ð²Ð° Tor Ð¼Ñ?ÐµÐ¶Ñ?. Ð?Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ? (Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ñ?Ð°Ð·Ñ?Ð¼ÐµÑ?Ðµ Ð¾Ð²Ð¾, Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ Ñ?Ðµ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° â??Ð£ Ñ?ÐµÐ´Ñ?â??.)
-torbutton.popup.ff3.warning = Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ!\n\nÐ?Ð¾Ð·Ð½Ð°Ñ?Ð¾ Ñ?Ðµ Ð´Ð° Torbutton Ð½Ð° Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð¸Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð°Ñ?ÐµÑ?Ñ?Ð¾ÐºÑ?Ð° â??Ð±Ñ?Ñ?Ð°â?? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð¸ Ð´Ð¾Ð²Ð¾Ð´Ðµ Ð¿Ñ?ÐµÐºÐ¾ Tor Ð¼Ñ?ÐµÐ¶Ðµ.\n\nÐ?Ð° Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ?
-torbutton.popup.toggle.warning = Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸Ñ?Ðµ Ð¢Ð¾Ñ? Ð´Ð° Ð±Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ?Ñ?Ñ?Ð¿Ð¸Ð»Ðµ Ð½Ð° Ñ?Ð½Ð°Ð³Ñ?.
 torbutton.popup.test.success = Ð¢ÐµÑ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ¾Ð³ Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾!
 torbutton.popup.test.failure = Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð°Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?. Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð¾Ð»Ð¸Ð¿Ð°.
 torbutton.popup.test.confirm_toggle = Ð?Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¢Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð° Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸ Ñ? Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ð¾Ð¼.\n\nÐ?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð³Ð° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ?\n\nÐ?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ð°ÐºÐ¾ Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð»Ð¸ Ñ?ÐµÑ?ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð´Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½ÐµÑ?Ðµ Ñ?ÐµÑ?Ñ? Ñ? Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½Ð° Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ðµ Ñ?ÐµÑ?Ð¸Ð»Ð¸ Ð¾Ð²Ð¾Ð³ Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°.
 torbutton.popup.test.ff3_notice = Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° â??Ð£ Ñ?ÐµÐ´Ñ?â?? Ð´Ð° Ð¸Ñ?Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°. Ð?Ð²Ð° Ð¿Ñ?Ð¾Ð±Ð° Ñ?Ðµ Ñ?Ðµ Ð¾Ð´Ð¸Ð³Ñ?Ð°Ñ?Ð¸ Ñ? Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð¸. Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸.
-torbutton.panel.label.verified = Ð¢Ð¾Ñ? Ñ?Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½
-torbutton.popup.test.auto_failed = Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?ÐµÑ?Ñ? Ð¢Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ¾ Ð´Ð° Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸ Ñ? Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ð¾Ð¼.\n\nÐ?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð³Ð° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ?
-torbutton.prefs.recommended = (Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?ÐµÐ½Ð¾)
-torbutton.prefs.optional = (Ð½ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾)
-torbutton.prefs.crucial = (Ð¿Ñ?ÐµÑ?Ñ?Ð´Ð½Ð¾)
 torbutton.popup.external.title = Ð£Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ??
 torbutton.popup.external.app = Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ñ?ÐºÐ¾Ð²Ð°Ñ?Ðµ:\n\n
 torbutton.popup.external.note = \n\nÐ?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¸ Ð½Ðµ Ð³Ð°Ñ?Ð°Ð½Ñ?Ñ?Ñ?Ñ? Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¸ Ð¼Ð¾Ð³Ñ? Ð²Ð°Ñ? Ð¾Ñ?ÐºÑ?Ð¸Ñ?Ð¸!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼
 torbutton.popup.cancel = Ð?Ñ?ÐºÐ°Ð¶Ð¸
 torbutton.popup.dontask = Ð?Ð´Ñ?Ð°Ð´ Ñ?Ð²ÐµÐº Ð¿Ð¾ÐºÑ?ÐµÑ?Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ðµ
 torbutton.popup.test.no_http_proxy = Ð?Ñ?Ð¾Ð±Ð° Ð¢Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°: Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸ HTTP Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ñ?Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½. Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð?Ð¾Ð»Ð¸Ð¿Ð¾ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½.
-torbutton.popup.captcha.title = Ð?Ð·Ð±ÐµÐ³Ð°Ð²Ð°Ñ?Ð¸ Ð?Ñ?Ð³Ð»Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ð²Ñ?Ð´Ð½Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ?
-torbutton.popup.captcha.ask = Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð°Ð¾ Ð?Ñ?Ð³Ð»Ð¾Ð² Ð¿Ð¾Ñ?Ð²Ñ?Ð´Ð½Ð¸ ÐºÐ¾Ð´. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð¼ÐµÑ?ÐµÐ½Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? Ð·Ð° Ð¾Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ??
-torbutton.popup.captcha.always = Ð?Ð´Ñ?Ð°Ð´ Ñ?Ð²ÐµÐº Ð¸Ð·Ð²Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ñ?Ð°Ð´Ñ?Ñ?
-torbutton.popup.redirect = Ð?Ñ?ÐµÑ?Ñ?Ð¼ÐµÑ?Ð¸
-torbutton.popup.no_redirect = Ð?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð¼ÐµÑ?Ð°Ð²Ð°Ñ?
 torbutton.popup.prompted_language = Ð?Ð° Ð±Ð¸ Ð²Ð°Ð¼ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ð¾ Ð±Ð¾Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?, Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° ÐµÐ½Ð³Ð»ÐµÑ?ÐºÑ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°. Ð?Ð±Ð¾Ð³ Ñ?Ð¾Ð³Ð°, Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ðµ Ð±Ð¸Ñ?Ñ?Ðµ Ð¸Ð½Ð°Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ð½Ð° Ð¼Ð°Ñ?ÐµÑ?Ñ?ÐµÐ¼ Ñ?ÐµÐ·Ð¸ÐºÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð¸ Ð½Ð° ÐµÐ½Ð³Ð»ÐµÑ?ÐºÐ¾Ð¼ Ñ?ÐµÐ·Ð¸ÐºÑ?.\n\nÐ?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð½Ð° ÐµÐ½Ð³Ð»ÐµÑ?ÐºÐ¾Ð¼ Ñ?ÐµÐ·Ð¸ÐºÑ? Ñ? Ñ?Ð¸Ñ?Ñ? Ð±Ð¾Ñ?Ðµ Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸?
 torbutton.popup.no_newnym = Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ Ð´Ð° Ð²Ð°Ð¼ Ð´Ð¾Ð´ÐµÐ»Ð¸ Ð½Ð¾Ð²Ð¸ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?ÐµÑ? Ñ?ÐµÑ? Ð½ÐµÐ¼Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð¢Ð¾Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ð½Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?.\n\nÐ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð»Ð¸ Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ??
-torbutton.popup.use_tbb = Ð?Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ð¸ Ð¤Ð°Ñ?ÐµÑ?Ñ?Ð¾ÐºÑ?, Ð° Ñ?Ð¾ Ð²Ð¸Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ñ?Ð¸Ð²Ð¾ ÐºÐ°Ð¾ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°.\n\nÐ£Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°, Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð½Ð°Ð±Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ð¸ Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð»Ð°Ñ?ÐµÐ¼ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð° gettor@xxxxxxxxxxxxxx Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?ÐµÐ¼ Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ: 
 torbutton.popup.pref_error = Ð¢Ð¾Ñ?Ð±Ð°Ñ?Ð¾Ð½ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð·Ð° Ð¿Ñ?Ð¾Ñ?Ð¸Ð»Ðµ Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð°.
 torbutton.popup.permission_denied = Ð?Ð¾Ð½Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ? ÐºÐ¾Ñ?Ð¾Ñ? Ñ?Ðµ Ð½Ð°Ð»Ð°Ð·Ð¸ Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¸Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð½Ð¾Ð²Ñ? Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ñ?.
 torbutton.popup.device_full = Ð?Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ?Ðµ Ð´Ð¸Ñ?Ðº Ð¿Ñ?Ð½. Ð?Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð¸Ñ?Ðµ Ð½ÐµÑ?Ñ?Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð° Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð½Ð° Ð½Ð¾Ð²Ð¸ Ñ?Ñ?ÐµÑ?Ð°Ñ?.
diff --git a/src/chrome/locale/st/torbutton.properties b/src/chrome/locale/st/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/st/torbutton.properties
+++ b/src/chrome/locale/st/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/su/torbutton.properties b/src/chrome/locale/su/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/su/torbutton.properties
+++ b/src/chrome/locale/su/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index a7188c9..217c2c8 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Aktivera Tor
-torbutton.button.tooltip.enabled = Inaktivera Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = OkÃ¤nd IP-adress.
 torbutton.circuit_display.onion_site = Onion webbplats
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = OkÃ¤nt land
 torbutton.content_sizer.margin_tooltip = Tor Browser lÃ¤gger till denna marginal fÃ¶r att gÃ¶ra bredden och hÃ¶jden pÃ¥ ditt fÃ¶nster mindre tydlig. DÃ¤rmed minskas mÃ¶jligheten att spÃ¥ra dig.
 torbutton.panel.tooltip.disabled = Klicka fÃ¶r att aktivera Tor
 torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor
-torbutton.panel.plugins.disabled = Klicka fÃ¶r att aktivera plugins
-torbutton.panel.plugins.enabled = Klicka fÃ¶r att inaktivera plugins
 torbutton.panel.label.disabled = Tor inaktiv
 torbutton.panel.label.enabled = Tor aktiv
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton ger en knapp fÃ¶r att konfigurera Tor instÃ¤llningar och snabbt och enkelt rensa privat surfdata.
-torbutton.popup.history.warning = Torbutton blockerade aktivitet frÃ¥n en flik laddad i ett annat Tor stadium.\n\nDetta Ã¤r fÃ¶r att komma runt Firefox buggar 409737 och 417869.\n\nOm denna popup verkar hÃ¤nda av ingen anledning, sÃ¥ Ã¤r det fÃ¶r att en av dina flikar fÃ¶rsÃ¶kte ladda om sig i bakgrunden, och detta blev blockerat.\n\nFÃ¶r att ladda om fliken i detta Tor stadium klicka 'enter' i URL address fÃ¤ltet.\n\n
-torbutton.popup.plugin.warning = Torbutton blockerade direkt Tor belastning insticksprogram.\n\nAnvÃ¤nd spara som i stÃ¤llet.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Notering: Det verkar som om du inte har nÃ¥gon anpassad Certifikat Instans. Att undersÃ¶ka Certifikat Instans listan Ã¤r lÃ¥ngsamt och saktar ner Tor. Skulle du vilja avaktivera isolationen av Certifikat Instans certifikat? (om du inte fÃ¶rstÃ¥r detta Ã¤r det sÃ¤kert att klicka OK)
-torbutton.popup.ff3.warning = Varning!\n\nTorbutton pÃ¥ Firefox 3 Ã¤r kÃ¤nt fÃ¶r att lÃ¤cka din tidszon och livemarks via Tor. \n\nVill du fortsÃ¤tta Ã¤ndÃ¥?
-torbutton.popup.toggle.warning = Du mÃ¥ste vÃ¤xla Tor eller starta fÃ¶r instÃ¤llningarna ska bÃ¶rja gÃ¤lla.
 torbutton.popup.test.success = Tor-proxy testet lyckades!
 torbutton.popup.test.failure = Tor proxy MISSLYCKADES! Kontrollera din proxy och instÃ¤llningar polipo.
 torbutton.popup.test.confirm_toggle = Det senaste Tor proxy testet misslyckades att anvÃ¤nda Tor.\n\nÃ?r du sÃ¤ker att du vill aktivera Ã¤ndÃ¥?\n\nNotera: Om du fixat problemet kan du kÃ¶ra om testet i Torbuttons Proxy Preferenser fÃ¶r att eliminera denna varning.
 torbutton.popup.test.ff3_notice = Klicka pÃ¥ OK fÃ¶r att testa Tors proxyinstÃ¤llningar. Detta test kommer att ske i bakgrunden. Ha tÃ¥lamod.
-torbutton.panel.label.verified = Tor verifierad
-torbutton.popup.test.auto_failed = Den automatiska Tor-proxyn misslyckades att anvÃ¤nda Tor.\n\nÃ?r du sÃ¤ker pÃ¥ att du vill aktivera Ã¤ndÃ¥?
-torbutton.prefs.recommended = (rekommenderat)
-torbutton.prefs.optional = (valfritt)
-torbutton.prefs.crucial = (kritiskt)
 torbutton.popup.external.title = HÃ¤mta hem en extern filtyp?
 torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behÃ¶ver Ã¶ppna den i ett annat program.\n\n
 torbutton.popup.external.note = Vissa typer av filer kan fÃ¥ program att ansluta till internet utan att anvÃ¤nda Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = HÃ¤mta hem filen
 torbutton.popup.cancel = Avbryt
 torbutton.popup.dontask = HÃ¤mta hem filer automatiskt i fortsÃ¤ttningen
 torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy Ã¤r onÃ¥bar. Ã?r Polipo igÃ¥ng ordentligt?
-torbutton.popup.captcha.title = Undvik Google Captchas?
-torbutton.popup.captcha.ask = Torbutton upptÃ¤ckte en Google Captcha. Vill du omdirigeras till en annan sÃ¶kmotor fÃ¶r den hÃ¤r frÃ¥gan?
-torbutton.popup.captcha.always = UtfÃ¶r alltid denna Ã¥tgÃ¤rd frÃ¥n och med nu
-torbutton.popup.redirect = Omdirigera
-torbutton.popup.no_redirect = Omdirigera inte
 torbutton.popup.prompted_language = FÃ¶r ett bÃ¤ttre integritetsskydd kan Torbutton begÃ¤ra den engelska versionen av webbsidor. Detta kan gÃ¶ra att webbsidor som du fÃ¶redrar att lÃ¤sa pÃ¥ ditt modersmÃ¥l visas pÃ¥ engelska istÃ¤llet.\\\n\\\n Vill du visa sidor pÃ¥ engelska fÃ¶r att fÃ¥ ett bÃ¤ttre integritetsskydd?
 torbutton.popup.no_newnym = Torbutton kan inte sÃ¤kert ge dig en ny identitet. Det har inte tillgÃ¥ng till Tor Control Port.\n\nKÃ¶r du Tor Browser Bundle?
-torbutton.popup.use_tbb = Det verkar som om du anvÃ¤nder Torbutton med Firefox, vilket inte lÃ¤ngre Ã¤r en rekommenderad sÃ¤ker konfiguration.\n\nIstÃ¤llet rekommenderar vi dig att ladda ner den senaste Tor Browser Bundle genom att skicka ett mail till gettor@xxxxxxxxxxxxxx eller ladda ner den pÃ¥ fÃ¶ljande URL:
 torbutton.popup.pref_error = Torbutton kan inte uppdatera instÃ¤llningar i Tor Browser profilen katalog.
 torbutton.popup.permission_denied = Du antingen Ã¥terstÃ¤lla behÃ¶righeterna Tor Browser katalogen eller kopiera den till en ny plats.
 torbutton.popup.device_full = Skivan verkar vara full. VÃ¤nligen frigÃ¶ra utrymme eller flytta Tor webblÃ¤sare till en ny enhet.
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ta/torbutton.properties b/src/chrome/locale/ta/torbutton.properties
index f697460..2f6b0db 100644
--- a/src/chrome/locale/ta/torbutton.properties
+++ b/src/chrome/locale/ta/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/te/torbutton.properties b/src/chrome/locale/te/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/te/torbutton.properties
+++ b/src/chrome/locale/te/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/tg/torbutton.properties b/src/chrome/locale/tg/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/tg/torbutton.properties
+++ b/src/chrome/locale/tg/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index dcc083b..150fe6c 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = à¸¢à¸?à¹?à¸¥à¸´à¸?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ti/torbutton.properties b/src/chrome/locale/ti/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ti/torbutton.properties
+++ b/src/chrome/locale/ti/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/tk/torbutton.properties b/src/chrome/locale/tk/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/tk/torbutton.properties
+++ b/src/chrome/locale/tk/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 2e2cdff..309096c 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Tor KullanÄ±lsÄ±n
-torbutton.button.tooltip.enabled = Tor KullanÄ±lmasÄ±n
 torbutton.circuit_display.internet = Ä°nternet
 torbutton.circuit_display.ip_unknown = Bilinmeyen IP
 torbutton.circuit_display.onion_site = SoÄ?an sitesi
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Bilinmeyen Ã?lke
 torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin geniÅ?lik ve yÃ¼ksekliÄ?ini daha az ayÄ±rt edilebilir duruma getirmek iÃ§in kenar boÅ?luklarÄ± ekleyerek kiÅ?ilerin sizi Ã§evrim iÃ§i olarak izleme yeteneÄ?ini azaltÄ±r.
 torbutton.panel.tooltip.disabled = Tor yazÄ±lÄ±mÄ±nÄ± etkinleÅ?tirmek iÃ§in tÄ±klayÄ±n
 torbutton.panel.tooltip.enabled = Tor yazÄ±lÄ±mÄ±nÄ± devre dÄ±Å?Ä± bÄ±rakmak iÃ§in tÄ±klayÄ±n
-torbutton.panel.plugins.disabled = Uygulama eklerini etkinleÅ?tirmek iÃ§in tÄ±klayÄ±n
-torbutton.panel.plugins.enabled = Uygulama eklerini devre dÄ±Å?Ä± bÄ±rakmak iÃ§in tÄ±klayÄ±n
 torbutton.panel.label.disabled = Tor Devre DÄ±Å?Ä±
 torbutton.panel.label.enabled = Tor Etkin
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton, Tor ayarlarÄ±nÄ± yapabileceÄ?iniz ve kiÅ?isel tarama verilerini hÄ±zlÄ± ve kolayca silebileceÄ?iniz bir dÃ¼Ä?me sunar.
-torbutton.popup.history.warning = Torbutton, farklÄ± bir Tor durumunda yÃ¼klenmiÅ? bir sekmeden gelen etkinliÄ?i engelledi.\n\nBu durum Firefox 409737 ve 417869 numaralÄ± hata raporlarÄ±nÄ± iÃ§in bir Ã§Ã¶zÃ¼mdÃ¼r.\n\nHiÃ§bir neden olmadan bu uyarÄ±yÄ± aldÄ±ysanÄ±z, sekme kendini yenilemeye Ã§alÄ±Å?tÄ±Ä?Ä± iÃ§in engellenmiÅ? olabilir.\n\nSekmeyi bu Tor durumunda yenilemek iÃ§in adres Ã§ubuÄ?una tÄ±klayÄ±p 'enter' tuÅ?una basÄ±n.\n\n
-torbutton.popup.plugin.warning = Torbutton, uygulama eki iÃ§eriÄ?inin doÄ?rudan Tor tarafÄ±ndan yÃ¼klemesini engelledi.\n\nBunun yerine FarklÄ± Kaydet kullanmayÄ± deneyin.\n
-torbutton.popup.confirm_ca_certs = Torbutton Notu: Ã?zel bir Sertifika Otoriteniz yok gibi gÃ¶rÃ¼nÃ¼yor. Sertifika Otoriteleri listesini sÄ±namak uzun sÃ¼ren ve Tor durum deÄ?iÅ?ikliÄ?ini yavaÅ?latan bir iÅ?lemdir. Sertifika Otoritesi sertifikalarÄ±nÄ±n yalÄ±tÄ±lmasÄ±nÄ± devre dÄ±Å?Ä± bÄ±rakmak ister misiniz? (bunun ne olduÄ?unu anlamadÄ±ysanÄ±z  Tamam' Ã¼zerine tÄ±klamak gÃ¼venlidir)
-torbutton.popup.ff3.warning = UyarÄ±!\n\nFirefox 3 Ã¼zerinde Torbutton, yerel saat ve bazÄ± yerel bilgilerinizi (livemark) sÄ±zdÄ±rabilir\n\nDevam etmek istiyor musunuz?
-torbutton.popup.toggle.warning = Ayar deÄ?iÅ?ikliklerinin geÃ§erli olmasÄ± iÃ§in Tor durumunu deÄ?iÅ?tirmeli ya da yeniden baÅ?latmalÄ±sÄ±nÄ±z.
 torbutton.popup.test.success = Tor vekil sunucu sÄ±namasÄ± baÅ?arÄ±lÄ±!
 torbutton.popup.test.failure = Tor vekil sunucu sÄ±namasÄ± baÅ?arÄ±sÄ±z oldu! LÃ¼tfen vekil sunucunuzu ve Polipo ayarlarÄ±nÄ± denetleyin.
 torbutton.popup.test.confirm_toggle = Son Tor vekil sunucu sÄ±namasÄ±nda Tor kullanÄ±lamadÄ±.\n\nYine de etkinleÅ?tirmek ister misiniz?\n\nNot: Sorunu Ã§Ã¶zdÃ¼yseniz bu uyarÄ±yÄ± kaldÄ±rmak iÃ§in Torbutton Vekil Sunucu AyarlarÄ± bÃ¶lÃ¼mÃ¼nden sÄ±namayÄ± yeniden yapabilirsiniz.
 torbutton.popup.test.ff3_notice = Tor vekil sunucu ayarlarÄ±nÄ± sÄ±namak iÃ§in Tamam Ã¼zerine tÄ±klayÄ±n. Bu sÄ±nama artalanda yapÄ±lacak. LÃ¼tfen sabÄ±rlÄ± olun.
-torbutton.panel.label.verified = Tor DoÄ?rulandÄ±
-torbutton.popup.test.auto_failed = Otomatik Tor vekil sunucu sÄ±namasÄ±nda Tor kullanÄ±lamadÄ±.\n\nYine de etkinleÅ?tirmek ister misiniz?
-torbutton.prefs.recommended = (Ã¶nerilir)
-torbutton.prefs.optional = (isteÄ?e baÄ?lÄ±)
-torbutton.prefs.crucial = (Ã¶nemli)
 torbutton.popup.external.title = DÄ±Å? bir dosya tÃ¼rÃ¼ indirilsin mi?
 torbutton.popup.external.app = Tor Browser bu dosyayÄ± gÃ¶rÃ¼ntÃ¼leyemiyor. BaÅ?ka bir uygulamayla aÃ§manÄ±z gerekecek.\n
 torbutton.popup.external.note = BazÄ± dosya tÃ¼rleri uygulamalarÄ±n Tor kullanmadan Ä°nternet baÄ?lantÄ±sÄ± kurmasÄ±na neden olabilir.\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = DosyayÄ± indir
 torbutton.popup.cancel = Ä°ptal\n
 torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
 torbutton.popup.test.no_http_proxy = Tor vekil sunucu sÄ±namasÄ±:  Yerel HTTP vekil sunucusuna ulaÅ?Ä±lamÄ±yor. Polipo dÃ¼zgÃ¼n Ã§alÄ±Å?Ä±yor mu?
-torbutton.popup.captcha.title = Google Captcha KaÃ§Ä±nmasÄ±
-torbutton.popup.captcha.ask = Torbutton Google Captcha uygulamasÄ±nÄ± algÄ±ladÄ±. Bu aramanÄ±n baÅ?ka bir arama motoruna yÃ¶nlendirilmesini ister misiniz?
-torbutton.popup.captcha.always = Bundan sonra hep Å?u iÅ?lem yapÄ±lsÄ±n
-torbutton.popup.redirect = YÃ¶nlendirilsin
-torbutton.popup.no_redirect = YÃ¶nlendirilmesin
 torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfalarÄ±n Ä°ngilizce sÃ¼rÃ¼mlerini gÃ¶stermeyi isteyebilir. Bu Ã¶zellik, web sayfalarÄ±nÄ±n ana diliniz yerine Ä°ngilizce gÃ¶rÃ¼ntÃ¼lenmesine neden olabilir.\n\nDaha iyi gizlilik iÃ§in web sayfalarÄ±nÄ±n Ä°ngilizce sÃ¼rÃ¼mlerinin gÃ¶rÃ¼ntÃ¼lenmesini ister misiniz?
 torbutton.popup.no_newnym = Torbutton size yeni bir gÃ¼venli kimlik saÄ?layamadÄ±. Tor Denetim KapÄ±sÄ±na giriÅ? yapÄ±lamÄ±yor.\n\nTor Browser Bundle yazÄ±lÄ±mÄ±nÄ± Ã§alÄ±Å?tÄ±rdÄ±Ä?Ä±nÄ±za emin olun.
-torbutton.popup.use_tbb = Firefox Ã¼zerinde Torbutton kullanÄ±yorsunuz gibi gÃ¶rÃ¼nÃ¼yor. Bu ikili artÄ±k Ã¶nerilen bir gÃ¼venli kullanÄ±m saÄ?lamÄ±yor.\n\nBunun yerine, gettor@xxxxxxxxxxxxxx adresine e-posta gÃ¶ndererek ya da Å?u adresten indirerek son Tor Browser Bundle yazÄ±lÄ±mÄ±nÄ± edinmeniz Ã¶nerilir.
 torbutton.popup.pref_error = Torbutton, Tor Browser profil klasÃ¶rÃ¼nÃ¼n iÃ§indeki ayarlarÄ± gÃ¼ncelleyemedi.
 torbutton.popup.permission_denied = LÃ¼tfen Tor Browser klasÃ¶rÃ¼nÃ¼n izinlerini sÄ±fÄ±rlayÄ±n ya da baÅ?ka bir konuma taÅ?Ä±yÄ±n.
 torbutton.popup.device_full = Disk dolmuÅ? gÃ¶rÃ¼nÃ¼yor. LÃ¼tfen diskte yer aÃ§Ä±n ya da Tor Browser yazÄ±lÄ±mÄ±nÄ± baÅ?ka bir aygÄ±t Ã¼zerine taÅ?Ä±yÄ±n.
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index 91c9fd5..e4dbb08 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Ð£Ð²Ñ?Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Tor
-torbutton.button.tooltip.enabled = Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Tor
 torbutton.panel.tooltip.disabled = Ð?Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? Ð°Ð±Ð¸ Ñ?Ð²Ñ?Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Tor
 torbutton.panel.tooltip.enabled = Ð?Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? Ð°Ð±Ð¸ Ð²Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Tor
-torbutton.panel.plugins.disabled = Ð?Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? Ð°Ð±Ð¸ Ñ?Ð²Ñ?Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ñ?Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð½Ñ?
-torbutton.panel.plugins.enabled = Ð?Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? Ð°Ð±Ð¸ 
 torbutton.panel.label.disabled = Tor Ð?Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾
 torbutton.panel.label.enabled = Tor Ð£Ð²Ñ?Ð¼ÐºÐ½ÐµÐ½Ð¾
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton Ð¿ÐµÑ?ÐµÐ´Ð±Ð°Ñ?Ð°Ñ? ÐºÐ½Ð¾Ð¿ÐºÑ?, Ñ?Ð¾Ð± Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Tor Ñ? Ñ?Ð²Ð¸Ð´ÐºÐ¾ Ñ?Ð° Ð»ÐµÐ³ÐºÐ¾ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¾Ñ?Ð¾Ð±Ð¸Ñ?Ñ?Ñ? Ð´Ð°Ð½Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ?.
-torbutton.popup.history.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÑ?Ð²Ð°Ð² Ð°ÐºÑ?Ð¸Ð²Ð½Ñ?Ñ?Ñ?Ñ? Ñ?Ð· Ð²ÐºÐ»Ð°Ð´ÐºÐ¸, Ñ?Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð° Ð· Ñ?Ð½Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ð°Ð½Ñ? Tor.\\n\n\\n\nÐ¦Ðµ Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð´Ð½Ð¾ Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð¾Ð´Ñ? Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº 409737 Ñ? 417869 Ð² Firefox.\\n\n\\n\nÐ¯ÐºÑ?Ð¾ Ñ?Ðµ Ñ?Ð¿Ð»Ð¸Ð²Ð°Ñ?Ñ?Ðµ Ð²Ñ?ÐºÐ½Ð¾ Ð·'Ñ?Ð²Ð¸Ð»Ð¾Ñ?Ñ? Ð±ÐµÐ· Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð¸, Ð¾Ð´Ð½Ð° Ð· Ð²Ð°Ñ?Ð¸Ñ? Ð²ÐºÐ»Ð°Ð´Ð¾Ðº Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ð»Ð° Ð¿ÐµÑ?ÐµÐ·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸Ñ?Ñ? Ñ? Ñ?Ð¾Ð½Ð¾Ð²Ð¾Ð¼Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ñ? Ñ?Ñ? Ñ?Ð¿Ñ?Ð¾Ð±Ð° Ð±Ñ?Ð»Ð° Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð°.\\n\n\\n\nÐ©Ð¾Ð± Ð¿ÐµÑ?ÐµÐ·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÑ? Ð² Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ñ?Ð°Ð½Ñ? Tor, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð²Ñ?Ñ?Ð´' Ð² Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¼Ñ? Ñ?Ñ?Ð´ÐºÑ? URL.\\n\n\\n
-torbutton.popup.plugin.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÑ?Ð²Ð°Ð² Ð¿Ñ?Ñ?Ð¼Ðµ Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð¿Ð»Ð°Ð³Ñ?Ð½Ñ?Ð² Ñ?ÐµÑ?ÐµÐ· Tor.\\n\n\\n\nÐ?Ð¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð¹Ñ?ÐµÑ?Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ñ? 'Ð?Ð±ÐµÑ?ÐµÐ³Ñ?Ð¸ Ñ?Ðº'.\\n\n\\n
-torbutton.popup.confirm_ca_certs = TorButton Ð?Ñ?Ð¸Ð¼Ñ?Ñ?ÐºÐ°: Ð¡Ñ?Ð¾Ð¶Ðµ, Ñ? Ð²Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?ÐºÐ¾Ð³Ð¾ Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ñ?Ñ?. Ð?ÐµÑ?ÐµÐ²Ñ?Ñ?ÐºÐ° Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ñ?ÐºÐ°Ñ?Ñ?Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ñ?Ñ? Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ñ?Ñ? Ñ? Ñ?Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ? Tor. Ð¥Ð¾Ñ?Ñ?Ð»Ð¸ Ð± Ð²Ð¸ Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð·Ð¾Ð»Ñ?Ñ?Ñ?Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ñ?ÐºÐ°Ñ?Ñ?Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ñ?Ñ?? (Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð½Ðµ Ñ?Ð¾Ð·Ñ?Ð¼Ñ?Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾ Ñ?Ð¾ Ð¼Ð¾Ð²Ð°, Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ OK)
-torbutton.popup.ff3.warning = Ð£Ð²Ð°Ð³Ð°!\n\nTorbutton Ð½Ð° Firefox 3 Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ð¹ Ñ?Ð¸Ð¼, Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð²Ð¸Ð´Ð°Ñ?Ð¸ Ð²Ð°Ñ? Ñ?Ð°Ñ?Ð¾Ð²Ð¸Ð¹ Ð¿Ð¾Ñ?Ñ? Ñ?Ð° Ð¶Ð¸Ð²Ñ? Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ñ?ÐµÑ?ÐµÐ· Tor.\n\nÐ§Ð¸ Ð±Ð°Ð¶Ð°Ñ?Ñ?Ðµ Ð²Ð¸ Ð¿Ñ?Ð¾Ð´Ð¾Ð²Ð¶Ñ?Ð²Ð°Ñ?Ð¸ Ñ? Ð±Ñ?Ð´Ñ? Ñ?ÐºÐ¾Ð¼Ñ? Ñ?Ð°Ð·Ñ??
-torbutton.popup.toggle.warning = Ð?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð¿ÐµÑ?ÐµÐ¼Ð¸ÐºÐ½Ñ?Ñ?Ð¸ Ð°Ð±Ð¾ Ð¿ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Tor Ð°Ð±Ð¸ Ð°ÐºÑ?Ð¸Ð²Ñ?Ð²Ð°Ñ?Ð¸ Ð½Ð¾Ð²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸. 
 torbutton.popup.test.success = Ð¢ÐµÑ?Ñ? Ð¿Ñ?Ð¾ÐµÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Tor Ð¿Ñ?Ð¾Ð¹Ñ?Ð¾Ð² Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ð¾!
 torbutton.popup.test.failure = Ð¢ÐµÑ?Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð?Ð? Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?! Ð?ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ñ?Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð° Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Polipo.
 torbutton.popup.test.confirm_toggle = Ð¡Ð°Ð¼Ð¸Ð¹ Ð¾Ñ?Ñ?Ð°Ð½Ð½Ñ?Ð¹ Tor Ð¿Ñ?Ð¾ÐºÑ?Ñ? Ñ?ÐµÑ?Ñ? Ð½Ðµ Ð² Ð·Ð¼Ð¾Ð·Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ Tor.\\n\n\\n\nÐ?Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ?, Ñ?Ð¾ Ð²Ð¸ Ñ?Ð¾Ñ?ÐµÑ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÐ¾Ð¼Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÑ??\\n\n\\n\nÐ?Ñ?Ð¸Ð¼Ñ?Ñ?ÐºÐ°: Ð¯ÐºÑ?Ð¾ Ð²Ð¸ Ð²Ð¸Ñ?Ñ?Ñ?Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ?, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ñ? Ñ? Ð²Ñ?ÐºÐ½Ñ? 'Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ? Torbutton', Ñ?Ð¾Ð± Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ð¸ Ñ?Ðµ Ð¿Ð¾Ð¿ÐµÑ?ÐµÐ´Ð¶ÐµÐ½Ð½Ñ?.
 torbutton.popup.test.ff3_notice = Ð?Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? OK, Ñ?Ð¾Ð± Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ð¸Ñ?Ð¸ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Tor Ð¿Ñ?Ð¾ÐºÑ?Ñ?. Ð¦ÐµÐ¹ Ñ?ÐµÑ?Ñ? Ð±Ñ?Ð´Ðµ Ð²Ð¸ÐºÐ¾Ð½Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ñ? Ñ?Ð¾Ð½Ð¾Ð²Ð¾Ð¼Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ?. Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð±Ñ?Ð´Ñ?Ñ?Ðµ Ñ?ÐµÑ?Ð¿Ð»Ñ?Ñ?Ñ?.
-torbutton.panel.label.verified = Tor Ð?ÐµÑ?ÐµÐ²Ñ?Ñ?ÐµÐ½Ð¸Ð¹
-torbutton.popup.test.auto_failed = Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ð¸Ð¹ Tor Ð¿Ñ?Ð¾ÐºÑ?Ñ? Ñ?ÐµÑ?Ñ? Ð½Ðµ Ð² Ð·Ð¼Ð¾Ð·Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ Tor.\\n\n\\n\nÐ?Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ?, Ñ?Ð¾ Ð²Ð¸ Ñ?Ð¾Ñ?ÐµÑ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÐ¾Ð¼Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÑ??
-torbutton.prefs.recommended = (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)
-torbutton.prefs.optional = (Ð½Ðµ Ð¾Ð±Ð¾Ð²â??Ð·ÐºÐ¾Ð²Ð¾)
-torbutton.prefs.crucial = (ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)
 torbutton.popup.external.title = Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ Ð·Ð¾Ð²Ð½Ñ?Ñ?Ð½Ñ?Ð¹ Ð²Ð¼Ñ?Ñ?Ñ??
 torbutton.popup.external.app = Ð?Ð¾Ð²Ð½Ñ?Ñ?Ð½Ñ? Ð¿Ñ?Ð¸ÐºÐ»Ð°Ð´Ð½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð° Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð´Ð½Ð° Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð¾Ð±ÐºÐ¸:\\n\n\\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Ð?Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð¾Ð´Ð°Ñ?Ð¾Ðº
 torbutton.popup.cancel = Ð?Ñ?Ð´Ð¼Ð¾Ð²Ð°
 torbutton.popup.dontask = Ð?Ð°Ð²Ð¶Ð´Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ð¸ Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¸ Ð· Ñ?Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ñ?
 torbutton.popup.test.no_http_proxy = Tor Ð¿Ñ?Ð¾ÐºÑ?Ñ? Ñ?ÐµÑ?Ñ?: Ð?Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¸Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ? HTTP â?? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ð¹. Ð§Ð¸ Ð¿Ñ?Ð°Ñ?Ñ?Ñ? Polipo Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼?
-torbutton.popup.captcha.title = Ð£Ð½Ð¸ÐºÐ°Ñ?Ð¸ ÐºÐ°Ð¿Ñ?Ñ?Ñ? Google?
-torbutton.popup.captcha.ask = Torbutton Ð²Ð¸Ñ?Ð²Ð¸Ð² Google Captcha. Ð§Ð¸ Ñ?Ð¾Ñ?Ñ?Ð»Ð¸ Ð± Ð²Ð¸ Ð¿ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?ÐµÐ¹ Ð·Ð°Ð¿Ð¸Ñ? Ð½Ð° Ñ?Ð½Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ¾Ð²Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ??
-torbutton.popup.captcha.always = Ð?Ð°Ð²Ð¶Ð´Ð¸ Ð²Ð¸ÐºÐ¾Ð½Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ? Ð´Ñ?Ñ? Ð· Ñ?Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ñ?
-torbutton.popup.redirect = Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ð¸
-torbutton.popup.no_redirect = Ð?Ðµ Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ð¸
 torbutton.popup.prompted_language = Ð?Ð»Ñ? Ð½Ð°Ð´Ð°Ð½Ð½Ñ? Ð±Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?, Torbutton Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¿Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð²ÐµÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº Ð°Ð½Ð³Ð»Ñ?Ð¹Ñ?Ñ?ÐºÐ¾Ñ? Ð¼Ð¾Ð²Ð¾Ñ?. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð¸Ñ?Ð¸ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº Ð°Ð½Ð³Ð»Ñ?Ð¹Ñ?Ñ?ÐºÐ¾Ñ? Ð¼Ð¾Ð²Ð¾Ñ?, Ð·Ð°Ð¼Ñ?Ñ?Ñ?Ñ? Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ñ? Ð½Ð° Ð²Ð°Ñ?Ñ?Ð¹ Ñ?Ñ?Ð´Ð½Ñ?Ð¹ Ð¼Ð¾Ð²Ñ?.\\n\n\\n\nÐ§Ð¸ Ð²Ð¸ Ð±Ð°Ð¶Ð°Ñ?Ñ?Ðµ Ð·Ð°Ð¿Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÐ¸ Ð°Ð½Ð³Ð»Ñ?Ð¹Ñ?Ñ?ÐºÐ¾Ñ? Ð¼Ð¾Ð²Ð¾Ñ? Ð´Ð»Ñ? Ð±Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ??
 torbutton.popup.no_newnym = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾ Ð´Ð°Ñ?Ð¸ Ð²Ð°Ð¼ Ð½Ð¾Ð²Ñ? Ð¾Ñ?Ð¾Ð±Ð¸Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?. Ð?Ñ?Ð½ Ð½Ðµ Ð¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ñ? Ð´Ð¾ Tor Control Port.\\n\n\\n\nÐ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Tor Browser Bundle?
-torbutton.popup.use_tbb = Ð¡Ñ?Ð¾Ð¶Ðµ, Ñ?Ð¾ Ð²Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Torbutton Ñ?Ð°Ð·Ð¾Ð¼ Ñ?Ð· Firefox, Ñ?Ð¾ Ð±Ñ?Ð»Ñ?Ñ? Ð½Ðµ Ñ? Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾Ñ? Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ñ?.\\n\n\\n\nÐ?Ð°Ñ?Ð¾Ð¼Ñ?Ñ?Ñ?Ñ?, Ð¼Ð¸ Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?Ñ?Ð¼Ð¾ Ð²Ð°Ð¼ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¾Ñ?Ñ?Ð°Ð½Ð½Ñ?Ð¹ Tor Browser Bundle, Ð²Ñ?Ð´Ñ?Ñ?Ð»Ð°Ð²Ñ?Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð° Ð½Ð° gettor@xxxxxxxxxxxxxx Ð°Ð±Ð¾, Ñ?ÐºÐ°Ñ?Ð°Ð²Ñ?Ð¸ Ð¹Ð¾Ð³Ð¾ Ð·Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ð»Ð°Ð½Ð½Ñ?Ð¼:
 torbutton.popup.pref_error = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¾Ð½Ð¾Ð²Ð¸Ñ?Ð¸ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð² Ð¿Ð°Ð¿Ñ?Ñ? Ð¿Ñ?Ð¾Ñ?Ñ?Ð»Ñ? Ð?ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° Tor.
 torbutton.popup.permission_denied = Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð°Ð±Ð¾ Ñ?ÐºÐ¸Ð½Ñ?Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð´Ð»Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Ð?ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° Tor Ð°Ð±Ð¾ Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?Ñ? Ð² Ñ?Ð½Ñ?Ðµ Ð¼Ñ?Ñ?Ñ?Ðµ.
 torbutton.popup.device_full = Ð¡Ñ?Ð¾Ð¶Ðµ, Ñ?Ð¾ Ð´Ð¸Ñ?Ðº Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð¸Ð¹. Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð·Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ?Ñ? Ð¼Ñ?Ñ?Ñ?Ðµ Ð°Ð±Ð¾ Ð¿ÐµÑ?ÐµÐ¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð?ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ? Tor Ð½Ð° Ñ?Ð½Ñ?Ð¸Ð¹ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð¹.
diff --git a/src/chrome/locale/ur/torbutton.properties b/src/chrome/locale/ur/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ur/torbutton.properties
+++ b/src/chrome/locale/ur/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/ve/torbutton.properties b/src/chrome/locale/ve/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/ve/torbutton.properties
+++ b/src/chrome/locale/ve/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index cc5d3c2..a401338 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = Báºt Tor
-torbutton.button.tooltip.enabled = Táº¯t Tor
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP unknown
 torbutton.circuit_display.onion_site = Onion site
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = Unknown country
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
 torbutton.panel.tooltip.disabled = Nháº¥n Ä?á»? báºt Tor
 torbutton.panel.tooltip.enabled = Nháº¥n Ä?á»? táº¯t Tor
-torbutton.panel.plugins.disabled = Nháº¥n Ä?á»? báºt pháº§n bá»? trá»£
-torbutton.panel.plugins.enabled = Nháº¥n Ä?á»? táº¯t pháº§n bá»? trá»£
 torbutton.panel.label.disabled = Tor bá»? táº¯t
 torbutton.panel.label.enabled = Tor Ä?Æ°á»£c báºt
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton khÃ³a nhá»¯ng tháº» trÃ¬nh duyá»?t Ä?Ã£ táº£i trong má»?t tráº¡ng thÃ¡i khÃ¡c cá»§a Tor.\n\nCÃ¡i nÃ y lÃ  Ä?á»? váºn hÃ nh xung quanh lá»?i Firefox 409737 vÃ  417869.\n\nNáº¿u thÃ´ng bÃ¡o nÃ y hiá»?n ra cháº³ng vÃ¬ lÃ½ do nÃ o, thÃ¬ má»?t trong nhá»¯ng tháº» trÃ¬nh duyá»?t Ä?ang cá»? tá»± táº£i láº¡i mÃ  khÃ´ng thÃ´ng bÃ¡o, vÃ  Ä?iá»?u nÃ y Ä?Ã£ bá»? ngÄ?n cháº·n.\n\nTor táº£i láº¡i tháº» trÃ¬nh duyá»?t trong tráº¡ng thÃ¡i nÃ y cá»§a Tor, gÃµ 'enter' trÃªn thanh Ä?á»?a chá»?.\n\n
-torbutton.popup.plugin.warning = Torbutton cháº·n viá»?c táº£i trá»±c tiáº¿p Tor ná»?i dung pháº§n bá»? trá»£.\n\nNÃªn dÃ¹ng LÆ°u DÆ°á»?i Dáº¡ng.\n\n
-torbutton.popup.confirm_ca_certs = LÆ°u Ã½ Torbutton: CÃ³ váº» báº¡n khÃ´ng cÃ³ NhÃ  cáº¥p phÃ¡t Chá»©ng thÆ° (CA) tÃ¹y biáº¿n. Kiá»?m tra danh sÃ¡ch CA lÃ  má»?t quÃ¡ trÃ¬nh khÃ¡ lÃ¢u vÃ  sáº½ lÃ m cháºm viá»?c báºt táº¯t Tor. Báº¡n cÃ³ muá»?n vÃ´ hiá»?u hÃ³a viá»?c cÃ´ láºp cÃ¡c chá»©ng thÆ° cá»§a CA khÃ´ng? (Náº¿u báº¡n khÃ´ng hiá»?u viá»?c nÃ y, cá»© nháº¥n OK lÃ  Ä?Æ°á»£c)
-torbutton.popup.ff3.warning = Cáº£nh bÃ¡o!\n\nTorbutton trÃªn Firefox 3 lÃ m lá»? mÃºi giá»? vÃ  Ä?Ã¡nh-dáº¥u-Ä?á»?ng cá»§a báº¡n thÃ´ng qua Tor.\n\nBáº¡n cÃ³ cÃ²n muá»?n tiáº¿p tá»¥c khÃ´ng?
-torbutton.popup.toggle.warning = Báº¡n cáº§n báºt táº¯t Tor hoáº·c khá»?i Ä?á»?ng láº¡i Ä?á»? thiáº¿t láºp cÃ³ hiá»?u lá»±c.
 torbutton.popup.test.success = Thá» nghiá»?m Tor thÃ nh cÃ´ng!
 torbutton.popup.test.failure = Tor proxy kiá»?m tra cÃ³ lá»?i! Kiá»?m tra proxy vÃ  nhá»¯ng cÃ i Ä?áº·t cá»§a Polipo cá»§a báº¡n.
 torbutton.popup.test.confirm_toggle = Cuá»?c thá» nghiá»?m Tor á»§y nhiá»?m gáº§n Ä?Ã¢y nháº¥t Ä?Ã£ tháº¥t báº¡i trong viá»?c xá» dá»¥ng Tor.\n\nBáº¡n cÃ³ cháº¯c lÃ  báº¡n muá»?n báºt lÃªn khÃ´ng?\n\nLÆ°u Ã½: Náº¿u báº¡n Ä?Ã£ sá»a Ä?Æ°á»£c váº¥n Ä?á»?, báº¡n cÃ³ thá»? cháº¡y kiá»?m tra láº¡i trong cá»a sá»? nhá»¯ng TÃ¹y thÃch á»¦y nhiá»?m cá»§a Torbutton Ä?á»? loáº¡i bá»? cáº£nh bÃ¡o nÃ y.
 torbutton.popup.test.ff3_notice = Nháº¥n OK Ä?á»? thá» nghiá»?m thiáº¿t láºp proxy Tor. Thá» nghiá»?m nÃ y sáº½ diá»?n ra trong háºu cáº£nh. Xin hÃ£y kiÃªn nháº«n.
-torbutton.panel.label.verified = Tor Ä?Ã£ Ä?Æ°á»£c phÃª chuáº©n
-torbutton.popup.test.auto_failed = Thá» nghiá»?m proxy Tor tá»± Ä?á»?ng Ä?Ã£ bá»? tháº¥t báº¡i.\n\nBáº¡n cÃ³ cháº¯c lÃ  báº¡n váº«n muá»?n báºt khÃ´ng?
-torbutton.prefs.recommended = (khuyáº¿n cÃ¡o)
-torbutton.prefs.optional = (phá»¥)
-torbutton.prefs.crucial = (cáº¥p thiáº¿t)
 torbutton.popup.external.title = Download an external file type?
 torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n
 torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = Download file
 torbutton.popup.cancel = Há»§y bá»?
 torbutton.popup.dontask = Automatically download files from now on
 torbutton.popup.test.no_http_proxy = Thá» nghiá»?m Tor á»§y nhiá»?m: HTTP á»§y nhiá»?m Ä?á»?a phÆ°Æ¡ng khÃ´ng thá»? tá»?i Ä?Æ°á»£c. Polipo cÃ³ Ä?ang cháº¡y Ä?Ãºng cÃ¡ch khÃ´ng?
-torbutton.popup.captcha.title = Muá»?n trÃ¡nh xÃ¡c nháºn Google Captchas?
-torbutton.popup.captcha.ask = Torbutton phÃ¡t hiá»?n cÃ³ Google Captchas. Báº¡n cÃ³ muá»?n chuyá»?n qua bá»? mÃ¡y tÃ¬m kiáº¿m khÃ¡c cho cÃ¢u há»?i nÃ y?
-torbutton.popup.captcha.always = tá»« bÃ¢y giá»?, luÃ´n thá»±c hiá»?n hÃ nh Ä?á»?ng nÃ y
-torbutton.popup.redirect = Chuyá»?n hÆ°á»?ng
-torbutton.popup.no_redirect = Ä?á»«ng chuyá»?n hÆ°á»?ng
 torbutton.popup.prompted_language = Ä?á»? báº¡n cÃ³ thÃªm sÆ° riÃªng tÆ°, Torbutton cÃ³ thá»? yÃªu cáº§u trang máº¡ng sá» dá»¥ng phiÃªn báº£n Tiáº¿ng Anh. Ä?Ã¢y cÃ³ thá»? lÃ  nguyÃªn nhÃ¢n trang máº¡ng mÃ  báº¡n Ä?á»? nghá»? hiá»?n thá»? tiáº¿n báº£n Ä?á»?a láº¡i hiá»?n thá»? Tiáº¿ng Anh.\n\nBáº¡n cÃ³ muá»?n yÃªu cáº§u trang máº¡ng tiáº¿ng anh Ä?á»? cÃ³ thÃªm sá»± riÃªng tÆ°?
 torbutton.popup.no_newnym = Torbutton cÃ³ thá»? Ä?Æ°a báº¡n má»?t danh tÃnh má»?i má»?t cÃ¡ch khÃ´ng an toÃ n. NÃ³ khÃ´ng há»? truy cáºp vÃ o Tor Control Port.\n\nCÃ³ pháº£i báº¡n Ä?ang dÃ¹ng Tor Browser Bundle?
-torbutton.popup.use_tbb = DÆ°á»?ng nhÆ° báº¡n Ä?ang sá» dá»¥ng Torbutton vá»?i Firefox, nÃ³ khÃ´ng cÃ²n lÃ  má»?t Ä?á»? xuáº¥t thiáº¿t láºp an toÃ n.\n\nThá»±c ra, chÃºng tÃ´i Ä?á»? nghá»? báº¡n sá» dá»¥ng phiÃªn báº£n má»?i nháº¥t cá»§a Tor Browser Bundle báº±ng cÃ¡ch gá»?i email vÃ o gettor@xxxxxxxxxxxxxx hoáº·c táº£i vá»? theo Ä?á»?a chá»?:
 torbutton.popup.pref_error = Torbutton khÃ´ng thá»? cáºp nháºt thiáº¿t láºp trong thÆ° má»¥c há»? sÆ¡.
 torbutton.popup.permission_denied = Háº£y cÃ i láº¡i quyá»?n truy cáºp cho thÆ° má»¥c cá»§a trÃ¬nh duyá»?t Tor hoáº·c chÃ©p nÃ³ vÃ´ má»?t thÆ° má»¥c má»?i.
 torbutton.popup.device_full = á»? lÆ°u trá»¯ Ä?Ã£ Ä?áº§y, Háº£y chuáº©n bá»? thÃªm chá»? trá»?ng hoáº·c di chuyá»?n trÃ¬nh duyá»?t Tor qua má»?t thiáº¿t bá»? má»?i.
diff --git a/src/chrome/locale/wa/torbutton.properties b/src/chrome/locale/wa/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/wa/torbutton.properties
+++ b/src/chrome/locale/wa/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/wo/torbutton.properties b/src/chrome/locale/wo/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/wo/torbutton.properties
+++ b/src/chrome/locale/wo/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 5b241bb..7379381 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -1,5 +1,3 @@
-torbutton.button.tooltip.disabled = å?¯ç?¨ Tor
-torbutton.button.tooltip.enabled = ç¦?ç?¨ Tor
 torbutton.circuit_display.internet = äº?è??ç½?
 torbutton.circuit_display.ip_unknown = IP æ?ªç?¥
 torbutton.circuit_display.onion_site = onion ç«?ç?¹
@@ -10,25 +8,13 @@ torbutton.circuit_display.unknown_country = æ?ªç?¥å?½å®¶
 torbutton.content_sizer.margin_tooltip = Tor æµ?è§?å?¨æ·»å? äº?ä¸?äº?è¾¹æ¡?ï¼?ä»¥é??ä½?çª?å?£å¤§å°?ç??ç?¬ç?¹æ?§ï¼?ä»¤å?¨çº¿è·?è¸ªç??æ?§å??å¾?æ?´å? å?°é?¾ã??
 torbutton.panel.tooltip.disabled = ç?¹å?»å?¯ç?¨ Tor
 torbutton.panel.tooltip.enabled = ç?¹å?»ç¦?ç?¨ Tor
-torbutton.panel.plugins.disabled = ç?¹å?»å?¯ç?¨æ??ä»¶
-torbutton.panel.plugins.enabled = ç?¹å?»ç¦?ç?¨æ??ä»¶
 torbutton.panel.label.disabled = Tor å·²ç¦?ç?¨
 torbutton.panel.label.enabled = Tor å·²å?¯ç?¨
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton æ?¯ä¸?ä¸ªæ??é?®ï¼?å?¯å¯¹â??Tor è®¾ç½®â??è¿?è¡?ä¿®æ?¹ï¼?å¹¶å?¯å¿«é??è??æ?¹ä¾¿å?°æ¸?é?¤æµ?è§?å?¨é??ç§?æ?°æ?®ã??
-torbutton.popup.history.warning = Torbutton å±?è?½äº?å?¨å?¶ä»? Tor ç?¶æ??ä¸?å? è½½ç??æ ?ç¾ç??æ´»å?¨ã??\n\nè¿?æ?¯ç?¨äº?æ??æ?¶è§£å?³ Firefox Bug 409737 å?? 417869ã??\nå¦?æ??è¿?ä¸ªå¼¹å?ºçª?å?£å?¨æ?¨ä¸?ç?¥æ??ç??æ??å?µä¸?å¼¹å?ºï¼?å??æ?¨ç??æ ?ç¾ä¹?ä¸?æ£è¯?å?¾å?¨å??å?°é??æ?°è½½å?¥è?ªå·±ï¼?ç?¶è??è¿?æ ·ç??è¡?ä¸ºæ?¯è¢«å±?è?½ç??ã??\n\nè¦?å?·æ?°å½?å?? Tor ç?¶æ??ä¸?ç??æ ?ç¾ï¼?å°?ç?¦ç?¹ç½®äº?å?¨å?°å??æ ?å¹¶æ??å??è½¦é?®ã??\n\n
-torbutton.popup.plugin.warning = Torbutton é?»æ¢é??è¿? Tor ç?´æ?¥å? è½½æ??ä»¶å??å®¹ã??\n\nè¯·ä½¿ç?¨â??å?¦å?ä¸ºâ??ã??\n\n
-torbutton.popup.confirm_ca_certs = Torbutton æ³¨æ??ï¼?æµ?è§?å?¨ä¼¼ä¹?ç¼ºå°?è?ªå®?ä¹?ç??CA(è¯?ä¹¦é¢?å??æ?ºæ??)ã??æ£?æ?¥CAå??è¡¨æ?¯ä¸?é¡¹è??æ?¶ç??æ??ä½?ï¼?Tor å??æ?¢å°?å??æ?¢ã??æ?¯å?¦å¸?æ??ç¦?ç?¨å¯¹CAè¯?ä¹¦ç??é??ç¦»ï¼?ï¼?å¦?æ??ä¸?æ??ç?½è¯¥é?®é¢?ï¼?å?¯ä»¥é??æ?©â??ç¡®å®?â??)
-torbutton.popup.ff3.warning = è¦å??ï¼?\n\nFirefox 3 å?¯è?½é??è¿? Tor æ³?é?²æ?¶å?ºå?? Livemark (ä¹¦ç¾æ ?ç??RSSé?¾æ?¥)ã??\n\næ?¯å?¦ä»?è¦?ç»§ç»æ??ä½?ï¼?
-torbutton.popup.toggle.warning = ä¸ºäº?åº?ç?¨è®¾ç½®ï¼?é??å??æ?¢ Tor æ??é??æ?°å?¯å?¨ã??
 torbutton.popup.test.success = Tor ä»£ç??æµ?è¯?æ??å??ï¼?
 torbutton.popup.test.failure = Tor ä»£ç??æµ?è¯?å¤±è´¥ï¼?è¯·æ£?æ?¥ä»£ç??å?? Polipo è®¾ç½®ã??
 torbutton.popup.test.confirm_toggle = ä¸?ä¸?æ¬¡ Tor ä»£ç??æµ?è¯?å¤±è´¥ã??\n\næ?¨è¿?è¦?å?¯ç?¨ä»£ç??å??ï¼?\n\næ³¨æ??ï¼?å¦?æ??æ?¨å·²ç»?è§£å?³äº?ä»£ç??é?®é¢?ï¼?è¯·æ??å¼? Torbutton ä»£ç??è®¾ç½®çª?å?£ï¼?æ¶?é?¤æ¤è¦å??ã??
 torbutton.popup.test.ff3_notice = å??å?»â??ç¡®å®?â??æµ?è¯? Tor ç??ä»£ç??è®¾ç½®ã??æµ?è¯?å°?å?¨å??å?°è¿?è¡?ï¼?è¯·è??å¿?ç?å¾?ã??
-torbutton.panel.label.verified = Tor éª?è¯?é??è¿?
-torbutton.popup.test.auto_failed = Tor æ?ªé??è¿?è?ªå?¨ä»£ç??æµ?è¯?ã??\n\næ?¨ç¡®å®?è¦?ç»§ç»å?¯ç?¨å??ï¼?
-torbutton.prefs.recommended = (æ?¨è??)
-torbutton.prefs.optional = (å?¯é??)
-torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = ä¸?è½½ä¸?ä¸ªå¤?é?¨æ??ä»¶ç±»å??ï¼?
 torbutton.popup.external.app = Tor Browser æ? æ³?æ?¾ç¤ºæ¤æ??ä»¶ã??æ?¨é??è¦?ç?¨å?¶ä»?åº?ç?¨ç¨?åº?æ??å¼?å®?ã??\n\n
 torbutton.popup.external.note = é?¨å??æ??ä»¶ç±»å??å?¯è?½ä¼?å¯¼è?´åº?ç?¨ç¨?åº?å?¨ä¸?ä½¿ç?¨ Tor ç??æ??å?µä¸?è¿?æ?¥äº?è??ç½?ã??\n\n
@@ -37,14 +23,8 @@ torbutton.popup.launch = ä¸?è½½æ??ä»¶
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = ä»¥å??è?ªå?¨ä¸?è½½æ??ä»¶
 torbutton.popup.test.no_http_proxy = Tor ä»£ç??æµ?è¯?ï¼?æ?¬å?° HTTP ä»£ç??ä¸?å?¯è¾¾ï¼?æ?¨ç?? Polipo æ£å¸¸å?¯å?¨äº?å??ï¼?
-torbutton.popup.captcha.title = é?¿å?? Google Captchaï¼?
-torbutton.popup.captcha.ask = Torbutton æ£?æµ?å?°äº?ä¸?ä¸ª Google Captchaï¼?æ?¨æ?¯å?¦æ?¿æ??æ??æ?¬æ¬¡æ??ç´¢é??å®?å??å?°ä½¿ç?¨å?¶ä»?æ??ç´¢å¼?æ??ï¼?
-torbutton.popup.captcha.always = æ¤å??æ?»æ?¯ä½¿ç?¨æ¤æ??ä½?
-torbutton.popup.redirect = é??å®?å??
-torbutton.popup.no_redirect = ä¸?è¦?é??å®?å??
 torbutton.popup.prompted_language = ä¸ºäº?æ?´å¥½å?°ä¿?æ?¤é??ç§?ï¼? Torbutton å?¯ä»¥è¯·æ±?ç½?é¡µç??è?±è¯ç??æ?¬ã??è¿?å?¯è?½å¯¼è?´æ?¨å¸?æ??æµ?è§?ç??æ?¬å??è¯è¨?ç??ç½?é¡µä»¥è?±è¯æ?¾ç¤ºã??\n\nä¸ºäº?æ?´å¥½å?°ä¿?æ?¤é??ç§?ï¼?æ?¯å?¦è¯·æ±?ç½?é¡µä»¥è?±è¯æ?¾ç¤ºï¼?
 torbutton.popup.no_newnym = Torbutton æ? æ³?å®?å?¨å?°ä¸ºæ?¨å??æ?¢ä¸?ä¸ªæ?°èº«ä»½ã??å®?æ? æ³?è®¿é?® Tor ç??æ?§å?¶ç«¯å?£ã??\n\næ?¨ç?®å??æ£å?¨ä½¿ç?¨ Tor æµ?è§?å?¨å¥?ä»¶å??ï¼?
-torbutton.popup.use_tbb = æ?¨ä¼¼ä¹?æ£å?¨ Firefox ä¸ä½¿ç?¨ Torbuttonï¼?è??æ??ä»¬ä¸?å??æ?¨è??æ¤é??ç½®ã??\n\næ??ä»¬æ?¨è??æ?¨ä½¿ç?¨æ??æ?°ç?? Tor æµ?è§?å?¨å¥?ä»¶ï¼?æ?¨å?¯ä»¥å??ç?µé?®ç»? gettor@xxxxxxxxxxxxxx è?·å¾?æ¤å¥?ä»¶æ??ä»?å¦?ä¸?é?¾æ?¥ä¸?è½½ï¼?
 torbutton.popup.pref_error = Torbutton æ? æ³?æ?´æ?° Tor æµ?è§?å?¨é??ç½®ç?®å½?ä¸ç??é¦?é??é¡¹ã??
 torbutton.popup.permission_denied = è¯·é??ç½® Tor æµ?è§?å?¨ç?®å½?ç??æ??ä»¶æ??é??æ??å°?å?¶å¤?å?¶å?°ä¸?ä¸ªæ?°ä½?ç½®ã??
 torbutton.popup.device_full = ç¡¬ç??ç©ºé?´å·²æ»¡ã??è¯·é??æ?¾ä¸?äº?ç©ºé?´æ??å°? Tor æµ?è§?å?¨ç§»å?¨è?³å?¶ä»?æ?°è®¾å¤?ã??
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index 925bc3e..e17ddf2 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = å??ç?¨ Tor
-torbutton.button.tooltip.enabled = å??ç?¨ Tor
 torbutton.panel.tooltip.disabled = é»?æ??ä»¥å??ç?¨ Tor
 torbutton.panel.tooltip.enabled = é»?æ??ä»¥å??ç?¨ Tor
-torbutton.panel.plugins.disabled = é»?æ??ä»¥å??ç?¨å¤?æ??
-torbutton.panel.plugins.enabled = é»?æ??ä»¥å??ç?¨å¤?æ??
 torbutton.panel.label.disabled = Tor å·²å??ç?¨
 torbutton.panel.label.enabled = Tor å·²å??ç?¨
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy æ¸¬è©¦é??é??!
 torbutton.popup.test.failure = Tor proxy æ¸¬è©¦å¤±æ??! è«?å??æ¬¡æª¢æ?¥æ?¨ Proxy è?? Polipo è¨å®?ã??
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = æ??ä¸? OK å¾?é??å§?æ¸¬è©¦ Tor Proxy è¨å®?ã??é??å??æ¸¬è©¦æ??å?¨è??æ?¯é??ä½?ã??è«?ç¨?å¾?ã??
-torbutton.panel.label.verified = Tor é©?è?å®?æ??
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (å»ºè°å?¼)
-torbutton.prefs.optional = (é?¸æ??æ?§)
-torbutton.prefs.crucial = (é??è¦?ç??)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = å??å??æ??ç?¨ç¨?å¼?
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = é?¿é?? Google Captchaså???
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = å¾?ç?¾å?¨é??å§?ç¸½æ?¯å?·è¡?é??å??å??ä½?
-torbutton.popup.redirect = é??æ?°å°?å??
-torbutton.popup.no_redirect = ä¸?è¦?é??æ?°å°?å??
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton ç?¡æ³?å®?å?¨ç??çµ¦æ?¨ä¸?å??æ?°ç??èº«å??ã??å®?ç?¡æ³?å?å?? Tor æ?§å?¶é?£æ?¥å? ã??\n\næ?¨æ£å?¨ä½¿ç?¨ Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = ç£?ç¢?ç©ºé??å?¯è?½å·²æ»¿ã??è«?ç©ºå?ºä¸?äº?ç©ºé??æ??æ?¯å°? Tor Browser æ?¬ç§»è?³å?¦ä¸?å??è£?ç½®ã??
diff --git a/src/chrome/locale/zu/torbutton.properties b/src/chrome/locale/zu/torbutton.properties
index dc6684c..d8c1430 100644
--- a/src/chrome/locale/zu/torbutton.properties
+++ b/src/chrome/locale/zu/torbutton.properties
@@ -1,26 +1,12 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Tor proxy test successful!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -29,14 +15,8 @@ torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.

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

Prev by Author: [tor-commits] [tor-browser-bundle/master] Bug 18845: generate reproducible archives without relying on libfaketime
Next by Author: [tor-commits] [torbutton/master] Bug 18238: remove unused Torbutton code and strings
Previous by thread: [tor-commits] [tor-browser-bundle/master] Bug 18845: generate reproducible archives without relying on libfaketime
Next by thread: [tor-commits] [torbutton/master] Bug 18238: remove unused Torbutton code and strings
Index(es):
- Author
- Thread