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

gk at torproject.org gk at torproject.org
Fri Jun 3 09:26:31 UTC 2016


commit e8f694c4fb513c92ec26603fdaa3be745d7648a5
Author: Kathy Brade <brade at pearlcrescent.com>
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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = زر تور يوفر زر لتعديل إعدادات تور وايضاً لمسح بيانات التصفح الخاصة بك بسرعة وبسهولة.
-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 at torproject.org أو بتحميلها من العنوان التالي:
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = Το 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 at torproject.org ή κατεβάζοντάς το από την ακόλουθη διεύθυνση 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org-era 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 at torproject.org.description = 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 at torproject.org یا با دانلود آن را در آدرس زیر بدست آورید:
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org או בהורדה מהכתובת: 
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.orgにメールを送るか、以下の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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 에게 메일을 보내거나, 다음 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org ထံ အီးမေးလ် ပေးပို့ခြင်းဖြင့် (သို့) အောက်ပါ 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org или скачав его по следующей ссылке:
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org или преузимањем са следеће адресе: 
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org або, скачавши його за наступним посиланням:
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 获得此套件或从如下链接下载:
 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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 at torproject.org.description = 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 at torproject.org 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.





More information about the tbb-commits mailing list